From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 24 Nov 2010 19:32:49 +0000 (+0000)
Subject: * grub-core/Makefile.core.def (xz_decompress): Move -lgcc from
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5a4072785bbaec011b37e0d46a3d2bcd0127a150;p=grub2.git

* 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 39a6b5146..f29ade31c 100644
--- 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 098df91dc..ce10ba372 100644
--- 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;
 };