aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-10-07 02:30:47 +0000
committerMike Frysinger <vapier@gentoo.org>2010-10-07 02:30:47 +0000
commit183f741cd4a5f9b4596851896658cac44213a549 (patch)
tree44d8d3010df34fef6978424ed65edab921511c47 /4.5.1/gentoo
parentBackport 4.4.4 patches (diff)
downloadgcc-patches-183f741cd4a5f9b4596851896658cac44213a549.tar.gz
gcc-patches-183f741cd4a5f9b4596851896658cac44213a549.tar.bz2
gcc-patches-183f741cd4a5f9b4596851896658cac44213a549.zip
update superh multilib logic #320251
Diffstat (limited to '4.5.1/gentoo')
-rw-r--r--4.5.1/gentoo/53_all_gcc4-superh-default-multilib.patch3
-rw-r--r--4.5.1/gentoo/README.history3
2 files changed, 5 insertions, 1 deletions
diff --git a/4.5.1/gentoo/53_all_gcc4-superh-default-multilib.patch b/4.5.1/gentoo/53_all_gcc4-superh-default-multilib.patch
index 0ad8ed9..6cf774b 100644
--- a/4.5.1/gentoo/53_all_gcc4-superh-default-multilib.patch
+++ b/4.5.1/gentoo/53_all_gcc4-superh-default-multilib.patch
@@ -9,6 +9,7 @@ Here we restore the gcc-3.x behavior; the additional overhead of building all
of these multilibs by default is negligible.
http://bugs.gentoo.org/140205
+http://bugs.gentoo.org/320251
--- gcc-4.2.0/gcc/config.gcc
+++ gcc-4.2.0/gcc/config.gcc
@@ -17,7 +18,7 @@ http://bugs.gentoo.org/140205
case ${target} in
sh64-superh-linux* | \
- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
-+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
++ sh[1234]*) sh_multilibs=$(echo $(sed -n '/^[[:space:]]*case ${sh_multilib} in/,/)/{s:case ${sh_multilib} in::;s: | *:,:g;s:[\\)]::g;p}' ${srcdir}/config.gcc) | sed 's: ::g') ;;
sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
sh*-*-linux*) sh_multilibs=m1,m3e,m4 ;;
diff --git a/4.5.1/gentoo/README.history b/4.5.1/gentoo/README.history
index e49f988..cec5e82 100644
--- a/4.5.1/gentoo/README.history
+++ b/4.5.1/gentoo/README.history
@@ -1,3 +1,6 @@
+1.2 [pending]
+ U 53_all_gcc4-superh-default-multilib.patch
+
1.1 15.09.2010
+ 50_all_pr45312-kernel-miscompile.patch
+ 70_all_gcc45-pr45070-arm_-Os.patch