aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffery To <jeffery.to@gmail.com>2019-11-19 06:04:59 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2019-12-23 00:31:20 +0100
commitd2e87c780089a74b6c0ad84e21f73021fb5ec27a (patch)
tree34414094a9ebe24a85b4326264faeec998ade289
parenta7d880e830cf786941c14f5fd410a7e918ffcb5d (diff)
downloadupstream-d2e87c780089a74b6c0ad84e21f73021fb5ec27a.tar.gz
upstream-d2e87c780089a74b6c0ad84e21f73021fb5ec27a.tar.bz2
upstream-d2e87c780089a74b6c0ad84e21f73021fb5ec27a.zip
toolchain/gcc: Backport patch to fix unconditional MULTIARCH_DIRNAME
This backports the patch for GCC PR target/89587 (gcc's rs6000 configuration unconditionally sets MULTIARCH_DIRNAME, even when multiarch is disabled). This currently affects apm821xx and may cause issues when cross-compiling packages, e.g. Python 3[1]. This includes patches for GCC 8 (with the changelog diff removed); this change is already included in GCC 9.2 and 7.5. [1]: https://github.com/openwrt/packages/issues/10552 Signed-off-by: Jeffery To <jeffery.to@gmail.com> [Removed patch for GCC 7.4.0, GCC 7.5.0 already contains this] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit c102f702e7dc976c2ad2c04c0ce4462373e62365)
-rw-r--r--toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch b/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch
new file mode 100644
index 0000000000..83bfbbe712
--- /dev/null
+++ b/toolchain/gcc/patches/8.3.0/090-rs6000-PR-89587.patch
@@ -0,0 +1,30 @@
+From 045e60da05ec1d4997864883143a951f152cfc9f Mon Sep 17 00:00:00 2001
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 30 Apr 2019 20:37:12 +0000
+Subject: [PATCH] Backported from mainline 2019-03-05 Jakub
+ Jelinek <jakub@redhat.com>
+
+ PR target/89587
+ * config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
+ if_multiarch.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@270720 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ gcc/ChangeLog | 4 ++++
+ gcc/config/rs6000/t-linux | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
+index acfde1f48aec..aeb7440c4920 100644
+--- a/gcc/config/rs6000/t-linux
++++ b/gcc/config/rs6000/t-linux
+@@ -4,7 +4,7 @@ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
+ ifneq (,$(findstring powerpc64,$(target)))
+ MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
+ else
+-MULTIARCH_DIRNAME := powerpc-linux-gnu
++MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
+ endif
+ ifneq (,$(findstring powerpcle,$(target)))
+ MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))