On 05.03.19 16:22, Jakub Jelinek wrote:
> Hi!
>
> powerpc-linux-gnu is apparently the only target that provides
> MULTIARCH_DIRNAME unconditionally, all others properly wrap that with
> if_multiarch, which decides if it should be used (--enable-multiarch,
> or if the test for automatic multiarch succeeds), or should be empty
> (--disable-multiarch, or the auto test failed).
>
> Fixed thusly, bootstrapped/regtested on powerpc64{,le}-linux, also
> tested without and with this patch in powerpc-linux non-bootstrap and
> testing what -print-multiarch prints. Ok for trunk?
>
> 2019-03-05 Jakub Jelinek <ja...@redhat.com>
>
> PR target/89587
> * config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
> if_multiarch.
>
> --- gcc/config/rs6000/t-linux.jj 2017-06-13 22:01:42.887779444 +0200
> +++ gcc/config/rs6000/t-linux 2019-03-05 11:07:55.076963345 +0100
> @@ -4,7 +4,7 @@ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT
> ifneq (,$(findstring powerpc64,$(target)))
> MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
> else
> -MULTIARCH_DIRNAME := powerpc-linux-gnu
> +MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
> endif
> ifneq (,$(findstring powerpcle,$(target)))
> MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))
looks fine, although I cannot approve it.
Matthias
