[commit] r1927 - in cpu: arm/Linux x86/Linux

[repository service]

Author: wmb
Date: Wed Aug 11 06:54:43 2010
New Revision: 1927
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1927

Log:
ARM - separated the staticly linked armforth.static from the native wrapper
to make things work more smoothly when compiling natively.

Added:
   cpu/arm/Linux/armforth.static
      - copied unchanged from r1926, cpu/arm/Linux/armforth
Deleted:
   cpu/arm/Linux/armforth
Modified:
   cpu/arm/Linux/Makefile
   cpu/x86/Linux/armforth

Modified: cpu/arm/Linux/Makefile
==============================================================================
--- cpu/arm/Linux/Makefile	Wed Aug 11 06:39:19 2010	(r1926)
+++ cpu/arm/Linux/Makefile	Wed Aug 11 06:54:43 2010	(r1927)
@@ -3,7 +3,6 @@
 BP=../../..

CFLAGS = -DARM -mlittle-endian
-LFLAGS = -static

WRTAIL = forth/wrapper
 WRDIR = ${BP}/${WRTAIL}
@@ -26,6 +25,11 @@
 armforth: ${OBJS}
    ${CC} ${CFLAGS} ${LFLAGS} -o $@  ${OBJS}

+# This staticly-linked wrapper is used by cpu/x86/Linux/armforth for cross-building
+# with the help of QEMU.
+armforth.static: ${OBJS}
+	${CC} ${CFLAGS} ${LFLAGS} -static -o $@  ${OBJS}
+
 %.o: ${WRDIR}/%.c
    ${CC} -c ${CFLAGS} $< -o $@

Copied: cpu/arm/Linux/armforth.static (from r1926, cpu/arm/Linux/armforth)
==============================================================================
Binary file (source and/or target). No diff available.

Modified: cpu/x86/Linux/armforth
==============================================================================
--- cpu/x86/Linux/armforth	Wed Aug 11 06:39:19 2010	(r1926)
+++ cpu/x86/Linux/armforth	Wed Aug 11 06:54:43 2010	(r1927)
@@ -1,2 +1,2 @@
 #!/bin/sh
-qemu-arm ${BP}/cpu/arm/Linux/forth $*
+qemu-arm ${BP}/cpu/arm/Linux/armforth.static $*