diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2013-04-17 02:35:28 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2013-04-17 02:35:28 +0000 |
| commit | 68b07796d7194cb2f945ea23a17b896765de30cb (patch) | |
| tree | ce46376a0fde6039cfeb9f11695770cb8052bf67 /4.6.4/gentoo | |
| parent | Initial 4.6.4 patchset based off latest 4.6.3 patchset. Update patches touch... (diff) | |
| download | gcc-patches-68b07796d7194cb2f945ea23a17b896765de30cb.tar.gz gcc-patches-68b07796d7194cb2f945ea23a17b896765de30cb.tar.bz2 gcc-patches-68b07796d7194cb2f945ea23a17b896765de30cb.zip | |
Minimal patch to make setup_multilib_osdirnames() from the eclass work.
Diffstat (limited to '4.6.4/gentoo')
| -rw-r--r-- | 4.6.4/gentoo/90_all_multiarch-formatting.patch | 15 | ||||
| -rw-r--r-- | 4.6.4/gentoo/README.history | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/4.6.4/gentoo/90_all_multiarch-formatting.patch b/4.6.4/gentoo/90_all_multiarch-formatting.patch new file mode 100644 index 0000000..b70c695 --- /dev/null +++ b/4.6.4/gentoo/90_all_multiarch-formatting.patch @@ -0,0 +1,15 @@ +Pointless linebreak screws up our setup_multilib_osdirnames sed. Since +this is the only version affected just work around it. + +--- a/gcc/config/i386/t-linux64 ++++ b/gcc/config/i386/t-linux64 +@@ -25,8 +25,7 @@ + + MULTILIB_OPTIONS = m64/m32 + MULTILIB_DIRNAMES = 64 32 +-MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:x86_64-linux-gnu) \ +- $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) ++MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:x86_64-linux-gnu) $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib diff --git a/4.6.4/gentoo/README.history b/4.6.4/gentoo/README.history index 050737e..d6c473f 100644 --- a/4.6.4/gentoo/README.history +++ b/4.6.4/gentoo/README.history @@ -22,4 +22,5 @@ U 76_all_4.7.0_c-family-headers.patch + 80_all_arm_4.7_pr50946_qt-webkit-ICE.patch + 81_all_arm_4.7_pr48808_VFP_LO_REGS.patch + + 90_all_multiarch-formatting.patch + 92_all_freebsd-pie.patch |