From: George Koehler <xkernigh@netscape.net>
Date: Wed, 21 Sep 2016 20:26:30 +0000 (-0400)
Subject: Multiple tweaks to plat/linuxppc/descr
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=865ef629ddc3bc81d2a276df0cfe64a8ad182c83;p=ack.git

Multiple tweaks to plat/linuxppc/descr

Don't define __POWERPC.  I don't know any other compiler that defines
__POWERPC and don't want to invent a new macro.  Apple's gcc 4.0.1
from Xcode 2.5 defines __ppc__, _ARCH_PPC, __POWERPC__.  Debian's gcc
4.9.2-10 defines _ARCH_PPC, __PPC__, __powerpc__, __PPC, __powerpc,
PPC, powerpc.

Move the base vm address from 0x80000000 down to 0x10000000, as this
is where Debian loads /bin/true.  This is still higher than the base
addresses for linux386 and linux68k.

Sync led's arguments with linux386.
---

diff --git a/plat/linuxppc/descr b/plat/linuxppc/descr
index b70680201..3086a826c 100644
--- a/plat/linuxppc/descr
+++ b/plat/linuxppc/descr
@@ -1,6 +1,4 @@
-# $Source: /cvsroot/tack/Ack/plat/linux386/descr,v $
-# $State: Exp $
-# $Revision: 1.1 $
+# plat/linuxppc/descr
 
 var w=4
 var wa=4
@@ -19,8 +17,8 @@ var xa={x}
 var ARCH=powerpc
 var PLATFORM=linuxppc
 var PLATFORMDIR={EM}/share/ack/{PLATFORM}
-var CPP_F=-D__unix -D__POWERPC
-var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 -b0:0x80000054
+var CPP_F=-D__unix
+var ALIGN=-a0:4 -a1:4 -a2:4 -a3:4 -b0:0x10000054
 var C_LIB={PLATFORMDIR}/libc-ansi.a
 # bitfields reversed for compatibility with (g)cc.
 var CC_ALIGN=-Vr
@@ -65,8 +63,9 @@ name led
 	mapflag -l* LNAME={PLATFORMDIR}/lib*
 	mapflag -fp FLOATS={EM}/{LIB}fp
 	args {ALIGN} {SEPID?} \
-	    {PLATFORMDIR}/boot.o \
-		({RTS}:.ocm.b.c={PLATFORMDIR}/c-ansi.o) \
+	    (.e:{HEAD}={PLATFORMDIR}/boot.o) \
+		({RTS}:.ocm.b={PLATFORMDIR}/c-ansi.o) \
+		({RTS}:.c={PLATFORMDIR}/c-ansi.o) \
 		({RTS}:.mod={PLATFORMDIR}/modula2.o) \
 		({RTS}:.p={PLATFORMDIR}/pascal.o) \
 		-o > < \
@@ -75,9 +74,10 @@ name led
 		(.mod:{TAIL}={PLATFORMDIR}/libmodula2.a) \
 		(.ocm:{TAIL}={PLATFORMDIR}/liboccam.a) \
 		(.ocm.b.mod.c.p:{TAIL}={PLATFORMDIR}/libc.a) \
-		{PLATFORMDIR}/libem.a \
-		{PLATFORMDIR}/libsys.a \
-		{PLATFORMDIR}/libend.a
+		{FLOATS?} \
+		(.e:{TAIL}={PLATFORMDIR}/libem.a \
+		           {PLATFORMDIR}/libsys.a \
+		           {PLATFORMDIR}/libend.a)
 	linker
 end
 name cv