crosstool-ng/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch
Yann E. MORIN" b60a8806c6 Add a patchset for glibc 2_9. Vampirised from the gentoo repository.
/trunk/patches/glibc/2_9/500-ppc-glibc-2.9-atomic.patch                                            |  414   414     0     0 ++++++++++
 /trunk/patches/glibc/2_9/140-regex-BZ9697.patch                                                    |  111   111     0     0 +++
 /trunk/patches/glibc/2_9/190-queue-header-updates.patch                                            |   89    89     0     0 ++
 /trunk/patches/glibc/2_9/370-hppa_glibc-2.7-hppa-nptl-carlos.patch                                 |  249   249     0     0 ++++++
 /trunk/patches/glibc/2_9/450-alpha-glibc-2.5-no-page-header.patch                                  |   32    32     0     0 +
 /trunk/patches/glibc/2_9/270-ldbl-nexttowardf.patch                                                |   68    68     0     0 ++
 /trunk/patches/glibc/2_9/330-2.3.3-china.patch                                                     |   35    35     0     0 +
 /trunk/patches/glibc/2_9/340-new-valencian-locale.patch                                            |  120   120     0     0 +++
 /trunk/patches/glibc/2_9/410-2.9-fnmatch.patch                                                     |   64    64     0     0 ++
 /trunk/patches/glibc/2_9/350-2.4-undefine-__i686.patch                                             |   47    47     0     0 +
 /trunk/patches/glibc/2_9/160-i386-x86_64-revert-clone-cfi.patch                                    |   53    53     0     0 +
 /trunk/patches/glibc/2_9/420-dont-build-timezone.patch                                             |   19    19     0     0 +
 /trunk/patches/glibc/2_9/150-regex-BZ697.patch                                                     |   28    28     0     0 +
 /trunk/patches/glibc/2_9/290-no-inline-gmon.patch                                                  |   38    38     0     0 +
 /trunk/patches/glibc/2_9/280-section-comments.patch                                                |   29    29     0     0 +
 /trunk/patches/glibc/2_9/180-math-tests.patch                                                      |   72    72     0     0 ++
 /trunk/patches/glibc/2_9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch |   35    35     0     0 +
 /trunk/patches/glibc/2_9/250-resolv-dynamic.patch                                                  |   44    44     0     0 +
 /trunk/patches/glibc/2_9/300-2.9-check_native-headers.patch                                        |   22    22     0     0 +
 /trunk/patches/glibc/2_9/310-2.3.6-fix-pr631.patch                                                 |   50    50     0     0 +
 /trunk/patches/glibc/2_9/130-add_prio-macros.patch                                                 |   26    26     0     0 +
 /trunk/patches/glibc/2_9/260-fadvise64_64.patch                                                    |   30    30     0     0 +
 /trunk/patches/glibc/2_9/440-alpha-glibc-2.4-xstat.patch                                           |  249   249     0     0 ++++++
 /trunk/patches/glibc/2_9/170-2.10-dns-no-gethostbyname4.patch                                      |   35    35     0     0 +
 /trunk/patches/glibc/2_9/230-2.3.3-localedef-fix-trampoline.patch                                  |   74    74     0     0 ++
 /trunk/patches/glibc/2_9/360-2.8-nscd-one-fork.patch                                               |   45    45     0     0 +
 /trunk/patches/glibc/2_9/480-alpha-glibc-2.8-cache-shape.patch                                     |   18    18     0     0 +
 /trunk/patches/glibc/2_9/210-2.9-strlen-hack.patch                                                 |  109   109     0     0 +++
 /trunk/patches/glibc/2_9/320-2.9-assume-pipe2.patch                                                |   59    59     0     0 +
 /trunk/patches/glibc/2_9/100-ssp-compat.patch                                                      |  193   193     0     0 +++++
 /trunk/patches/glibc/2_9/110-respect-env-CPPFLAGS.patch                                            |   30    30     0     0 +
 /trunk/patches/glibc/2_9/220-manual-no-perl.patch                                                  |   29    29     0     0 +
 /trunk/patches/glibc/2_9/390-2.3.3_pre20040117-pt_pax.patch                                        |   35    35     0     0 +
 /trunk/patches/glibc/2_9/460-alpha-glibc-2.5-no-asm-elf-header.patch                               |   38    38     0     0 +
 /trunk/patches/glibc/2_9/400-tests-sandbox-libdl-paths.patch                                       |  198   198     0     0 +++++
 /trunk/patches/glibc/2_9/240-i386-LOAD_PIC_REG.patch                                               |   23    23     0     0 +
 /trunk/patches/glibc/2_9/200-awk-in-C-locale.patch                                                 |   23    23     0     0 +
 /trunk/patches/glibc/2_9/430-2.7-cross-compile-nptl.patch                                          |   57    57     0     0 +
 /trunk/patches/glibc/2_9/380-2.3.6-dl_execstack-PaX-support.patch                                  |   71    71     0     0 ++
 /trunk/patches/glibc/2_9/490-ptr-mangling.patch                                                    |  114   114     0     0 +++
 /trunk/patches/glibc/2_9/470-alpha-glibc-2.8-creat.patch                                           |   19    19     0     0 +
 41 files changed, 3094 insertions(+)
2009-02-02 22:00:18 +00:00

250 lines
10 KiB
Diff

Original patch from: gentoo/src/patchsets/glibc/2.9/1503_hppa_glibc-2.7-hppa-nptl-carlos.patch
-= BEGIN original header =-
-= END original header =-
diff -durN glibc-2_9.orig/elf/rtld.c glibc-2_9/elf/rtld.c
--- glibc-2_9.orig/elf/rtld.c 2009-02-02 22:00:34.000000000 +0100
+++ glibc-2_9/elf/rtld.c 2009-02-02 22:01:12.000000000 +0100
@@ -386,14 +386,14 @@
know it is available. We do not have to clear the memory if we
do not have to use the temporary bootstrap_map. Global variables
are initialized to zero by default. */
-#ifndef DONT_USE_BOOTSTRAP_MAP
+#if !defined DONT_USE_BOOTSTRAP_MAP
# ifdef HAVE_BUILTIN_MEMSET
__builtin_memset (bootstrap_map.l_info, '\0', sizeof (bootstrap_map.l_info));
# else
- for (size_t cnt = 0;
- cnt < sizeof (bootstrap_map.l_info) / sizeof (bootstrap_map.l_info[0]);
- ++cnt)
- bootstrap_map.l_info[cnt] = 0;
+ /* Clear the whole bootstrap_map structure */
+ for (char *cnt = (char *)&(bootstrap_map);
+ cnt < ((char *)&(bootstrap_map) + sizeof (bootstrap_map));
+ *cnt++ = '\0');
# endif
# if USE___THREAD
bootstrap_map.l_tls_modid = 0;
diff -durN glibc-2_9.orig/include/atomic.h glibc-2_9/include/atomic.h
--- glibc-2_9.orig/include/atomic.h 2006-12-21 22:44:00.000000000 +0100
+++ glibc-2_9/include/atomic.h 2009-02-02 22:01:12.000000000 +0100
@@ -174,7 +174,7 @@
__typeof (*(mem)) __atg5_value = (newvalue); \
\
do \
- __atg5_oldval = *__atg5_memp; \
+ __atg5_oldval = *(volatile __typeof (mem))__atg5_memp; \
while (__builtin_expect \
(atomic_compare_and_exchange_bool_acq (__atg5_memp, __atg5_value, \
__atg5_oldval), 0)); \
@@ -195,7 +195,7 @@
__typeof (*(mem)) __atg6_value = (value); \
\
do \
- __atg6_oldval = *__atg6_memp; \
+ __atg6_oldval = *(volatile __typeof (mem))__atg6_memp; \
while (__builtin_expect \
(atomic_compare_and_exchange_bool_acq (__atg6_memp, \
__atg6_oldval \
@@ -213,7 +213,7 @@
__typeof (*(mem)) __atg7_value = (value); \
\
do \
- __atg7_oldv = *__atg7_memp; \
+ __atg7_oldv = *(volatile __typeof (mem))__atg7_memp; \
while (__builtin_expect \
(catomic_compare_and_exchange_bool_acq (__atg7_memp, \
__atg7_oldv \
@@ -231,7 +231,7 @@
__typeof (mem) __atg8_memp = (mem); \
__typeof (*(mem)) __atg8_value = (value); \
do { \
- __atg8_oldval = *__atg8_memp; \
+ __atg8_oldval = *(volatile __typeof (mem))__atg8_memp; \
if (__atg8_oldval >= __atg8_value) \
break; \
} while (__builtin_expect \
@@ -248,7 +248,7 @@
__typeof (mem) __atg9_memp = (mem); \
__typeof (*(mem)) __atg9_value = (value); \
do { \
- __atg9_oldv = *__atg9_memp; \
+ __atg9_oldv = *(volatile __typeof (mem))__atg9_memp; \
if (__atg9_oldv >= __atg9_value) \
break; \
} while (__builtin_expect \
@@ -266,7 +266,7 @@
__typeof (mem) __atg10_memp = (mem); \
__typeof (*(mem)) __atg10_value = (value); \
do { \
- __atg10_oldval = *__atg10_memp; \
+ __atg10_oldval = *(volatile __typeof (mem))__atg10_memp; \
if (__atg10_oldval <= __atg10_value) \
break; \
} while (__builtin_expect \
@@ -350,7 +350,7 @@
\
do \
{ \
- __atg11_oldval = *__atg11_memp; \
+ __atg11_oldval = *(volatile __typeof (mem))__atg11_memp; \
if (__builtin_expect (__atg11_oldval <= 0, 0)) \
break; \
} \
@@ -389,7 +389,7 @@
__typeof (*(mem)) __atg14_mask = ((__typeof (*(mem))) 1 << (bit)); \
\
do \
- __atg14_old = (*__atg14_memp); \
+ __atg14_old = (*(volatile __typeof (mem))__atg14_memp); \
while (__builtin_expect \
(atomic_compare_and_exchange_bool_acq (__atg14_memp, \
__atg14_old | __atg14_mask,\
@@ -407,7 +407,7 @@
__typeof (*(mem)) __atg15_mask = (mask); \
\
do \
- __atg15_old = (*__atg15_memp); \
+ __atg15_old = (*(volatile __typeof (mem))__atg15_memp); \
while (__builtin_expect \
(atomic_compare_and_exchange_bool_acq (__atg15_memp, \
__atg15_old & __atg15_mask, \
@@ -423,7 +423,7 @@
__typeof (*(mem)) __atg16_mask = (mask); \
\
do \
- __atg16_old = (*__atg16_memp); \
+ __atg16_old = (*(volatile __typeof (mem))__atg16_memp); \
while (__builtin_expect \
(atomic_compare_and_exchange_bool_acq (__atg16_memp, \
__atg16_old & __atg16_mask,\
@@ -441,7 +441,7 @@
__typeof (*(mem)) __atg17_mask = (mask); \
\
do \
- __atg17_old = (*__atg17_memp); \
+ __atg17_old = (*(volatile __typeof (mem))__atg17_memp); \
while (__builtin_expect \
(atomic_compare_and_exchange_bool_acq (__atg17_memp, \
__atg17_old | __atg17_mask, \
@@ -457,7 +457,7 @@
__typeof (*(mem)) __atg18_mask = (mask); \
\
do \
- __atg18_old = (*__atg18_memp); \
+ __atg18_old = (*(volatile __typeof (mem))__atg18_memp); \
while (__builtin_expect \
(catomic_compare_and_exchange_bool_acq (__atg18_memp, \
__atg18_old | __atg18_mask,\
@@ -473,7 +473,7 @@
__typeof (*(mem)) __atg19_mask = (mask); \
\
do \
- __atg19_old = (*__atg19_memp); \
+ __atg19_old = (*(volatile __typeof (mem))__atg19_memp); \
while (__builtin_expect \
(atomic_compare_and_exchange_bool_acq (__atg19_memp, \
__atg19_old | __atg19_mask,\
diff -durN glibc-2_9.orig/nptl/Makefile glibc-2_9/nptl/Makefile
--- glibc-2_9.orig/nptl/Makefile 2008-11-12 14:38:23.000000000 +0100
+++ glibc-2_9/nptl/Makefile 2009-02-02 22:01:12.000000000 +0100
@@ -262,9 +262,9 @@
# Files which must not be linked with libpthread.
tests-nolibpthread = tst-unload
-# This sets the stack resource limit to 1023kb, which is not a multiple
-# of the page size since every architecture's page size is > 1k.
-tst-oddstacklimit-ENV = ; ulimit -s 1023;
+# This sets the stack resource limit to 8193kb, which is not a multiple
+# of the page size since every architecture's page size is 4096 bytes.
+tst-oddstacklimit-ENV = ; ulimit -s 8193;
distribute = eintr.c tst-cleanup4aux.c
@@ -423,6 +423,35 @@
CFLAGS-tst-cleanupx4.c += -fexceptions
CFLAGS-tst-oncex3.c += -fexceptions
CFLAGS-tst-oncex4.c += -fexceptions
+
+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
+LDFLAGS-tst-cancelx2 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx3 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx4 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx5 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx6 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx7 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx8 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx9 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx10 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx11 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx12 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx13 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx14 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx15 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx16 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx17 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx18 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx20 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cancelx21 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cleanupx0 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cleanupx1 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cleanupx2 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cleanupx3 += $(ldflags-libgcc_s)
+LDFLAGS-tst-cleanupx4 += $(ldflags-libgcc_s)
+LDFLAGS-tst-oncex3 += $(ldflags-libgcc_s)
+LDFLAGS-tst-oncex4 += $(ldflags-libgcc_s)
+
CFLAGS-tst-align.c += $(stack-align-test-flags)
CFLAGS-tst-align3.c += $(stack-align-test-flags)
CFLAGS-tst-initializers1.c = -W -Wall -Werror
diff -durN glibc-2_9.orig/nptl/pthread_barrier_wait.c glibc-2_9/nptl/pthread_barrier_wait.c
--- glibc-2_9.orig/nptl/pthread_barrier_wait.c 2007-08-01 06:18:50.000000000 +0200
+++ glibc-2_9/nptl/pthread_barrier_wait.c 2009-02-02 22:01:12.000000000 +0100
@@ -64,7 +64,7 @@
do
lll_futex_wait (&ibarrier->curr_event, event,
ibarrier->private ^ FUTEX_PRIVATE_FLAG);
- while (event == ibarrier->curr_event);
+ while (event == *(volatile unsigned int *)&ibarrier->curr_event);
}
/* Make sure the init_count is stored locally or in a register. */
diff -durN glibc-2_9.orig/nptl/sysdeps/pthread/Makefile glibc-2_9/nptl/sysdeps/pthread/Makefile
--- glibc-2_9.orig/nptl/sysdeps/pthread/Makefile 2006-02-28 08:09:41.000000000 +0100
+++ glibc-2_9/nptl/sysdeps/pthread/Makefile 2009-02-02 22:01:12.000000000 +0100
@@ -41,7 +41,9 @@
ifeq ($(have-forced-unwind),yes)
tests += tst-mqueue8x
+ldflags-libgcc_s = --as-needed -lgcc_s --no-as-needed
CFLAGS-tst-mqueue8x.c += -fexceptions
+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s)
endif
endif
diff -durN glibc-2_9.orig/stdio-common/Makefile glibc-2_9/stdio-common/Makefile
--- glibc-2_9.orig/stdio-common/Makefile 2008-07-08 18:32:28.000000000 +0200
+++ glibc-2_9/stdio-common/Makefile 2009-02-02 22:01:12.000000000 +0100
@@ -80,7 +80,7 @@
$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
endif
-CFLAGS-vfprintf.c = -Wno-uninitialized
+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
CFLAGS-vfwprintf.c = -Wno-uninitialized
CFLAGS-tst-printf.c = -Wno-format
CFLAGS-tstdiomisc.c = -Wno-format
diff -durN glibc-2_9.orig/sunrpc/clnt_udp.c glibc-2_9/sunrpc/clnt_udp.c
--- glibc-2_9.orig/sunrpc/clnt_udp.c 2008-07-26 10:42:44.000000000 +0200
+++ glibc-2_9/sunrpc/clnt_udp.c 2009-02-02 22:01:12.000000000 +0100
@@ -462,7 +462,7 @@
while (inlen < 0 && errno == EINTR);
if (inlen < 0)
{
- if (errno == EWOULDBLOCK)
+ if (errno == EWOULDBLOCK || errno == EAGAIN)
continue;
cu->cu_error.re_errno = errno;
return (cu->cu_error.re_status = RPC_CANTRECV);