1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
|
diff -ru gcc/config/rs6000.orig/aix41.h gcc/config/rs6000/aix41.h
--- gcc/config/rs6000.orig/aix41.h 2009-04-17 17:06:51 +0200
+++ gcc/config/rs6000/aix41.h 2009-04-17 17:10:00 +0200
@@ -39,7 +39,7 @@
#define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
%{ansi: -D_ANSI_C_SOURCE}\
%{mpe: -I/usr/lpp/ppe.poe/include}\
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
#undef TARGET_DEFAULT
#define TARGET_DEFAULT MASK_NEW_MNEMONICS
@@ -63,8 +63,8 @@
#define LIB_SPEC "%{pg:-L/lib/profiled -L/usr/lib/profiled}\
%{p:-L/lib/profiled -L/usr/lib/profiled} %{!shared:%{g*:-lg}}\
%{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
- %{pthread: -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a}\
- %{!pthread: -lc}"
+ %{pthread:} -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a\
+ "
#undef LINK_SPEC
#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
@@ -77,8 +77,8 @@
%{!pg:%{p:/usr/lpp/ppe.poe/lib/mcrt0.o}\
%{!p:/usr/lpp/ppe.poe/lib/crt0.o}}}\
%{!mpe:\
- %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
- %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
+ %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
+ }}"
/* AIX 4 uses PowerPC nop (ori 0,0,0) instruction as call glue for PowerPC
and "cror 31,31,31" for POWER architecture. */
diff -ru gcc/config/rs6000.orig/aix43.h gcc/config/rs6000/aix43.h
--- gcc/config/rs6000.orig/aix43.h 2009-04-17 17:06:51 +0200
+++ gcc/config/rs6000/aix43.h 2009-04-17 17:10:34 +0200
@@ -105,7 +105,7 @@
%{ansi: -D_ANSI_C_SOURCE}\
%{maix64: -D__64BIT__}\
%{mpe: -I/usr/lpp/ppe.poe/include}\
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
/* The GNU C++ standard library requires that these macros be
defined. */
@@ -114,7 +114,7 @@
"-D_ALL_SOURCE \
%{maix64: -D__64BIT__} \
%{mpe: -I/usr/lpp/ppe.poe/include} \
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
#undef TARGET_DEFAULT
#define TARGET_DEFAULT MASK_NEW_MNEMONICS
@@ -139,8 +139,8 @@
%{p:-L/lib/profiled -L/usr/lib/profiled}\
%{!maix64:%{!shared:%{g*:-lg}}}\
%{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
- %{pthread:-L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a}\
- %{!pthread:-lc}"
+ %{pthread:}-L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a\
+ "
#undef LINK_SPEC
#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
@@ -152,8 +152,8 @@
#define STARTFILE_SPEC "%{!shared:\
%{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
%{!maix64:\
- %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
- %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
+ %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
+ }}"
/* AIX 4.3 typedefs ptrdiff_t as "long" while earlier releases used "int". */
diff -ru gcc/config/rs6000.orig/aix51.h gcc/config/rs6000/aix51.h
--- gcc/config/rs6000.orig/aix51.h 2009-04-17 17:06:51 +0200
+++ gcc/config/rs6000/aix51.h 2009-04-17 17:10:56 +0200
@@ -101,7 +101,7 @@
%{ansi: -D_ANSI_C_SOURCE} \
%{maix64: -D__64BIT__} \
%{mpe: -I/usr/lpp/ppe.poe/include} \
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
/* The GNU C++ standard library requires that these macros be
defined. */
@@ -110,7 +110,7 @@
"-D_ALL_SOURCE \
%{maix64: -D__64BIT__} \
%{mpe: -I/usr/lpp/ppe.poe/include} \
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
#undef TARGET_DEFAULT
#define TARGET_DEFAULT MASK_NEW_MNEMONICS
@@ -135,7 +135,7 @@
%{p:-L/lib/profiled -L/usr/lib/profiled}\
%{!maix64:%{!shared:%{g*:-lg}}}\
%{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
- %{pthread:-lpthreads} -lc"
+ %{pthread:}-lpthreads -lc"
#undef LINK_SPEC
#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
@@ -147,8 +147,8 @@
#define STARTFILE_SPEC "%{!shared:\
%{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
%{!maix64:\
- %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
- %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
+ %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
+ }}"
/* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int". */
diff -ru gcc/config/rs6000.orig/aix52.h gcc/config/rs6000/aix52.h
--- gcc/config/rs6000.orig/aix52.h 2009-04-17 17:06:50 +0200
+++ gcc/config/rs6000/aix52.h 2009-04-17 17:11:15 +0200
@@ -99,7 +99,7 @@
%{ansi: -D_ANSI_C_SOURCE} \
%{maix64: -D__64BIT__} \
%{mpe: -I/usr/lpp/ppe.poe/include} \
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
/* The GNU C++ standard library requires that these macros be
defined. Synchronize with libstdc++ os_defines.h. */
@@ -108,7 +108,7 @@
"-D_ALL_SOURCE \
%{maix64: -D__64BIT__} \
%{mpe: -I/usr/lpp/ppe.poe/include} \
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
#undef TARGET_DEFAULT
#define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
@@ -137,7 +137,7 @@
%{p:-L/lib/profiled -L/usr/lib/profiled}\
%{!maix64:%{!shared:%{g*:-lg}}}\
%{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
- %{pthread:-lpthreads} -lc"
+ %{pthread:}-lpthreads -lc"
#undef LINK_SPEC
#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
@@ -149,8 +149,8 @@
#define STARTFILE_SPEC "%{!shared:\
%{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
%{!maix64:\
- %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
- %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
+ %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
+ }}"
/* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int". */
diff -ru gcc/config/rs6000.orig/aix61.h gcc/config/rs6000/aix61.h
--- gcc/config/rs6000.orig/aix61.h 2009-04-17 17:06:51 +0200
+++ gcc/config/rs6000/aix61.h 2009-04-17 17:11:32 +0200
@@ -102,7 +102,7 @@
%{ansi: -D_ANSI_C_SOURCE} \
%{maix64: -D__64BIT__} \
%{mpe: -I/usr/lpp/ppe.poe/include} \
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
/* The GNU C++ standard library requires that these macros be
defined. Synchronize with libstdc++ os_defines.h. */
@@ -111,7 +111,7 @@
"-D_ALL_SOURCE -D__COMPATMATH__ \
%{maix64: -D__64BIT__} \
%{mpe: -I/usr/lpp/ppe.poe/include} \
- %{pthread: -D_THREAD_SAFE}"
+ %{pthread:} -D_THREAD_SAFE"
#undef TARGET_DEFAULT
#define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
@@ -140,7 +140,7 @@
%{p:-L/lib/profiled -L/usr/lib/profiled}\
%{!maix64:%{!shared:%{g*:-lg}}}\
%{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
- %{pthread:-lpthreads} -lc"
+ %{pthread:}-lpthreads -lc"
#undef LINK_SPEC
#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
@@ -152,8 +152,8 @@
#define STARTFILE_SPEC "%{!shared:\
%{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
%{!maix64:\
- %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
- %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
+ %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
+ }}"
/* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int". */
diff -ru gcc/config/rs6000.orig/t-aix43 gcc/config/rs6000/t-aix43
--- gcc/config/rs6000.orig/t-aix43 2009-04-17 17:06:51 +0200
+++ gcc/config/rs6000/t-aix43 2009-04-17 17:13:15 +0200
@@ -10,13 +10,13 @@
echo '#define FLOAT' > fp-bit.c
cat $(srcdir)/config/fp-bit.c >> fp-bit.c
-# Build the libraries for pthread and all of the
+# Build the libraries for all of the
# different processor models
-MULTILIB_OPTIONS = pthread \
+MULTILIB_OPTIONS = \
mcpu=common/mcpu=power/mcpu=powerpc/maix64
-MULTILIB_DIRNAMES = pthread \
+MULTILIB_DIRNAMES = \
common power powerpc ppc64
MULTILIB_MATCHES = mcpu?power=mcpu?power \
@@ -46,7 +46,7 @@
SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-Wl,-bE:@shlib_map_file@ -o @multilib_dir@/shr.o \
@multilib_flags@ @shlib_objs@ -lc \
- `case @multilib_dir@ in \
+ `case pthread@multilib_dir@ in \
*pthread*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
*) echo -lc ;; esac` ; \
rm -f @multilib_dir@/tmp-@shlib_base_name@.a ; \
@@ -61,7 +61,7 @@
$$(mkinstalldirs) $$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@; \
$(INSTALL_DATA) @multilib_dir@/@shlib_base_name@.a \
$$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@/
-SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac`
+SHLIB_LIBS = -lc `case pthread@multilib_dir@ in *pthread*) echo -lpthread ;; esac`
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
SHLIB_NM_FLAGS = -Bpg -X32_64
diff -ru gcc/config/rs6000.orig/t-aix52 gcc/config/rs6000/t-aix52
--- gcc/config/rs6000.orig/t-aix52 2009-04-17 17:06:50 +0200
+++ gcc/config/rs6000/t-aix52 2009-04-17 17:13:32 +0200
@@ -10,12 +10,12 @@
echo '#define FLOAT' > fp-bit.c
cat $(srcdir)/config/fp-bit.c >> fp-bit.c
-# Build the libraries for pthread and all of the
+# Build the libraries for all of the
# different processor models
-MULTILIB_OPTIONS = pthread maix64
+MULTILIB_OPTIONS = maix64
-MULTILIB_DIRNAMES = pthread ppc64
+MULTILIB_DIRNAMES = ppc64
MULTILIB_MATCHES =
@@ -27,7 +27,7 @@
SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
-Wl,-bE:@shlib_map_file@ -o @multilib_dir@/shr.o \
@multilib_flags@ @shlib_objs@ -lc \
- `case @multilib_dir@ in \
+ `case pthread@multilib_dir@ in \
*pthread*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
*) echo -lc ;; esac` ; \
rm -f @multilib_dir@/tmp-@shlib_base_name@.a ; \
@@ -42,7 +42,7 @@
$$(mkinstalldirs) $$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@; \
$(INSTALL_DATA) @multilib_dir@/@shlib_base_name@.a \
$$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@/
-SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac`
+SHLIB_LIBS = -lc `case pthread@multilib_dir@ in *pthread*) echo -lpthread ;; esac`
SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
SHLIB_NM_FLAGS = -Bpg -X32_64
|
GitWeb