1
# DP: Don't auto-detect multilib osdirnames.
3
Index: b/src/gcc/config/sparc/t-linux64
4
===================================================================
5
--- a/src/gcc/config/sparc/t-linux64
6
+++ b/src/gcc/config/sparc/t-linux64
9
MULTILIB_OPTIONS = m64/m32
10
MULTILIB_DIRNAMES = 64 32
11
+ifneq (,$(findstring sparc64,$(target)))
12
+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
13
+MULTILIB_OSDIRNAMES += ../lib32$(call if_multiarch,:sparc-linux-gnu)
15
MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
16
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
17
+MULTILIB_OSDIRNAMES += ../lib$(call if_multiarch,:sparc-linux-gnu)
20
MULTIARCH_DIRNAME = $(call if_multiarch,sparc$(if $(findstring 64,$(target)),64)-linux-gnu)
21
Index: b/src/gcc/config/s390/t-linux64
22
===================================================================
23
--- a/src/gcc/config/s390/t-linux64
24
+++ b/src/gcc/config/s390/t-linux64
27
MULTILIB_OPTIONS = m64/m31
28
MULTILIB_DIRNAMES = 64 32
29
+ifneq (,$(findstring s390x,$(target)))
30
+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
31
+MULTILIB_OSDIRNAMES += ../lib32$(call if_multiarch,:s390-linux-gnu)
33
MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
34
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
35
+MULTILIB_OSDIRNAMES += ../lib$(call if_multiarch,:s390-linux-gnu)
38
MULTIARCH_DIRNAME = $(call if_multiarch,s390$(if $(findstring s390x,$(target)),x)-linux-gnu)
39
Index: b/src/gcc/config/rs6000/t-linux64
40
===================================================================
41
--- a/src/gcc/config/rs6000/t-linux64
42
+++ b/src/gcc/config/rs6000/t-linux64
44
MULTILIB_OPTIONS = m64/m32
45
MULTILIB_DIRNAMES = 64 32
46
MULTILIB_EXTRA_OPTS = fPIC
47
+ifneq (,$(findstring powerpc64,$(target)))
48
+MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:powerpc64-linux-gnu)
49
+MULTILIB_OSDIRNAMES += ../lib32$(call if_multiarch,:powerpc-linux-gnu)
51
MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
52
-MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
53
+MULTILIB_OSDIRNAMES += ../lib$(call if_multiarch,:powerpc-linux-gnu)
56
MULTIARCH_DIRNAME = $(call if_multiarch,powerpc$(if $(findstring 64,$(target)),64)-linux-gnu)
57
Index: b/src/gcc/config/i386/t-linux64
58
===================================================================
59
--- a/src/gcc/config/i386/t-linux64
60
+++ b/src/gcc/config/i386/t-linux64
63
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
64
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
65
+ifneq (,$(findstring gnux32,$(target)))
66
MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
67
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
68
+MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
69
+MULTILIB_OSDIRNAMES+= mx32=../lib$(call if_multiarch,:x86_64-linux-gnux32)
70
+else ifneq (,$(findstring x86_64,$(target)))
71
+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
72
+MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
73
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
75
+MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
76
+MULTILIB_OSDIRNAMES+= m32=../lib$(call if_multiarch,:i386-linux-gnu)
77
+MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
80
ifneq (,$(findstring x86_64,$(target)))
81
ifneq (,$(findstring biarchx32.h,$(tm_include_list)))
82
Index: b/src/gcc/config/mips/t-linux64
83
===================================================================
84
--- a/src/gcc/config/mips/t-linux64
85
+++ b/src/gcc/config/mips/t-linux64
87
MULTILIB_DIRNAMES = n32 32 64
88
MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
89
MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
91
+ifneq (,$(findstring gnuabi64,$(target)))
92
+MULTILIB_OSDIRNAMES = \
93
+ ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
94
+ ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
95
+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
96
+else ifneq (,$(findstring gnuabin32,$(target)))
97
+ ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
98
+ ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
99
+ ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
101
MULTILIB_OSDIRNAMES = \
102
../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
103
../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
104
../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
107
+ifneq (,$(findstring gnuabi64,$(target)))
108
+ MULTIARCH_DIRNAME = $(call if_multiarch,mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
109
+else ifneq (,$(findstring gnuabin32,$(target)))
110
+ MULTIARCH_DIRNAME = $(call if_multiarch,mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT))
112
+ MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT))