2009-11-07 Robert Millan <rmh.grub@aybabtu.com>

        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.

diff --git a/ChangeLog b/ChangeLog
index c4fecdd4073e2b4da402f987e5d53af3f5b1729d..843be6dc57c8986182d16434ae445194e3d918e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-07  Robert Millan  <rmh.grub@aybabtu.com>
+
+       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  <fzielcke@z-51.de>
 
        * configure.ac (AC_PREREQ): Bump to 2.59d.

diff --git a/aclocal.m4 b/aclocal.m4
index 899eca409b70c0b1b7f1ceaae32df6aa6bee1542..6f9baf18f72c2322ff19ec4a1174cdd67caa9c9c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -92,7 +92,7 @@ else
   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])

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index bf8fbfb9d765c334acabae0b5e7404ecd7fd0852..373b942ccc45de15477be71e363b13a6edf2eab4 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -16,31 +16,31 @@ pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
 # 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.