1
# DP: - Remaining multiarch patches, not yet submitted upstream.
2
# DP: - Add MULTIARCH_DIRNAME definitions for multilib configurations,
3
# DP: which are used for the non-multilib builds.
5
2013-06-12 Matthias Klose <doko@ubuntu.com>
7
* config/i386/t-linux64: Set MULTIARCH_DIRNAME.
8
* config/i386/t-kfreebsd: Set MULTIARCH_DIRNAME.
9
* config.gcc (i[34567]86-*-linux* | x86_64-*-linux*): Prepend
10
i386/t-linux to $tmake_file.
11
* config/mips/t-linux64: Set MULTIARCH_DIRNAME.
12
* config/rs6000/t-linux64: Set MULTIARCH_DIRNAME.
13
* config/s390/t-linux64: Set MULTIARCH_DIRNAME.
14
* config/sparc/t-linux64: Set MULTIARCH_DIRNAME.
16
Index: b/src/gcc/config/sh/t-linux
17
===================================================================
18
--- a/src/gcc/config/sh/t-linux
19
+++ b/src/gcc/config/sh/t-linux
24
+MULTILIB_OSDIRNAMES = sh4-linux-gnu:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu
25
Index: b/src/gcc/config/sparc/t-linux64
26
===================================================================
27
--- a/src/gcc/config/sparc/t-linux64
28
+++ b/src/gcc/config/sparc/t-linux64
30
MULTILIB_DIRNAMES = 64 32
31
MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
32
MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
34
+MULTIARCH_DIRNAME = $(call if_multiarch,sparc$(if $(findstring 64,$(target)),64)-linux-gnu)
35
Index: b/src/gcc/config/s390/t-linux64
36
===================================================================
37
--- a/src/gcc/config/s390/t-linux64
38
+++ b/src/gcc/config/s390/t-linux64
40
MULTILIB_DIRNAMES = 64 32
41
MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:s390x-linux-gnu)
42
MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu)
44
+MULTIARCH_DIRNAME = $(call if_multiarch,s390$(if $(findstring s390x,$(target)),x)-linux-gnu)
45
Index: b/src/gcc/config/rs6000/t-linux
46
===================================================================
47
--- a/src/gcc/config/rs6000/t-linux
48
+++ b/src/gcc/config/rs6000/t-linux
51
ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
52
ifneq (,$(findstring spe,$(target)))
53
-MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file_list)),,v1)
54
+MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring 8548,$(with_cpu)),,v1)
56
MULTIARCH_DIRNAME = powerpc-linux-gnu
58
Index: b/src/gcc/config/rs6000/t-linux64
59
===================================================================
60
--- a/src/gcc/config/rs6000/t-linux64
61
+++ b/src/gcc/config/rs6000/t-linux64
63
MULTILIB_EXTRA_OPTS = fPIC
64
MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
65
MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
67
+MULTIARCH_DIRNAME = $(call if_multiarch,powerpc$(if $(findstring 64,$(target)),64)-linux-gnu)
68
Index: b/src/gcc/config/i386/t-linux64
69
===================================================================
70
--- a/src/gcc/config/i386/t-linux64
71
+++ b/src/gcc/config/i386/t-linux64
73
MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
74
MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
75
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
77
+ifneq (,$(findstring x86_64,$(target)))
78
+ ifneq (,$(findstring biarchx32.h,$(tm_include_list)))
79
+ MULTIARCH_DIRNAME = $(call if_multiarch,x86_64-linux-gnux32)
81
+ MULTIARCH_DIRNAME = $(call if_multiarch,x86_64-linux-gnu)
84
+ MULTIARCH_DIRNAME = $(call if_multiarch,i386-linux-gnu)
86
Index: b/src/gcc/config/i386/t-kfreebsd
87
===================================================================
88
--- a/src/gcc/config/i386/t-kfreebsd
89
+++ b/src/gcc/config/i386/t-kfreebsd
91
-MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu)
92
+ifeq (,$(MULTIARCH_DIRNAME))
93
+ MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu)
96
# MULTILIB_OSDIRNAMES are set in t-linux64.
97
KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target))))
98
MULTILIB_OSDIRNAMES := $(filter-out mx32=%,$(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES)))
100
+MULTIARCH_DIRNAME := $(subst linux,$(KFREEBSD_OS),$(MULTIARCH_DIRNAME))
101
Index: b/src/gcc/config/mips/t-linux64
102
===================================================================
103
--- a/src/gcc/config/mips/t-linux64
104
+++ b/src/gcc/config/mips/t-linux64
106
../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
107
../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
108
../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
110
+ifneq (,$(findstring abin32,$(target)))
111
+MULTIARCH_DIRNAME = $(call if_multiarch,mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT))
113
+ifneq (,$(findstring abi64,$(target)))
114
+MULTIARCH_DIRNAME = $(call if_multiarch,mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
116
+MULTIARCH_DIRNAME = $(call if_multiarch,mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT))
119
Index: b/src/gcc/config.gcc
120
===================================================================
121
--- a/src/gcc/config.gcc
122
+++ b/src/gcc/config.gcc
123
@@ -3703,7 +3703,7 @@
124
i[34567]86-*-darwin* | x86_64-*-darwin*)
126
i[34567]86-*-linux* | x86_64-*-linux*)
127
- tmake_file="$tmake_file i386/t-linux"
128
+ tmake_file="i386/t-linux $tmake_file"
130
i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu)
131
tmake_file="$tmake_file i386/t-kfreebsd"
132
--- a/src/gcc/java/jvspec.c
133
+++ b/src/gcc/java/jvspec.c
135
"jvgenmain %{findirect-dispatch} %{D*} %b %m.i |\n\
137
%{!Q:-quiet} -dumpbase %b.c %{d*} %{m*}\
140
%{v:-version} %{pg:-p} %{p}\
141
%<fbounds-check %<fno-bounds-check\
142
%<fassume-compiled* %<fno-assume-compiled*\