|
yann@1365
|
1 |
Original patch from: gentoo/src/patchsets/glibc/2.9/1503_hppa_glibc-2.7-hppa-nptl-carlos.patch
|
|
yann@1365
|
2 |
|
|
yann@1365
|
3 |
-= BEGIN original header =-
|
|
yann@1365
|
4 |
-= END original header =-
|
|
yann@1365
|
5 |
|
|
yann@1365
|
6 |
diff -durN glibc-2_9.orig/elf/rtld.c glibc-2_9/elf/rtld.c
|
|
yann@1365
|
7 |
--- glibc-2_9.orig/elf/rtld.c 2009-02-02 22:00:34.000000000 +0100
|
|
yann@1365
|
8 |
+++ glibc-2_9/elf/rtld.c 2009-02-02 22:01:12.000000000 +0100
|
|
yann@1365
|
9 |
@@ -386,14 +386,14 @@
|
|
yann@1365
|
10 |
know it is available. We do not have to clear the memory if we
|
|
yann@1365
|
11 |
do not have to use the temporary bootstrap_map. Global variables
|
|
yann@1365
|
12 |
are initialized to zero by default. */
|
|
yann@1365
|
13 |
-#ifndef DONT_USE_BOOTSTRAP_MAP
|
|
yann@1365
|
14 |
+#if !defined DONT_USE_BOOTSTRAP_MAP
|
|
yann@1365
|
15 |
# ifdef HAVE_BUILTIN_MEMSET
|
|
yann@1365
|
16 |
__builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
|
|
yann@1365
|
17 |
# else
|
|
yann@1365
|
18 |
- for (size_t cnt = 0;
|
|
yann@1365
|
19 |
- cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
|
|
yann@1365
|
20 |
- ++cnt)
|
|
yann@1365
|
21 |
- bootstrap_map.l_info[cnt] = 0;
|
|
yann@1365
|
22 |
+ /* Clear the whole bootstrap_map structure */
|
|
yann@1365
|
23 |
+ for (char *cnt = (char *)&(bootstrap_map);
|
|
yann@1365
|
24 |
+ cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
|
|
yann@1365
|
25 |
+ *cnt++ = '\0');
|
|
yann@1365
|
26 |
# endif
|
|
yann@1365
|
27 |
# if USE___THREAD
|
|
yann@1365
|
28 |
bootstrap_map.l_tls_modid = 0;
|
|
yann@1365
|
29 |
diff -durN glibc-2_9.orig/include/atomic.h glibc-2_9/include/atomic.h
|
|
yann@1365
|
30 |
--- glibc-2_9.orig/include/atomic.h 2006-12-21 22:44:00.000000000 +0100
|
|
yann@1365
|
31 |
+++ glibc-2_9/include/atomic.h 2009-02-02 22:01:12.000000000 +0100
|
|
yann@1365
|
32 |
@@ -174,7 +174,7 @@
|
|
yann@1365
|
33 |
__typeof (*(mem)) __atg5_value = (newvalue); \
|
|
yann@1365
|
34 |
\
|
|
yann@1365
|
35 |
do \
|
|
yann@1365
|
36 |
- __atg5_oldval = *__atg5_memp; \
|
|
yann@1365
|
37 |
+ __atg5_oldval = *(volatile __typeof (mem))__atg5_memp; \
|
|
yann@1365
|
38 |
while (__builtin_expect \
|
|
yann@1365
|
39 |
(atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
|
|
yann@1365
|
40 |
__atg5_oldval), 0)); \
|
|
yann@1365
|
41 |
@@ -195,7 +195,7 @@
|
|
yann@1365
|
42 |
__typeof (*(mem)) __atg6_value = (value); \
|
|
yann@1365
|
43 |
\
|
|
yann@1365
|
44 |
do \
|
|
yann@1365
|
45 |
- __atg6_oldval = *__atg6_memp; \
|
|
yann@1365
|
46 |
+ __atg6_oldval = *(volatile __typeof (mem))__atg6_memp; \
|
|
yann@1365
|
47 |
while (__builtin_expect \
|
|
yann@1365
|
48 |
(atomic_compare_and_exchange_bool_acq (__atg6_memp, \
|
|
yann@1365
|
49 |
__atg6_oldval \
|
|
yann@1365
|
50 |
@@ -213,7 +213,7 @@
|
|
yann@1365
|
51 |
__typeof (*(mem)) __atg7_value = (value); \
|
|
yann@1365
|
52 |
\
|
|
yann@1365
|
53 |
do \
|
|
yann@1365
|
54 |
- __atg7_oldv = *__atg7_memp; \
|
|
yann@1365
|
55 |
+ __atg7_oldv = *(volatile __typeof (mem))__atg7_memp; \
|
|
yann@1365
|
56 |
while (__builtin_expect \
|
|
yann@1365
|
57 |
(catomic_compare_and_exchange_bool_acq (__atg7_memp, \
|
|
yann@1365
|
58 |
__atg7_oldv \
|
|
yann@1365
|
59 |
@@ -231,7 +231,7 @@
|
|
yann@1365
|
60 |
__typeof (mem) __atg8_memp = (mem); \
|
|
yann@1365
|
61 |
__typeof (*(mem)) __atg8_value = (value); \
|
|
yann@1365
|
62 |
do { \
|
|
yann@1365
|
63 |
- __atg8_oldval = *__atg8_memp; \
|
|
yann@1365
|
64 |
+ __atg8_oldval = *(volatile __typeof (mem))__atg8_memp; \
|
|
yann@1365
|
65 |
if (__atg8_oldval >= __atg8_value) \
|
|
yann@1365
|
66 |
break; \
|
|
yann@1365
|
67 |
} while (__builtin_expect \
|
|
yann@1365
|
68 |
@@ -248,7 +248,7 @@
|
|
yann@1365
|
69 |
__typeof (mem) __atg9_memp = (mem); \
|
|
yann@1365
|
70 |
__typeof (*(mem)) __atg9_value = (value); \
|
|
yann@1365
|
71 |
do { \
|
|
yann@1365
|
72 |
- __atg9_oldv = *__atg9_memp; \
|
|
yann@1365
|
73 |
+ __atg9_oldv = *(volatile __typeof (mem))__atg9_memp; \
|
|
yann@1365
|
74 |
if (__atg9_oldv >= __atg9_value) \
|
|
yann@1365
|
75 |
break; \
|
|
yann@1365
|
76 |
} while (__builtin_expect \
|
|
yann@1365
|
77 |
@@ -266,7 +266,7 @@
|
|
yann@1365
|
78 |
__typeof (mem) __atg10_memp = (mem); \
|
|
yann@1365
|
79 |
__typeof (*(mem)) __atg10_value = (value); \
|
|
yann@1365
|
80 |
do { \
|
|
yann@1365
|
81 |
- __atg10_oldval = *__atg10_memp; \
|
|
yann@1365
|
82 |
+ __atg10_oldval = *(volatile __typeof (mem))__atg10_memp; \
|
|
yann@1365
|
83 |
if (__atg10_oldval <= __atg10_value) \
|
|
yann@1365
|
84 |
break; \
|
|
yann@1365
|
85 |
} while (__builtin_expect \
|
|
yann@1365
|
86 |
@@ -350,7 +350,7 @@
|
|
yann@1365
|
87 |
\
|
|
yann@1365
|
88 |
do \
|
|
yann@1365
|
89 |
{ \
|
|
yann@1365
|
90 |
- __atg11_oldval = *__atg11_memp; \
|
|
yann@1365
|
91 |
+ __atg11_oldval = *(volatile __typeof (mem))__atg11_memp; \
|
|
yann@1365
|
92 |
if (__builtin_expect (__atg11_oldval <= 0, 0)) \
|
|
yann@1365
|
93 |
break; \
|
|
yann@1365
|
94 |
} \
|
|
yann@1365
|
95 |
@@ -389,7 +389,7 @@
|
|
yann@1365
|
96 |
__typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit)); \
|
|
yann@1365
|
97 |
\
|
|
yann@1365
|
98 |
do \
|
|
yann@1365
|
99 |
- __atg14_old = (*__atg14_memp); \
|
|
yann@1365
|
100 |
+ __atg14_old = (*(volatile __typeof (mem))__atg14_memp); \
|
|
yann@1365
|
101 |
while (__builtin_expect \
|
|
yann@1365
|
102 |
(atomic_compare_and_exchange_bool_acq (__atg14_memp, \
|
|
yann@1365
|
103 |
__atg14_old | __atg14_mask,\
|
|
yann@1365
|
104 |
@@ -407,7 +407,7 @@
|
|
yann@1365
|
105 |
__typeof (*(mem)) __atg15_mask = (mask); \
|
|
yann@1365
|
106 |
\
|
|
yann@1365
|
107 |
do \
|
|
yann@1365
|
108 |
- __atg15_old = (*__atg15_memp); \
|
|
yann@1365
|
109 |
+ __atg15_old = (*(volatile __typeof (mem))__atg15_memp); \
|
|
yann@1365
|
110 |
while (__builtin_expect \
|
|
yann@1365
|
111 |
(atomic_compare_and_exchange_bool_acq (__atg15_memp, \
|
|
yann@1365
|
112 |
__atg15_old & __atg15_mask, \
|
|
yann@1365
|
113 |
@@ -423,7 +423,7 @@
|
|
yann@1365
|
114 |
__typeof (*(mem)) __atg16_mask = (mask); \
|
|
yann@1365
|
115 |
\
|
|
yann@1365
|
116 |
do \
|
|
yann@1365
|
117 |
- __atg16_old = (*__atg16_memp); \
|
|
yann@1365
|
118 |
+ __atg16_old = (*(volatile __typeof (mem))__atg16_memp); \
|
|
yann@1365
|
119 |
while (__builtin_expect \
|
|
yann@1365
|
120 |
(atomic_compare_and_exchange_bool_acq (__atg16_memp, \
|
|
yann@1365
|
121 |
__atg16_old & __atg16_mask,\
|
|
yann@1365
|
122 |
@@ -441,7 +441,7 @@
|
|
yann@1365
|
123 |
__typeof (*(mem)) __atg17_mask = (mask); \
|
|
yann@1365
|
124 |
\
|
|
yann@1365
|
125 |
do \
|
|
yann@1365
|
126 |
- __atg17_old = (*__atg17_memp); \
|
|
yann@1365
|
127 |
+ __atg17_old = (*(volatile __typeof (mem))__atg17_memp); \
|
|
yann@1365
|
128 |
while (__builtin_expect \
|
|
yann@1365
|
129 |
(atomic_compare_and_exchange_bool_acq (__atg17_memp, \
|
|
yann@1365
|
130 |
__atg17_old | __atg17_mask, \
|
|
yann@1365
|
131 |
@@ -457,7 +457,7 @@
|
|
yann@1365
|
132 |
__typeof (*(mem)) __atg18_mask = (mask); \
|
|
yann@1365
|
133 |
\
|
|
yann@1365
|
134 |
do \
|
|
yann@1365
|
135 |
- __atg18_old = (*__atg18_memp); \
|
|
yann@1365
|
136 |
+ __atg18_old = (*(volatile __typeof (mem))__atg18_memp); \
|
|
yann@1365
|
137 |
while (__builtin_expect \
|
|
yann@1365
|
138 |
(catomic_compare_and_exchange_bool_acq (__atg18_memp, \
|
|
yann@1365
|
139 |
__atg18_old | __atg18_mask,\
|
|
yann@1365
|
140 |
@@ -473,7 +473,7 @@
|
|
yann@1365
|
141 |
__typeof (*(mem)) __atg19_mask = (mask); \
|
|
yann@1365
|
142 |
\
|
|
yann@1365
|
143 |
do \
|
|
yann@1365
|
144 |
- __atg19_old = (*__atg19_memp); \
|
|
yann@1365
|
145 |
+ __atg19_old = (*(volatile __typeof (mem))__atg19_memp); \
|
|
yann@1365
|
146 |
while (__builtin_expect \
|
|
yann@1365
|
147 |
(atomic_compare_and_exchange_bool_acq (__atg19_memp, \
|
|
yann@1365
|
148 |
__atg19_old | __atg19_mask,\
|
|
yann@1365
|
149 |
diff -durN glibc-2_9.orig/nptl/Makefile glibc-2_9/nptl/Makefile
|
|
yann@1365
|
150 |
--- glibc-2_9.orig/nptl/Makefile 2008-11-12 14:38:23.000000000 +0100
|
|
yann@1365
|
151 |
+++ glibc-2_9/nptl/Makefile 2009-02-02 22:01:12.000000000 +0100
|
|
yann@1365
|
152 |
@@ -262,9 +262,9 @@
|
|
yann@1365
|
153 |
# Files which must not be linked with libpthread.
|
|
yann@1365
|
154 |
tests-nolibpthread = tst-unload
|
|
yann@1365
|
155 |
|
|
yann@1365
|
156 |
-# This sets the stack resource limit to 1023kb, which is not a multiple
|
|
yann@1365
|
157 |
-# of the page size since every architecture's page size is > 1k.
|
|
yann@1365
|
158 |
-tst-oddstacklimit-ENV = ; ulimit -s 1023;
|
|
yann@1365
|
159 |
+# This sets the stack resource limit to 8193kb, which is not a multiple
|
|
yann@1365
|
160 |
+# of the page size since every architecture's page size is 4096 bytes.
|
|
yann@1365
|
161 |
+tst-oddstacklimit-ENV = ; ulimit -s 8193;
|
|
yann@1365
|
162 |
|
|
yann@1365
|
163 |
distribute = eintr.c tst-cleanup4aux.c
|
|
yann@1365
|
164 |
|
|
yann@1365
|
165 |
@@ -423,6 +423,35 @@
|
|
yann@1365
|
166 |
CFLAGS-tst-cleanupx4.c += -fexceptions
|
|
yann@1365
|
167 |
CFLAGS-tst-oncex3.c += -fexceptions
|
|
yann@1365
|
168 |
CFLAGS-tst-oncex4.c += -fexceptions
|
|
yann@1365
|
169 |
+
|
|
yann@1365
|
170 |
+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
|
|
yann@1365
|
171 |
+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
|
|
yann@1365
|
172 |
+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
|
|
yann@1365
|
173 |
+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
|
|
yann@1365
|
174 |
+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
|
|
yann@1365
|
175 |
+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
|
|
yann@1365
|
176 |
+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
|
|
yann@1365
|
177 |
+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
|
|
yann@1365
|
178 |
+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
|
|
yann@1365
|
179 |
+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
|
|
yann@1365
|
180 |
+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
|
|
yann@1365
|
181 |
+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
|
|
yann@1365
|
182 |
+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
|
|
yann@1365
|
183 |
+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
|
|
yann@1365
|
184 |
+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
|
|
yann@1365
|
185 |
+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
|
|
yann@1365
|
186 |
+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
|
|
yann@1365
|
187 |
+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
|
|
yann@1365
|
188 |
+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
|
|
yann@1365
|
189 |
+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
|
|
yann@1365
|
190 |
+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
|
|
yann@1365
|
191 |
+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
|
|
yann@1365
|
192 |
+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
|
|
yann@1365
|
193 |
+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
|
|
yann@1365
|
194 |
+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
|
|
yann@1365
|
195 |
+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
|
|
yann@1365
|
196 |
+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
|
|
yann@1365
|
197 |
+
|
|
yann@1365
|
198 |
CFLAGS-tst-align.c += $(stack-align-test-flags)
|
|
yann@1365
|
199 |
CFLAGS-tst-align3.c += $(stack-align-test-flags)
|
|
yann@1365
|
200 |
CFLAGS-tst-initializers1.c = -W -Wall -Werror
|
|
yann@1365
|
201 |
diff -durN glibc-2_9.orig/nptl/pthread_barrier_wait.c glibc-2_9/nptl/pthread_barrier_wait.c
|
|
yann@1365
|
202 |
--- glibc-2_9.orig/nptl/pthread_barrier_wait.c 2007-08-01 06:18:50.000000000 +0200
|
|
yann@1365
|
203 |
+++ glibc-2_9/nptl/pthread_barrier_wait.c 2009-02-02 22:01:12.000000000 +0100
|
|
yann@1365
|
204 |
@@ -64,7 +64,7 @@
|
|
yann@1365
|
205 |
do
|
|
yann@1365
|
206 |
lll_futex_wait (&ibarrier->curr_event, event,
|
|
yann@1365
|
207 |
ibarrier->private ^ FUTEX_PRIVATE_FLAG);
|
|
yann@1365
|
208 |
- while (event == ibarrier->curr_event);
|
|
yann@1365
|
209 |
+ while (event == *(volatile unsigned int *)&ibarrier->curr_event);
|
|
yann@1365
|
210 |
}
|
|
yann@1365
|
211 |
|
|
yann@1365
|
212 |
/* Make sure the init_count is stored locally or in a register. */
|
|
yann@1365
|
213 |
diff -durN glibc-2_9.orig/nptl/sysdeps/pthread/Makefile glibc-2_9/nptl/sysdeps/pthread/Makefile
|
|
yann@1365
|
214 |
--- glibc-2_9.orig/nptl/sysdeps/pthread/Makefile 2006-02-28 08:09:41.000000000 +0100
|
|
yann@1365
|
215 |
+++ glibc-2_9/nptl/sysdeps/pthread/Makefile 2009-02-02 22:01:12.000000000 +0100
|
|
yann@1365
|
216 |
@@ -41,7 +41,9 @@
|
|
yann@1365
|
217 |
|
|
yann@1365
|
218 |
ifeq ($(have-forced-unwind),yes)
|
|
yann@1365
|
219 |
tests += tst-mqueue8x
|
|
yann@1365
|
220 |
+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
|
|
yann@1365
|
221 |
CFLAGS-tst-mqueue8x.c += -fexceptions
|
|
yann@1365
|
222 |
+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s)
|
|
yann@1365
|
223 |
endif
|
|
yann@1365
|
224 |
endif
|
|
yann@1365
|
225 |
|
|
yann@1365
|
226 |
diff -durN glibc-2_9.orig/stdio-common/Makefile glibc-2_9/stdio-common/Makefile
|
|
yann@1365
|
227 |
--- glibc-2_9.orig/stdio-common/Makefile 2008-07-08 18:32:28.000000000 +0200
|
|
yann@1365
|
228 |
+++ glibc-2_9/stdio-common/Makefile 2009-02-02 22:01:12.000000000 +0100
|
|
yann@1365
|
229 |
@@ -80,7 +80,7 @@
|
|
yann@1365
|
230 |
$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
|
|
yann@1365
|
231 |
endif
|
|
yann@1365
|
232 |
|
|
yann@1365
|
233 |
-CFLAGS-vfprintf.c = -Wno-uninitialized
|
|
yann@1365
|
234 |
+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
|
|
yann@1365
|
235 |
CFLAGS-vfwprintf.c = -Wno-uninitialized
|
|
yann@1365
|
236 |
CFLAGS-tst-printf.c = -Wno-format
|
|
yann@1365
|
237 |
CFLAGS-tstdiomisc.c = -Wno-format
|
|
yann@1365
|
238 |
diff -durN glibc-2_9.orig/sunrpc/clnt_udp.c glibc-2_9/sunrpc/clnt_udp.c
|
|
yann@1365
|
239 |
--- glibc-2_9.orig/sunrpc/clnt_udp.c 2008-07-26 10:42:44.000000000 +0200
|
|
yann@1365
|
240 |
+++ glibc-2_9/sunrpc/clnt_udp.c 2009-02-02 22:01:12.000000000 +0100
|
|
yann@1365
|
241 |
@@ -462,7 +462,7 @@
|
|
yann@1365
|
242 |
while (inlen < 0 && errno == EINTR);
|
|
yann@1365
|
243 |
if (inlen < 0)
|
|
yann@1365
|
244 |
{
|
|
yann@1365
|
245 |
- if (errno == EWOULDBLOCK)
|
|
yann@1365
|
246 |
+ if (errno == EWOULDBLOCK || errno == EAGAIN)
|
|
yann@1365
|
247 |
continue;
|
|
yann@1365
|
248 |
cu->cu_error.re_errno = errno;
|
|
yann@1365
|
249 |
return (cu->cu_error.re_status = RPC_CANTRECV);
|