t-linux64 (MULTILIB_OSDIRNAMES): Use x86_64-linux-gnux32 as multiarch name for x32.

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

        * gcc/config/i386/t-linux64 (MULTILIB_OSDIRNAMES): Use
        x86_64-linux-gnux32 as multiarch name for x32.

From-SVN: r193779

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0ac58eee48803076924fffd437b2996f1bc47925..ea18d43c2403c4cc3f31c8756c06fa26ab6c36b4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -3,6 +3,8 @@
        * configure.ac (multiarch): Use $enableval instead of $withval.
        * configure: Regenerate.
        * config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32.
+       * gcc/config/i386/t-linux64 (MULTILIB_OSDIRNAMES): Use
+       x86_64-linux-gnux32 as multiarch name for x32.
 
 2012-11-23  Tobias Burnus  <burnus@net-b.de>
 

diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64
index dfaf2763d8935c3f08df59101ef947d2d31a4075..d5bedf7bb7cc42d469baeafa95b3a3db084fe4de 100644 (file)
--- a/gcc/config/i386/t-linux64
+++ b/gcc/config/i386/t-linux64
@@ -36,4 +36,4 @@ MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
 MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
 MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
 MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
-MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x32-linux-gnu)
+MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)