summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2018-04-14 12:28:33 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2018-04-14 12:28:33 +0000
commitb28c749fee8f81c661eed032fda3f441ad14d5be (patch)
tree6dca83518a346b26df0b30d16ab5792b81119209
parenttesting.txt: follow collectd move to app-metrics/collectd (diff)
downloadgentoo-b28c749fee8f81c661eed032fda3f441ad14d5be.tar.gz
gentoo-b28c749fee8f81c661eed032fda3f441ad14d5be.tar.bz2
gentoo-b28c749fee8f81c661eed032fda3f441ad14d5be.zip
gcc/7.3.0: gcc/config.gcc: sh-*: Disable sysroot-suffix (PR42947)
sh-* is a multilib target. It is also one of 2 sysroot-prefix targets. Unfortunately two options do not mix well. Attempt to use default multilib flavour always prepends sysroot-prefix. Bug: https://bugs.gentoo.org/511548 Bug: https://gcc.gnu.org/PR42947
-rw-r--r--src/patchsets/gcc/7.3.0/gentoo/92_all_sh-drop-sysroot-suffix.patch32
-rw-r--r--src/patchsets/gcc/7.3.0/gentoo/README.history2
2 files changed, 34 insertions, 0 deletions
diff --git a/src/patchsets/gcc/7.3.0/gentoo/92_all_sh-drop-sysroot-suffix.patch b/src/patchsets/gcc/7.3.0/gentoo/92_all_sh-drop-sysroot-suffix.patch
new file mode 100644
index 0000000000..3dadd4c258
--- /dev/null
+++ b/src/patchsets/gcc/7.3.0/gentoo/92_all_sh-drop-sysroot-suffix.patch
@@ -0,0 +1,32 @@
+From 5eeeff19bb4978a8d3c0d53bc81744bc25d82993 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 14 Apr 2018 13:07:39 +0100
+Subject: [PATCH] gcc/config.gcc: sh-*: Disable sysroot-suffix (PR42947)
+
+sh-* is a multilib target. It is also one of 2 sysroot-prefix targets.
+Unfortunately two options do not mix well. Attempt to use default
+multilib flavour always prepends sysroot-prefix.
+
+Bug: https://bugs.gentoo.org/511548
+Bug: https://gcc.gnu.org/PR42947
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ gcc/config.gcc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 55c314afdbd..c320f24f123 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -2866,8 +2866,6 @@ sh-*-elf* | sh[12346l]*-*-elf* | \
+ if test x${enable_incomplete_targets} = xyes ; then
+ tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1"
+ fi
+- tm_file="$tm_file ./sysroot-suffix.h"
+- tmake_file="$tmake_file t-sysroot-suffix"
+ ;;
+ sh-*-rtems*)
+ tmake_file="${tmake_file} sh/t-sh sh/t-rtems"
+--
+2.17.0
+
diff --git a/src/patchsets/gcc/7.3.0/gentoo/README.history b/src/patchsets/gcc/7.3.0/gentoo/README.history
index 8aa5d143f5..13be9e51f5 100644
--- a/src/patchsets/gcc/7.3.0/gentoo/README.history
+++ b/src/patchsets/gcc/7.3.0/gentoo/README.history
@@ -1,3 +1,5 @@
+1.2 14 Apr 2018
+ + 92_all_sh-drop-sysroot-suffix.patch
1.1 11 Feb 2018
+ 91_all_bmi-i386-PR-target-81763.patch
1.0 25 Jan 2018