On Tue, Mar 10, 2015 at 10:36:24PM +1030, Alan Modra wrote:
> On Tue, Mar 10, 2015 at 12:08:50PM +0100, Markus Trippelsdorf wrote:
> > On 2015.03.10 at 08:56 +0100, Jakub Jelinek wrote:
> > > https://gcc.gnu.org/ml/gcc-patches/2013-03/msg00288.html
> > > for similar issue on aarch64.
> > > You really don't want to use MULTIARCH_DIRNAME for the powerpc64le* case,
> > > as that will work only with the Debian/Ubuntu mess.
>
> I see. Didn't realise Fedora was keeping the old mess. ;-)
It is not about old vs. new, but rather about Debian/Ubuntu deciding to use
something completely different from anyone else.
> > > So perhaps something like completely untested following patch?
> >
> > The patch fixes the issue for me.
>
> It's fine on Ubuntu too. Thanks!
Thanks. Here is the patch with ChangeLog entry, ok for trunk?
2015-03-10 Jakub Jelinek <ja...@redhat.com>
PR target/65286
* config/rs6000/t-linux: For powerpc64* target set
MULTILIB_OSDIRNAMES instead of MULTIARCH_DIRNAME.
--- gcc/config/rs6000/t-linux 2015-03-10 07:27:43.734454250 +0100
+++ gcc/config/rs6000/t-linux 2015-03-10 08:52:54.268126702 +0100
@@ -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
Jakub
