From 6bc78f4fb61a5abc5df881c6f490d4df04894ab9 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 10 Mar 2015 14:54:11 +0100 Subject: [PATCH] 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: r221324 --- gcc/ChangeLog | 6 ++++++ gcc/config/rs6000/t-linux | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cd89eb707bf5..2ba106321a27 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-03-10 Jakub Jelinek + + PR target/65286 + * config/rs6000/t-linux: For powerpc64* target set + MULTILIB_OSDIRNAMES instead of MULTIARCH_DIRNAME. + 2015-03-10 Oleg Endo PR target/53988 diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux index 61aced6ae0ee..8900e546969e 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 rs6000/e500-double.h, $(tm_file_list)),,v1) @@ -10,7 +10,10 @@ 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 -- 2.47.2