summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2011-09-10 02:29:43 +0000
committerRyan Hill <dirtyepic@gentoo.org>2011-09-10 02:29:43 +0000
commit20cdf711e4a90f91d98f61078c25ce5bdc34f70d (patch)
treeb76081e218f43baad1f3c9cd74944b07aded77f7 /src/patchsets/grub
parentAutomated update of outdated-cpan-packages.xml (diff)
downloadgentoo-20cdf711e4a90f91d98f61078c25ce5bdc34f70d.tar.gz
gentoo-20cdf711e4a90f91d98f61078c25ce5bdc34f70d.tar.bz2
gentoo-20cdf711e4a90f91d98f61078c25ce5bdc34f70d.zip
Add patch to work around miscompilation with gcc-4.6 (bug #360513). Spin patchset 1.11.
Diffstat (limited to 'src/patchsets/grub')
-rw-r--r--src/patchsets/grub/0.97/012_all_grub-0.97-gcc46.patch20
-rw-r--r--src/patchsets/grub/0.97/ChangeLog7
2 files changed, 25 insertions, 2 deletions
diff --git a/src/patchsets/grub/0.97/012_all_grub-0.97-gcc46.patch b/src/patchsets/grub/0.97/012_all_grub-0.97-gcc46.patch
new file mode 100644
index 0000000000..18a07b2234
--- /dev/null
+++ b/src/patchsets/grub/0.97/012_all_grub-0.97-gcc46.patch
@@ -0,0 +1,20 @@
+Work around a miscompilation of stage2 with GCC 4.6.
+This flag is not the cause of the miscompilation, but disabling it has the side-effect
+of making it work at both -Os and -O2.
+
+Vague upstream bug:
+http://gcc.gnu.org/PR39333
+
+https://bugs.gentoo.org/360513
+
+--- a/stage2/Makefile.am
++++ b/stage2/Makefile.am
+@@ -85,7 +85,7 @@ else
+ GRAPHICS_FLAGS =
+ endif
+
+-STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-reorder-functions -fno-builtin -nostdinc \
+ $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
+
+ STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
diff --git a/src/patchsets/grub/0.97/ChangeLog b/src/patchsets/grub/0.97/ChangeLog
index 780ed2955a..21601569fa 100644
--- a/src/patchsets/grub/0.97/ChangeLog
+++ b/src/patchsets/grub/0.97/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for grub patchset
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v 1.8 2010/06/25 04:24:26 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo/src/patchsets/grub/0.97/ChangeLog,v 1.9 2011/09/10 02:29:43 dirtyepic Exp $
+
+ 10 Sep 2011; Ryan Hill <dirtyepic@gentoo.org> +012_all_grub-0.97-gcc46.patch:
+ Add patch to work around miscompilation with gcc-4.6 (bug #360513).
25 Jun 2010; Robin H. Johnson <robbat2@gentoo.org>
840_all_grub-0.97_kvm_vda.patch: