090-rs6000-PR-89587.patch 1.2 KB

123456789101112131415161718192021222324252627282930
  1. From 045e60da05ec1d4997864883143a951f152cfc9f Mon Sep 17 00:00:00 2001
  2. From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
  3. Date: Tue, 30 Apr 2019 20:37:12 +0000
  4. Subject: [PATCH] Backported from mainline 2019-03-05 Jakub
  5. Jelinek <jakub@redhat.com>
  6. PR target/89587
  7. * config/rs6000/t-linux (MULTIARCH_DIRNAME): Set to non-empty only
  8. if_multiarch.
  9. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@270720 138bc75d-0d04-0410-961f-82ee72b054a4
  10. ---
  11. gcc/ChangeLog | 4 ++++
  12. gcc/config/rs6000/t-linux | 2 +-
  13. 2 files changed, 5 insertions(+), 1 deletion(-)
  14. diff --git a/gcc/config/rs6000/t-linux b/gcc/config/rs6000/t-linux
  15. index acfde1f48aec..aeb7440c4920 100644
  16. --- a/gcc/config/rs6000/t-linux
  17. +++ b/gcc/config/rs6000/t-linux
  18. @@ -4,7 +4,7 @@ ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
  19. ifneq (,$(findstring powerpc64,$(target)))
  20. MULTILIB_OSDIRNAMES := .=../lib64$(call if_multiarch,:powerpc64-linux-gnu)
  21. else
  22. -MULTIARCH_DIRNAME := powerpc-linux-gnu
  23. +MULTIARCH_DIRNAME := $(call if_multiarch,powerpc-linux-gnu)
  24. endif
  25. ifneq (,$(findstring powerpcle,$(target)))
  26. MULTIARCH_DIRNAME := $(subst -linux,le-linux,$(MULTIARCH_DIRNAME))