backport: re PR target/89587 (gcc's rs6000 configuration unconditionally sets MULTIAR...

	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.

From-SVN: r275123

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ab3d0d650771e80dad0f27c3c2959b117981f091..d0bfafb00c693b7cf4ad8c1b7f512beee647446e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,10 @@
        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.
+
        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 4cb63bdca5d18cfd05d08bd0d2a1699ac8bb5df3..23f3fd236df33d41958b5b5356953a8848d224f8 100644 (file)
--- a/gcc/config/rs6000/t-linux
+++ b/gcc/config/rs6000/t-linux
@@ -5,9 +5,9 @@ ifneq (,$(findstring powerpc64,$(target)))
 MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
 else
 ifneq (,$(findstring spe,$(target)))
-MULTIARCH_DIRNAME := powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1)
+MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1))
 else
-MULTIARCH_DIRNAME := powerpc-linux-gnu
+MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
 endif
 endif
 ifneq (,$(findstring powerpcle,$(target)))