From 9f1b2dcbad84010f9014de2cd608154cbac53d9b Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 24 Nov 2012 17:01:07 +0000 Subject: [PATCH] t-linux64 (MULTILIB_OSDIRNAMES): Use x86_64-linux-gnux32 as multiarch name for x32. 2012-11-24 Matthias Klose * gcc/config/i386/t-linux64 (MULTILIB_OSDIRNAMES): Use x86_64-linux-gnux32 as multiarch name for x32. From-SVN: r193779 --- gcc/ChangeLog | 2 ++ gcc/config/i386/t-linux64 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ac58eee488..ea18d43c240 100644 --- 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 diff --git a/gcc/config/i386/t-linux64 b/gcc/config/i386/t-linux64 index dfaf2763d89..d5bedf7bb7c 100644 --- 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)