aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2015-03-10 14:43:44 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2015-03-10 14:43:44 +0100
commitdac2639d6d76a2e6b56b083e5b1773b82f3f54a3 (patch)
tree8037c45ad194ba5cd3cf158b7ae54f5d964679a9
parentc692785982889bcb1ebe1a0ee354c3e07a515208 (diff)
downloadgcc-dac2639d6d76a2e6b56b083e5b1773b82f3f54a3.zip
gcc-dac2639d6d76a2e6b56b083e5b1773b82f3f54a3.tar.gz
gcc-dac2639d6d76a2e6b56b083e5b1773b82f3f54a3.tar.bz2
re PR target/65286 (When building on powerpc64le-unknown-linux-gnu, --disable-multilib must be used)
PR target/65286 * config/rs6000/t-linux: For powerpc64* target set MULTILIB_OSDIRNAMES instead of MULTIARCH_DIRNAME. From-SVN: r221322
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/rs6000/t-linux7
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f2e949b..21f9b95 100644
--- 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 Richard Biener <rguenther@suse.de>
PR middle-end/44563
diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
index 1630a0c..4cb63bd 100644
--- 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