From f05d6fb70e76b6c480ce589d2cb9bd3c4a2d4bb5 Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 4 Nov 1987 10:48:25 +0000
Subject: [PATCH] improved alignments, and added libfp

---
 lib/m68k2/descr | 10 ++++++----
 lib/pmds/descr  | 10 ++++++----
 lib/pmds4/descr | 10 ++++++----
 lib/sun2/descr  | 12 +++++++-----
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/lib/m68k2/descr b/lib/m68k2/descr
index 550e39321..c905dee61 100644
--- a/lib/m68k2/descr
+++ b/lib/m68k2/descr
@@ -12,7 +12,7 @@ var RT=lib/{M}/head_
 var CPP_F=-Dunix=unix -Dm68000=m68000
 var INCLUDES=-I{EM}/include/_tail_cc
 # 407 align is the default
-var ALIGN=-a0:2 -a1:2 -a2:2 -a3:2
+var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4
 name be
 	from .m.g
 	to .s
@@ -42,15 +42,17 @@ name led
 	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
+	mapflag -i ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
+	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
+	mapflag -nr ALIGN=-a0:4 -a1:0x8000 -a2:4 -a3:4
+	mapflag -fp LIBFP={EM}/{LIB}fp
 	args -b0:0x20000 {ALIGN} (.e:{HEAD}={EM}/{RT}em) \
 ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
 		(.p:{TAIL}={EM}/{LIB}pc) \
 		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.ocm:{TAIL}={EM}/{LIB}ocm) \
 		(.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+		{LIBFP?} \
 		(.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}mon {EM}/lib/{M}/end_em)
 	linker
 end
diff --git a/lib/pmds/descr b/lib/pmds/descr
index 4d2e2fe4a..89c093b8d 100644
--- a/lib/pmds/descr
+++ b/lib/pmds/descr
@@ -12,7 +12,7 @@ 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
+var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4
 name be
 	from .m.g
 	to .s
@@ -42,15 +42,17 @@ name led
 	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
+	mapflag -i ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
+	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
+	mapflag -nr ALIGN=-a0:4 -a1:0x8000 -a2:4 -a3:4
+	mapflag -fp LIBFP={EM}/{LIB}fp
 	args  {ALIGN} (.e:{HEAD}={EM}/lib/pmds/head_em) \
 ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
 		(.p:{TAIL}={EM}/{LIB}pc) \
 		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.ocm:{TAIL}={EM}/{LIB}ocm) \
 		(.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+		{LIBFP?} \
 		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds/tail_mon {EM}/lib/{M}/end_em)
 	linker
 end
diff --git a/lib/pmds4/descr b/lib/pmds4/descr
index d8cb0a089..2d6d6a62a 100644
--- a/lib/pmds4/descr
+++ b/lib/pmds4/descr
@@ -12,7 +12,7 @@ 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
+var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4
 name be
 	from .m.g
 	to .s
@@ -42,15 +42,17 @@ name led
 	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
+	mapflag -i ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
+	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x8000 -a3:4
+	mapflag -nr ALIGN=-a0:4 -a1:0x8000 -a2:4 -a3:4
+	mapflag -fp LIBFP={EM}/{LIB}fp
 	args {ALIGN} (.e:{HEAD}={EM}/lib/pmds4/head_em) \
 ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
 		(.p:{TAIL}={EM}/{LIB}pc) \
 		(.b:{TAIL}={EM}/{LIB}bc) \
 		(.ocm:{TAIL}={EM}/{LIB}ocm) \
 		(.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+		{LIBFP?} \
 		(.e:{TAIL}={EM}/{LIB}em {EM}/lib/pmds4/tail_mon {EM}/lib/{M}/end_em)
 	linker
 end
diff --git a/lib/sun2/descr b/lib/sun2/descr
index 71b04ac98..317b57aef 100644
--- a/lib/sun2/descr
+++ b/lib/sun2/descr
@@ -17,7 +17,7 @@ var PRT=lib/{M}/head_
 var CPP_F=-Dunix=unix -D__BSD4_2
 var INCLUDES=-I{EM}/include/_tail_cc
 # 413 align is the default, rom in text
-var ALIGN=-a0:2 -a1:2 -a2:0x20000 -a3:2 -b0:0x2020
+var ALIGN=-a0:4 -a1:4 -a2:0x20000 -a3:4 -b0:0x2020
 name be
 	from .m.g
 	to .s
@@ -47,16 +47,18 @@ name led
 	to .out
 	program {EM}/lib/em_led
 	mapflag -l* LNAME={EM}/{LIB}*
-	mapflag -n ALIGN=-a0:2 -a1:2 -a2:0x20000 -a3:2 -b0:0x2000
-	mapflag -nr ALIGN=-a0:2 -a1:0x20000 -a2:2 -a3:2 -b0:0x2000
-	mapflag -N ALIGN=-a0:2 -a1:2 -a2:2 -a3:2 -b0:0x2000
-	mapflag -r ALIGN=-a0:2 -a1:0x20000 -a2:2 -a3:2 -b0:0x2020
+	mapflag -n ALIGN=-a0:4 -a1:4 -a2:0x20000 -a3:4 -b0:0x2000
+	mapflag -nr ALIGN=-a0:4 -a1:0x20000 -a2:4 -a3:4 -b0:0x2000
+	mapflag -N ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 -b0:0x2000
+	mapflag -r ALIGN=-a0:4 -a1:0x20000 -a2:4 -a3:4 -b0:0x2020
+	mapflag -fp LIBFP={EM}/{LIB}fp
 	args  {ALIGN} (.e:{HEAD}={EM}/{RT}em) \
 ({RTS}:.ocm.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{PRT}pc) -o > < \
 		(.p:{TAIL}={EM}/{PLIB}pc) \
 		(.b:{TAIL}={EM}/{PLIB}bc) \
 		(.ocm:{TAIL}={EM}/{LIB}ocm) \
 		(.ocm.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+		{LIBFP?} \
 		(.e:{TAIL}={EM}/{PLIB}em {EM}/{LIB}mon {EM}/{PLIB}em {EM}/lib/{M}/end_em)
 	linker
 end
-- 
2.34.1