diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-25 18:54:43 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-25 18:54:43 +0000 |
| commit | 7208f6e031957ab163136546c191d577c7418299 (patch) | |
| tree | a7fdfd14bd359359c314290f5949c0984946e9dc /payloads/libpayload/bin/lpgcc | |
| parent | 0350c0fe197947bfe67d6cfad62dfe2132238ec3 (diff) | |
don't hardcode i386 in lpgcc
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5294 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'payloads/libpayload/bin/lpgcc')
| -rwxr-xr-x | payloads/libpayload/bin/lpgcc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/payloads/libpayload/bin/lpgcc b/payloads/libpayload/bin/lpgcc index e88c74fc22..9e4cafb3cb 100755 --- a/payloads/libpayload/bin/lpgcc +++ b/payloads/libpayload/bin/lpgcc @@ -102,10 +102,12 @@ done 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 @@ if [ $DOLINK -eq 0 ]; then 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 |