Patchwork Fix x32 multiarch name (x86_64-linux-gnux32)

login
register
mail settings
Submitter Matthias Klose
Date Nov. 24, 2012, 5 p.m.
Message ID <50B0FD17.4060403@ubuntu.com>
Download mbox | patch
Permalink /patch/201472/
State New
Headers show

Comments

Matthias Klose - Nov. 24, 2012, 5 p.m.
For x86_64-linux-gnux32 I used 'x32-linux-gnu' as the multiarch name, which is
wrong, should be 'x86_64-linux-gnux32' instead (see [1]). Pointed out by Daniel
Schepler.

Committed as obvious.

  Matthias

[1] http://bugs.debian.org/667037

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

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)

Patch

Index: gcc/config/i386/t-linux64
===================================================================
--- gcc/config/i386/t-linux64	(Revision 193778)
+++ gcc/config/i386/t-linux64	(Arbeitskopie)
@@ -36,4 +36,4 @@ 
 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