[2694] 2009-11-07 Robert Millan <address@hidden>

[Robert Millan]

Revision: 2694
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2694
Author:   robertmh
Date:     2009-11-07 21:06:30 +0000 (Sat, 07 Nov 2009)
Log Message:
-----------
2009-11-07  Robert Millan  <address@hidden>

        Fix build with GNU gold.

        * conf/i386-pc.rmk (boot_img_LDFLAGS, pxeboot_img_LDFLAGS)
        (diskboot_img_LDFLAGS, lnxboot_img_LDFLAGS)
        (cdboot_img_LDFLAGS): Prepend `0x' qualifier to hexadecimal
        link addresses.
        * aclocal.m4: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/aclocal.m4
    trunk/grub2/conf/i386-pc.rmk

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-11-07 16:04:39 UTC (rev 2693)
+++ trunk/grub2/ChangeLog       2009-11-07 21:06:30 UTC (rev 2694)
@@ -1,3 +1,13 @@
+2009-11-07  Robert Millan  <address@hidden>
+
+       Fix build with GNU gold.
+
+       * conf/i386-pc.rmk (boot_img_LDFLAGS, pxeboot_img_LDFLAGS)
+       (diskboot_img_LDFLAGS, lnxboot_img_LDFLAGS)
+       (cdboot_img_LDFLAGS): Prepend `0x' qualifier to hexadecimal
+       link addresses.
+       * aclocal.m4: Likewise.
+
 2009-11-04  Felix Zielcke  <address@hidden>
 
        * configure.ac (AC_PREREQ): Bump to 2.59d.

Modified: trunk/grub2/aclocal.m4
===================================================================
--- trunk/grub2/aclocal.m4      2009-11-07 16:04:39 UTC (rev 2693)
+++ trunk/grub2/aclocal.m4      2009-11-07 21:06:30 UTC (rev 2694)
@@ -92,7 +92,7 @@
   AC_MSG_ERROR([${CC-cc} cannot compile C source code])
 fi
 grub_cv_prog_objcopy_absolute=yes
-for link_addr in 2000 8000 7C00; do
+for link_addr in 0x2000 0x8000 0x7C00; do
   if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} 
-Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
   else
     AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])

Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk        2009-11-07 16:04:39 UTC (rev 2693)
+++ trunk/grub2/conf/i386-pc.rmk        2009-11-07 21:06:30 UTC (rev 2694)
@@ -16,31 +16,31 @@
 # For boot.img.
 boot_img_SOURCES = boot/i386/pc/boot.S
 boot_img_ASFLAGS = $(COMMON_ASFLAGS)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)7C00
+boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
 boot_img_FORMAT = binary
 
 # For pxeboot.img
 pxeboot_img_SOURCES = boot/i386/pc/pxeboot.S
 pxeboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-pxeboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)7C00
+pxeboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
 pxeboot_img_FORMAT = binary
 
 # For diskboot.img.
 diskboot_img_SOURCES = boot/i386/pc/diskboot.S
 diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)8000
+diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8000
 diskboot_img_FORMAT = binary
 
 # For lnxboot.img.
 lnxboot_img_SOURCES = boot/i386/pc/lnxboot.S
 lnxboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-lnxboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)6000
+lnxboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x6000
 lnxboot_img_FORMAT = binary
 
 # For cdboot.img.
 cdboot_img_SOURCES = boot/i386/pc/cdboot.S
 cdboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-cdboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)7C00
+cdboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
 cdboot_img_FORMAT = binary
 
 # For kernel.img.