* grub-core/Makefile.core.def (xz_decompress): Move -lgcc from

ldflags to ldadd, to fix link line ordering.
(none_decompress): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 39a6b5146a30e6777d307c3e52203bdc3549866e..f29ade31c57e9e1cbdcf904bacea5621b3df5e4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-24  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/Makefile.core.def (xz_decompress): Move -lgcc from
+       ldflags to ldadd, to fix link line ordering.
+       (none_decompress): Likewise.
+
 2010-11-24  Colin Watson  <cjwatson@ubuntu.com>
 
        * grub-core/Makefile.core.def (kernel): Add kern/emu/cache.S for emu

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 098df91dc0955041d31d8a190bd5153f69ddb44c..ce10ba372e77c83e0c0af2703af889ed2d4da308 100644 (file)
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -300,7 +300,8 @@ image = {
   mips_cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -DGRUB_EMBED_DECOMPRESSOR=1 -DGRUB_MACHINE_LINK_ADDR=0x80200000';
 
   objcopyflags = '-O binary';
-  ldflags = '-lgcc -static-libgcc -Wl,-Ttext,0x80100000';
+  ldflags = '-static-libgcc -Wl,-Ttext,0x80100000';
+  ldadd = '-lgcc';
   cflags = '-static-libgcc';
   enable = mips;
 };
@@ -313,7 +314,8 @@ image = {
   mips_cppflags = '-DGRUB_EMBED_DECOMPRESSOR=1 -DGRUB_MACHINE_LINK_ADDR=0x80200000';
 
   objcopyflags = '-O binary';
-  ldflags = '-lgcc -static-libgcc -Wl,-Ttext,0x80100000';
+  ldflags = '-static-libgcc -Wl,-Ttext,0x80100000';
+  ldadd = '-lgcc';
   cflags = '-static-libgcc';
   enable = mips;
 };