Browse Source

*** empty log message ***

ceriel 37 years ago
parent
commit
60c746ed21
10 changed files with 82 additions and 62 deletions
  1. 2 2
      lib/6500/descr
  2. 1 1
      lib/6800/descr
  3. 1 1
      lib/6805/descr
  4. 2 2
      lib/em22/descr
  5. 1 1
      lib/em24/descr
  6. 1 1
      lib/em44/descr
  7. 18 11
      lib/ns/descr
  8. 27 24
      lib/pmds/descr
  9. 27 17
      lib/pmds4/descr
  10. 2 2
      lib/s2650/descr

+ 2 - 2
lib/6500/descr

@@ -9,7 +9,7 @@ var NAME=m6500
 var M=6500
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var INCLUDES=-I{EM}/include -I/usr/include
+var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon
 name be
 	from .m.g
 	to .s
@@ -31,6 +31,6 @@ name asld
 		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
 		(.b.c.p:{TAIL}={EM}/{LIB}mon) \
-		(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}em.vend)
+		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/{M}/end_em)
 	linker
 end

+ 1 - 1
lib/6800/descr

@@ -9,7 +9,7 @@ var NAME=m6800
 var M=6800
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var INCLUDES=-I{EM}/include -I/usr/include
+var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon
 name as
 	from .s.so
 	to .o

+ 1 - 1
lib/6805/descr

@@ -9,7 +9,7 @@ var NAME=m6805
 var M=6805
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var INCLUDES=-I{EM}/include -I/usr/include
+var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon
 name as
 	from .s.so
 	to .o

+ 2 - 2
lib/em22/descr

@@ -10,8 +10,8 @@ var NAME=int22
 var LIB=lib/int22/tail_
 var RT=lib/int22/head_
 var SIZE_FLAG=-sm
-var CPP_F=-Dunix
-var INCLUDES=-I{EM}/include -I/usr/include
+var CPP_F=-Dunix=unix
+var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon
 name asld
 	from .k.m.a.g
 	to .out

+ 1 - 1
lib/em24/descr

@@ -11,7 +11,7 @@ var LIB=lib/int24/tail_
 var RT=lib/int24/head_
 var SIZE_FLAG=-sm
 var CPP_F=-Dunix
-var INCLUDES=-I{EM}/include -I/usr/include
+var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon
 name asld
 	from .k.m.a.g
 	to .out

+ 1 - 1
lib/em44/descr

@@ -11,7 +11,7 @@ var LIB=lib/int44/tail_
 var RT=lib/int44/head_
 var SIZE_FLAG=-sm
 var CPP_F=-Dunix
-var INCLUDES=-I{EM}/include -I/usr/include
+var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon
 name asld
 	from .k.m.a.g
 	to .out

+ 18 - 11
lib/ns/descr

@@ -5,31 +5,38 @@ var s=2
 var l=4
 var f=4
 var d=8
-var NAME=ns16032
 var M=ns
+var NAME=NS
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var INCLUDES=-I{EM}/include -I/usr/include
+var CPP_F=-Dunix=unix
+var INCLUDES=-I{EM}/include/_tail_cc
+var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 name be
 	from .m.g
-	to .o
+	to .s
 	program {EM}/lib/{M}/cg
 	args <
 	stdout
 	need .e
 end
-name asld
-	from .o.s.a
-	to .out
-	outfile a.out
+name as
+	from .s
+	to .o
 	program {EM}/lib/{M}/as
+	args - -o > <
+	prep cond
+end
+name led
+	from .o.a
+	to .out
+	program {EM}/lib/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
-	args (.e:{HEAD}={EM}/{RT}em) \
-		({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+	args (.e:{HEAD}={ALIGN} {EM}/{RT}em) \
+({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
 		(.p:{TAIL}={EM}/{LIB}pc) \
 		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-		(.b.c.p:{TAIL}={EM}/{LIB}mon) \
-		(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}em.vend)
+		(.e:{TAIL}={EM}/{LIB}mon {EM}/{LIB}em {EM}/lib/{M}/end_em)
 	linker
 end

+ 27 - 24
lib/pmds/descr

@@ -1,5 +1,4 @@
-# $Revision$
-# Script for use of ACK as cross C-compiler on VAX for PMDS machine
+# $Header$
 var w=2
 var p=4
 var s=2
@@ -8,43 +7,47 @@ var f=4
 var d=8
 var NAME=m68k2
 var M=m68k2
-var PMDS=pmds
-var LIB=lib/{M}/tail_
-var RT=lib/{M}/head_
-var PMDSLIB=lib/{PMDS}/tail_
-var PMDSRT=lib/{PMDS}/head_
-var INCLUDES=-I{EM}/include
-var CPP_F=-Dunix
+var LIB=lib/m68k2/tail_
+var RT=lib/m68k2/head_
+var INCLUDES=-I{EM}/include/_tail_cc
+var CPP_F=-Dunix=unix -Dm68000=m68000
+# 407 align is the default
+var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 name be
-	from .m.g
-	to .o
+	from .m
+	to .s
 	program {EM}/lib/{M}/cg
 	args <
 	stdout
 	need .e
 end
-name asld
-	from .s.a.o
-	to .out
+name as
+	from .s
+	to .o
 	program {EM}/lib/{M}/as
-	mapflag -l
-	mapflag -d*
-	mapflag -s*
-	mapflag -n*
-	mapflag -i*
-	args {LFLAG?} (.e:{HEAD}={EM}/{PMDSRT}em) \
-		({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+	args - -o > <
+	prep cond
+end
+name led
+	from .o.a
+	to .out
+	program {EM}/lib/em_led
+	mapflag -l* LNAME={EM}/{LIB}*
+	mapflag -i ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
+	mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
+	mapflag -nr ALIGN=-a0:2 -a1:0x8000 -a2:2 -a3:2
+	args (.e:{HEAD}= {ALIGN} {EM}/lib/pmds/head_em) \
+({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
 		(.p:{TAIL}={EM}/{LIB}pc) \
 		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-		(.e:{TAIL}={EM}/{LIB}em.rt {EM}/{PMDSLIB}mon {EM}/lib/{M}/end_em.s)
-	prep cond
+		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds/tail_mon {EM}/lib/{M}/end_em)
 	linker
 end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/{PMDS}/cv
+	program {EM}/lib/pmds/cv
 	args < >
 	outfile a.out
 end

+ 27 - 17
lib/pmds4/descr

@@ -7,37 +7,47 @@ var f=4
 var d=8
 var NAME=m68k4
 var M=m68k4
-var LIB=mach/m68k4/lib/tail_
-var RT=mach/m68k4/lib/head_
-var INCLUDES=-I{EM}/include
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
+var INCLUDES=-I{EM}/include/_tail_cc
+var CPP_F=-Dunix=unix -Dm68000=m68000
+# 407 align is default
+var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
 name be
 	from .m
-	to .o
+	to .s
 	program {EM}/lib/{M}/cg
 	args <
 	stdout
 	need .e
 end
-name asld
-	from .s.a.o
-	to .out
+name as
+	from .s
+	to .o
 	program {EM}/lib/m68k2/as
-	mapflag -l* LNAME={EM}/{LIB}*
-	mapflag -d* LFLAG={LFLAG?} -d*
-	mapflag -s* LFLAG={LFLAG?} -s*
-	mapflag -n*
-	mapflag -i*
-	args {LFLAG?} (.e:{HEAD}={EM}/lib/pmds4/head_em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds4/mon {EM}/end_em)
+	args - -o > <
 	prep cond
+end
+name led
+	from .o.a
+	to .out
+	program {EM}/lib/em_led
+	mapflag -l* LNAME={EM}/{LIB}*
+	mapflag -i ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
+	mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x8000 -a3:2
+	mapflag -nr ALIGN=-a0:2 -a1:0x8000 -a2:2 -a3:2
+	args (.e:{HEAD}={ALIGN} {EM}/lib/pmds4/head_em) \
+({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+		(.p:{TAIL}={EM}/{LIB}pc) \
+		(.b:{TAIL}={EM}/{LIB}bc) \
+		(.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds4/tail_mon {EM}/lib/{M}/end_em)
 	linker
 end
 name cv
 	from .out
 	to .cv
-	program {EM}/lib/{PMDS}/cv
+	program {EM}/lib/pmds/cv
 	args < >
 	outfile a.out
 end

+ 2 - 2
lib/s2650/descr

@@ -9,7 +9,7 @@ var NAME=s2650
 var M=s2650
 var LIB=lib/{M}/tail_
 var RT=lib/{M}/head_
-var INCLUDES=-I{EM}/include -I/usr/include
+var INCLUDES=-I{EM}/include/_tail_cc -I{EM}/include/_tail_mon
 name as
 	from .s.so
 	to .o
@@ -28,6 +28,6 @@ name led
 		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
 		(.b.c.p:{TAIL}={EM}/{LIB}mon) \
-		(.e:{TAIL}={EM}/{LIB}em)
+		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/{M}/end_em)
 	linker
 end