From: Jakub Jelinek <jakub@redhat.com>
Date: Fri, 30 Aug 2019 12:12:56 +0000 (+0200)
Subject: backport: re PR target/89587 (gcc's rs6000 configuration unconditionally sets MULTIAR... 
X-Git-Tag: releases/gcc-7.5.0~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc36366b4686eabe8333c4f45f38d0c2369a5d6b;p=thirdparty%2Fgcc.git

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

	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 ab3d0d650771..d0bfafb00c69 100644
--- 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 4cb63bdca5d1..23f3fd236df3 100644
--- 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)))