From patchwork Wed Mar 24 21:03:34 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: libpayload lpgcc arch fix
Date: Wed, 24 Mar 2010 21:03:34 -0000
From: Stefan Reinauer <stepan@coresystems.de>
X-Patchwork-Id: 1143
Message-Id: <4BAA7E26.6010209@coresystems.de>
To: coreboot <coreboot@coreboot.org>

See patch...
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>


--- bin/lpgcc	(revision 5280)
+++ bin/lpgcc	(working copy)
@@ -102,10 +102,12 @@
 
 if [ "$CONFIG_TARGET_I386" = "y" ]; then
   _ARCHINCDIR=$_INCDIR/i386
+  _ARCHLIBDIR=$_LIBDIR/i386
 fi
 
 if [ "$CONFIG_TARGET_POWERPC" = "y" ]; then
   _ARCHINCDIR=$_INCDIR/powerpc
+  _ARCHLIBDIR=$_LIBDIR/powerpc
 fi
 
 _CFLAGS="-m32 -nostdinc -nostdlib -I$_INCDIR -I$_ARCHINCDIR"
@@ -128,13 +130,13 @@
 else
     _LIBGCC=`$DEFAULT_CC -m32 -print-libgcc-file-name`
     if [ $DEBUGME -eq 1 ]; then
-	echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_LIBDIR/i386/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC"
+	echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC"
     fi
 
-    # Note: i386/head.o must be the first object being linked, because it
+    # Note: $_ARCHLIBDIR/head.o must be the first object being linked, because it
     # contains a Multiboot header.  The Multiboot standard requires this
     # header to be placed below 0x2000 in the resulting image.  See:
     # http://www.gnu.org/software/grub/manual/multiboot/html_node/OS-image-format.html
 
-    $DEFAULT_CC $_CFLAGS $_LDFLAGS $_LIBDIR/i386/head.o  $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC
+    $DEFAULT_CC $_CFLAGS $_LDFLAGS $_ARCHLIBDIR/head.o  $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC
 fi