toolchain/gcc: Backport patch to fix unconditional MULTIARCH_DIRNAME
[oweals/openwrt.git] / toolchain / gcc / patches / 8.3.0 / 090-rs6000-PR-89587.patch
1 From 045e60da05ec1d4997864883143a951f152cfc9f Mon Sep 17 00:00:00 2001
2 From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
3 Date: Tue, 30 Apr 2019 20:37:12 +0000
4 Subject: [PATCH]        Backported from mainline        2019-03-05  Jakub
5  Jelinek  <jakub@redhat.com>
6
7         PR target/89587
8         * config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
9         if_multiarch.
10
11
12 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@270720 138bc75d-0d04-0410-961f-82ee72b054a4
13 ---
14  gcc/ChangeLog             | 4 ++++
15  gcc/config/rs6000/t-linux | 2 +-
16  2 files changed, 5 insertions(+), 1 deletion(-)
17
18 diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
19 index acfde1f48aec..aeb7440c4920 100644
20 --- a/gcc/config/rs6000/t-linux
21 +++ b/gcc/config/rs6000/t-linux
22 @@ -4,7 +4,7 @@ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
23  ifneq (,$(findstring powerpc64,$(target)))
24  MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
25  else
26 -MULTIARCH_DIRNAME := powerpc-linux-gnu
27 +MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
28  endif
29  ifneq (,$(findstring powerpcle,$(target)))
30  MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))