re PR target/65286 (When building on powerpc64le-unknown-linux-gnu, --disable-multili...

	PR target/65286
	* config/rs6000/t-linux: For powerpc64* target set
	MULTILIB_OSDIRNAMES instead of MULTIARCH_DIRNAME.

From-SVN: r221323

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb5177792bc81b175f041d34ba4c88d0bc725e21..3d8ed5269e2c30d5715ef09d339d86a5532d33b9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-10  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/65286
+       * config/rs6000/t-linux: For powerpc64* target set
+       MULTILIB_OSDIRNAMES instead of MULTIARCH_DIRNAME.
+
 2015-03-10  Oleg Endo  <olegendo@gcc.gnu.org>
 
        PR target/53988

diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
index 1630a0cc3a2a57044639eea394e701f3c473da61..4cb63bdca5d18cfd05d08bd0d2a1699ac8bb5df3 100644 (file)
--- a/gcc/config/rs6000/t-linux
+++ b/gcc/config/rs6000/t-linux
@@ -2,7 +2,7 @@
 # or soft-float.
 ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
 ifneq (,$(findstring powerpc64,$(target)))
-MULTIARCH_DIRNAME := powerpc64-linux-gnu
+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)
@@ -10,9 +10,12 @@ else
 MULTIARCH_DIRNAME := powerpc-linux-gnu
 endif
 endif
-ifneq (,$(findstring powerpcle,$(target))$(findstring powerpc64le,$(target)))
+ifneq (,$(findstring powerpcle,$(target)))
 MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
 endif
+ifneq (,$(findstring powerpc64le,$(target)))
+MULTILIB_OSDIRNAMES := $(subst -linux,le-linux,$(MULTILIB_OSDIRNAMES))
+endif
 endif
 
 rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c