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