From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 5 Mar 2019 17:25:01 +0000 (+0100)
Subject: re PR target/89587 (gcc's rs6000 configuration unconditionally sets MULTIARCH_DIRNAME... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f0c3b1337fbd9216c3c7c6c28066df8abf45cccb;p=gcc.git

re PR target/89587 (gcc's rs6000 configuration unconditionally sets MULTIARCH_DIRNAME, even when multiarch is disabled)

	PR target/89587
	* config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
	if_multiarch.

From-SVN: r269396
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c02e488d90c..405bc38fb75 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2019-03-05  Jakub Jelinek  <jakub@redhat.com>
 
+	PR target/89587
+	* config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
+	if_multiarch.
+
 	PR middle-end/89590
 	* builtins.c (maybe_emit_free_warning): Punt if free doesn't have
 	exactly one argument.
diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
index acfde1f48ae..aeb7440c492 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))