Author: adconrad
Date: 2015-03-17 13:58:39 +0000 (Tue, 17 Mar 2015)
New Revision: 6385
Removed:
glibc-package/branches/glibc-2.21/debian/patches/hppa/local-EAGAIN.diff
glibc-package/branches/glibc-2.21/debian/patches/hppa/local-fanotify_mark-5i.diff
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-fadvise64_64.diff
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-nptl-carlos.diff
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/series
Log:
* Drop some hppa patches that Carlos O'Donell claims are no longer needed:
- debian/patches/hppa/local-EAGAIN.diff: Dropped.
- debian/patches/hppa/local-fanotify_mark-5i.diff: Dropped.
- debian/patches/hppa/submitted-fadvise64_64.diff: Dropped.
- debian/patches/hppa/submitted-nptl-carlos.diff: Dropped.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-16 22:48:41 UTC
(rev 6384)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-17 13:58:39 UTC
(rev 6385)
@@ -54,10 +54,8 @@
- debian/patches/arm64/submitted-setcontext.diff: Merged.
- debian/patches/arm64/submitted-tst-setcontext.diff: Merged.
- debian/patches/hppa/cvs-sigrtmin.diff: Merged.
- - debian/patches/hppa/local-EAGAIN.diff: Rebased.
- debian/patches/hppa/local-atomic.diff: Dropped.
- debian/patches/hppa/local-elf-make-cflags.diff: Rebased.
- - debian/patches/hppa/local-fanotify_mark-5i.diff: Rebased.
- debian/patches/hppa/local-fcntl-osync.diff: Rebased.
- debian/patches/hppa/local-fpu.diff: Rebased.
- debian/patches/hppa/local-inlining.diff: Rebased.
@@ -66,7 +64,6 @@
- debian/patches/hppa/local-setjmp-namespace.diff: Dropped.
- debian/patches/hppa/local-shmlba.diff: Rebased.
- debian/patches/hppa/local-stack-grows-up.diff: Rebased.
- - debian/patches/hppa/submitted-nptl-carlos.diff: Rebased.
- debian/patches/hurd-i386/tg-libpthread_depends.diff: Rebased.
- debian/patches/i386/submitted-i686-timing.diff: Rebased.
- debian/patches/kfreebsd/local-fbtl-depends.diff: Rebased.
@@ -87,6 +84,11 @@
- debian/patches/powerpc/cvs-ibm-branch.diff: Dropped.
- debian/patches/sparc/local-fork.diff: Dropped.
- debian/patches/sparc/local-sparcv9-target.diff: Rebased.
+ * Drop some hppa patches that Carlos O'Donell claims are no longer needed:
+ - debian/patches/hppa/local-EAGAIN.diff: Dropped.
+ - debian/patches/hppa/local-fanotify_mark-5i.diff: Dropped.
+ - debian/patches/hppa/submitted-fadvise64_64.diff: Dropped.
+ - debian/patches/hppa/submitted-nptl-carlos.diff: Dropped.
* debian/*: Update occurences of 2.19 to 2.21 and update symbols to match.
* debian/patches/any/cvs-vismain-pie.diff: Compile vismain with -fPIE
and link with -pie to fix testsuite failure with the new binutils.
Deleted: glibc-package/branches/glibc-2.21/debian/patches/hppa/local-EAGAIN.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hppa/local-EAGAIN.diff
2015-03-16 22:48:41 UTC (rev 6384)
+++ glibc-package/branches/glibc-2.21/debian/patches/hppa/local-EAGAIN.diff
2015-03-17 13:58:39 UTC (rev 6385)
@@ -1,72 +0,0 @@
----
- nptl/pthread_mutex_trylock.c | 3 ++-
- nptl/sysdeps/pthread/aio_misc.h | 4 ++--
- nptl/sysdeps/pthread/gai_misc.h | 4 ++--
- nptl/sysdeps/unix/sysv/linux/sem_timedwait.c | 2 +-
- nptl/sysdeps/unix/sysv/linux/sem_wait.c | 4 ++--
- sunrpc/clnt_udp.c | 2 +-
- 6 files changed, 10 insertions(+), 9 deletions(-)
-
---- a/nptl/pthread_mutex_trylock.c
-+++ b/nptl/pthread_mutex_trylock.c
-@@ -239,7 +239,8 @@
- private), 0, 0);
-
- if (INTERNAL_SYSCALL_ERROR_P (e, __err)
-- && INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK)
-+ && ((INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK)
-+ || (INTERNAL_SYSCALL_ERRNO (e, __err) == EAGAIN)))
- {
- THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
-
---- a/sysdeps/nptl/aio_misc.h
-+++ b/sysdeps/nptl/aio_misc.h
-@@ -50,7 +50,7 @@
- { \
- status = lll_futex_timed_wait (futexaddr, oldval, timeout, \
- LLL_PRIVATE); \
-- if (status != -EWOULDBLOCK) \
-+ if (status != -EWOULDBLOCK && status != -EAGAIN) \
- break; \
- \
- oldval = *futexaddr; \
-@@ -65,7 +65,7 @@
- else if (status == -ETIMEDOUT) \
- result = EAGAIN; \
- else \
-- assert (status == 0 || status == -EWOULDBLOCK); \
-+ assert (status == 0 || status == -EWOULDBLOCK || status == -EAGAIN);\
- \
- pthread_mutex_lock (&__aio_requests_mutex); \
- }
\
---- a/sysdeps/nptl/gai_misc.h
-+++ b/sysdeps/nptl/gai_misc.h
-@@ -51,7 +51,7 @@
- { \
- status = lll_futex_timed_wait (futexaddr, oldval, timeout, \
- LLL_PRIVATE); \
-- if (status != -EWOULDBLOCK) \
-+ if (status != -EWOULDBLOCK && status != -EAGAIN) \
- break; \
- \
- oldval = *futexaddr; \
-@@ -66,7 +66,7 @@
- else if (status == -ETIMEDOUT) \
- result = EAGAIN; \
- else \
-- assert (status == 0 || status == -EWOULDBLOCK); \
-+ assert (status == 0 || status == -EWOULDBLOCK || status == -EAGAIN);\
- \
- pthread_mutex_lock (&__gai_requests_mutex); \
- }
\
---- a/sunrpc/clnt_udp.c
-+++ b/sunrpc/clnt_udp.c
-@@ -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);
Deleted:
glibc-package/branches/glibc-2.21/debian/patches/hppa/local-fanotify_mark-5i.diff
===================================================================
---
glibc-package/branches/glibc-2.21/debian/patches/hppa/local-fanotify_mark-5i.diff
2015-03-16 22:48:41 UTC (rev 6384)
+++
glibc-package/branches/glibc-2.21/debian/patches/hppa/local-fanotify_mark-5i.diff
2015-03-17 13:58:39 UTC (rev 6385)
@@ -1,9 +0,0 @@
-Index: eglibc-2.18/sysdeps/unix/sysv/linux/hppa/syscalls.list
-===================================================================
---- eglibc-2.18.orig/sysdeps/unix/sysv/linux/hppa/syscalls.list
2014-02-24 20:50:56.481899712 -0500
-+++ eglibc-2.18/sysdeps/unix/sysv/linux/hppa/syscalls.list 2014-02-24
20:50:56.391899294 -0500
-@@ -36,3 +36,4 @@
- setrlimit - setrlimit i:ip __setrlimit setrlimit
- getrlimit - getrlimit i:ip __getrlimit getrlimit
- prlimit64 EXTRA prlimit64 i:iipp __prlimit64
prlimit64@@GLIBC_2.17
-+fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark
fanotify_mark@@GLIBC_2.17
Deleted:
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-fadvise64_64.diff
===================================================================
---
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-fadvise64_64.diff
2015-03-16 22:48:41 UTC (rev 6384)
+++
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-fadvise64_64.diff
2015-03-17 13:58:39 UTC (rev 6385)
@@ -1,26 +0,0 @@
----
- sysdeps/unix/sysv/linux/posix_fadvise.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/posix_fadvise.c
-+++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
-@@ -34,6 +34,19 @@
- return INTERNAL_SYSCALL_ERRNO (ret, err);
- return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+ INTERNAL_SYSCALL_DECL (err);
-+ int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+ __LONG_LONG_PAIR ((long) (offset >> 31),
-+ (long) offset),
-+ __LONG_LONG_PAIR ((long) (len >> 31),
-+ (long) len),
-+ advise);
-+ if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+ return INTERNAL_SYSCALL_ERRNO (ret, err);
-+ return 0;
-+# else
- return ENOSYS;
-+# endif
- #endif
- }
Deleted:
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-nptl-carlos.diff
===================================================================
---
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-nptl-carlos.diff
2015-03-16 22:48:41 UTC (rev 6384)
+++
glibc-package/branches/glibc-2.21/debian/patches/hppa/submitted-nptl-carlos.diff
2015-03-17 13:58:39 UTC (rev 6385)
@@ -1,222 +0,0 @@
----
- elf/rtld.c | 10 +++++-----
- include/atomic.h | 26 +++++++++++++-------------
- nptl/Makefile | 35 ++++++++++++++++++++++++++++++++---
- nptl/pthread_barrier_wait.c | 2 +-
- nptl/sysdeps/pthread/Makefile | 2 ++
- stdio-common/Makefile | 2 +-
- 6 files changed, 54 insertions(+), 23 deletions(-)
-
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -394,14 +394,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
- #endif
-
---- a/include/atomic.h
-+++ b/include/atomic.h
-@@ -184,7 +184,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)); \
-@@ -205,7 +205,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 \
-@@ -223,7 +223,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 \
-@@ -241,7 +241,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 \
-@@ -258,7 +258,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 \
-@@ -276,7 +276,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 \
-@@ -360,7 +360,7 @@
- \
- do
\
- { \
-- __atg11_oldval = *__atg11_memp; \
-+ __atg11_oldval = *(volatile __typeof (mem))__atg11_memp; \
- if (__glibc_unlikely (__atg11_oldval <= 0)) \
- break; \
- } \
-@@ -399,7 +399,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,\
-@@ -417,7 +417,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, \
-@@ -449,7 +449,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,\
-@@ -467,7 +467,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, \
-@@ -483,7 +483,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,\
-@@ -499,7 +499,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,\
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -440,6 +440,35 @@
- CFLAGS-tst-cleanupx4.c += -fexceptions
- CFLAGS-tst-oncex3.c += -fexceptions
- CFLAGS-tst-oncex4.c += -fexceptions
-+
-+ldflags-libgcc_s = -Wl,--as-needed -lgcc_s -Wl,--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
---- a/nptl/pthread_barrier_wait.c
-+++ b/nptl/pthread_barrier_wait.c
-@@ -63,7 +63,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. */
---- a/sysdeps/nptl/Makefile
-+++ b/sysdeps/nptl/Makefile
-@@ -35,7 +35,9 @@
-
- ifeq ($(have-forced-unwind),yes)
- tests += tst-mqueue8x
-+ldflags-libgcc_s = -Wl,--as-needed -lgcc_s -Wl,--no-as-needed
- CFLAGS-tst-mqueue8x.c += -fexceptions
-+LDFLAGS-tst-mqueue8x += $(ldflags-libgcc_s)
- endif
- endif
-
---- a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -88,7 +88,7 @@
- $(evaluate-test)
- endif
-
--CFLAGS-vfprintf.c = -Wno-uninitialized
-+CFLAGS-vfprintf.c = -Wno-uninitialized -fno-delayed-branch
- CFLAGS-vfwprintf.c = -Wno-uninitialized
-
- CFLAGS-tmpfile.c = -fexceptions
Modified: glibc-package/branches/glibc-2.21/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-16
22:48:41 UTC (rev 6384)
+++ glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-17
13:58:39 UTC (rev 6385)
@@ -54,10 +54,7 @@
arm/unsubmitted-ldso-multilib.diff
hppa/local-inlining.diff
-hppa/submitted-fadvise64_64.diff
-hppa/submitted-nptl-carlos.diff
hppa/local-stack-grows-up.diff
-hppa/local-EAGAIN.diff
hppa/local-elf-make-cflags.diff
hppa/local-fcntl-osync.diff
hppa/local-fpu.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: https://lists.debian.org/[email protected]
