t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.

2012-11-21  Matthias Klose  <doko@ubuntu.com>

        * config/s390/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.

From-SVN: r193699

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5e436013000e88cd7b076a7ac8d7bd90d36b9a55..cdce51e7b58b55fee67f580c2d4574f10ee028a0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-21  Matthias Klose  <doko@ubuntu.com>
+
+       * config/s390/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
+
 2012-11-21  Teresa Johnson  <tejohnson@google.com>
 
        PR gcov-profile/55417

diff --git a/gcc/config/s390/t-linux64 b/gcc/config/s390/t-linux64
index ede76a2cbf3fe6242607a9828e7285fcb286a0ca..cc6ab367072feb67e97417b1588c238cfcad5805 100644 (file)
--- a/gcc/config/s390/t-linux64
+++ b/gcc/config/s390/t-linux64
@@ -7,4 +7,5 @@
 
 MULTILIB_OPTIONS = m64/m31
 MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
+MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)