From: Matthias Klose <doko@ubuntu.com>
Date: Wed, 21 Nov 2012 16:13:28 +0000 (+0000)
Subject: t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES.
X-Git-Tag: releases/gcc-4.8.0~1861
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3358fd40546fa1c360f625ca9e7a911ac3ba80cd;p=thirdparty%2Fgcc.git

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 5e436013000e..cdce51e7b58b 100644
--- 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 ede76a2cbf3f..cc6ab367072f 100644
--- 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)