r3748 - trunk/payloads/libpayload/bin

Author: jcrouse
Date: 2008-11-12 00:36:12 +0100 (Wed, 12 Nov 2008)
New Revision: 3748

Modified:
   trunk/payloads/libpayload/bin/lpgcc
Log:

Signed-off-by: Robert Millan 
Acked-by: Jordan Crouse

Modified: trunk/payloads/libpayload/bin/lpgcc
===================================================================
--- trunk/payloads/libpayload/bin/lpgcc	2008-11-11 21:57:20 UTC (rev 3747)
+++ trunk/payloads/libpayload/bin/lpgcc	2008-11-11 23:36:12 UTC (rev 3748)
@@ -101,8 +101,13 @@
 else
     _LIBGCC=`$DEFAULT_CC -m32 -print-libgcc-file-name`
     if [ $DEBUGME -eq 1 ]; then
-	echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $CMDLINE $_LIBDIR/i386/head.o $_LIBDIR/libpayload.a $_LIBGCC"
+	echo "$DEFAULT_CC $_CFLAGS $_LDFLAGS $_LIBDIR/i386/head.o $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC"
     fi

-    $DEFAULT_CC $_CFLAGS $_LDFLAGS $CMDLINE $_LIBDIR/i386/head.o $_LIBDIR/libpayload.a $_LIBGCC
+    # Note: i386/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....
+
+    $DEFAULT_CC $_CFLAGS $_LDFLAGS $_LIBDIR/i386/head.o  $CMDLINE $_LIBDIR/libpayload.a $_LIBGCC
 fi