From 3cdceaa7003ce3b72c5b751490d50c536c630567 Mon Sep 17 00:00:00 2001
From: David Given <dg@cowlark.com>
Date: Wed, 28 Dec 2016 17:30:14 +0000
Subject: [PATCH] Merge in B changes.

---
 plat/osx386/descr | 10 +++++-----
 plat/osxppc/descr | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plat/osx386/descr b/plat/osx386/descr
index a6f021878..45595e252 100644
--- a/plat/osx386/descr
+++ b/plat/osx386/descr
@@ -55,16 +55,16 @@ name led
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 	    (.e:{HEAD}={PLATFORMDIR}/boot.o) \
-		({RTS}:.ocm.b={PLATFORMDIR}/c-ansi.o) \
-		({RTS}:.c={PLATFORMDIR}/c-ansi.o) \
+		({RTS}:.ocm.bas.b.c={PLATFORMDIR}/c-ansi.o) \
 		({RTS}:.mod={PLATFORMDIR}/modula2.o) \
 		({RTS}:.p={PLATFORMDIR}/pascal.o) \
 		-o > < \
-		(.p:{TAIL}={PLATFORMDIR}/libpascal.a) \
-		(.b:{TAIL}={PLATFORMDIR}/libbasic.a) \
+		(.b:{TAIL}={PLATFORMDIR}/libb.a) \
+		(.bas:{TAIL}={PLATFORMDIR}/libbasic.a) \
 		(.mod:{TAIL}={PLATFORMDIR}/libmodula2.a) \
 		(.ocm:{TAIL}={PLATFORMDIR}/liboccam.a) \
-		(.ocm.b.mod.c.p:{TAIL}={PLATFORMDIR}/libc.a) \
+		(.p:{TAIL}={PLATFORMDIR}/libpascal.a) \
+		(.ocm.bas.mod.b.c.p:{TAIL}={PLATFORMDIR}/libc.a) \
 		{FLOATS?} \
 		(.e:{TAIL}={PLATFORMDIR}/libem.a \
 		           {PLATFORMDIR}/libsys.a \
diff --git a/plat/osxppc/descr b/plat/osxppc/descr
index f659ff0ef..7fde17035 100644
--- a/plat/osxppc/descr
+++ b/plat/osxppc/descr
@@ -60,16 +60,16 @@ name led
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
 	    (.e:{HEAD}={PLATFORMDIR}/boot.o) \
-		({RTS}:.ocm.b={PLATFORMDIR}/c-ansi.o) \
-		({RTS}:.c={PLATFORMDIR}/c-ansi.o) \
+		({RTS}:.ocm.bas.c={PLATFORMDIR}/c-ansi.o) \
 		({RTS}:.mod={PLATFORMDIR}/modula2.o) \
 		({RTS}:.p={PLATFORMDIR}/pascal.o) \
 		-o > < \
-		(.p:{TAIL}={PLATFORMDIR}/libpascal.a) \
-		(.b:{TAIL}={PLATFORMDIR}/libbasic.a) \
+		(.b:{TAIL}={PLATFORMDIR}/libb.a) \
+		(.bas:{TAIL}={PLATFORMDIR}/libbasic.a) \
 		(.mod:{TAIL}={PLATFORMDIR}/libmodula2.a) \
 		(.ocm:{TAIL}={PLATFORMDIR}/liboccam.a) \
-		(.ocm.b.mod.c.p:{TAIL}={PLATFORMDIR}/libc.a) \
+		(.p:{TAIL}={PLATFORMDIR}/libpascal.a) \
+		(.ocm.bas.mod.b.c.p:{TAIL}={PLATFORMDIR}/libc.a) \
 		{FLOATS?} \
 		(.e:{TAIL}={PLATFORMDIR}/libem.a \
 		           {PLATFORMDIR}/libsys.a \