diff options
author | Jakub Jelinek <jakub@redhat.com> | 2019-03-05 18:25:01 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-03-05 18:25:01 +0100 |
commit | f0c3b1337fbd9216c3c7c6c28066df8abf45cccb (patch) | |
tree | a17999903239de9516c11ca717ffa0bdac6c927a /gcc | |
parent | 0a7b752172f1e2d7868767e8efecefaf8fb957f3 (diff) | |
download | gcc-f0c3b1337fbd9216c3c7c6c28066df8abf45cccb.zip gcc-f0c3b1337fbd9216c3c7c6c28066df8abf45cccb.tar.gz gcc-f0c3b1337fbd9216c3c7c6c28066df8abf45cccb.tar.bz2 |
re PR target/89587 (gcc's rs6000 configuration unconditionally sets MULTIARCH_DIRNAME, even when multiarch is disabled)
PR target/89587
* config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
if_multiarch.
From-SVN: r269396
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 4 | ||||
-rw-r--r-- | gcc/config/rs6000/t-linux | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c02e488..405bc38 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2019-03-05 Jakub Jelinek <jakub@redhat.com> + PR target/89587 + * config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only + if_multiarch. + PR middle-end/89590 * builtins.c (maybe_emit_free_warning): Punt if free doesn't have exactly one argument. diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux index acfde1f..aeb7440 100644 --- a/gcc/config/rs6000/t-linux +++ b/gcc/config/rs6000/t-linux @@ -4,7 +4,7 @@ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_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)) |