This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch glibc-2.26 in repository glibc.
commit 2d7e2cd7bc1037a46410b6bc3c8a028a179997f6 Author: Samuel Thibault <samuel.thiba...@ens-lyon.org> Date: Sat Sep 2 22:43:00 2017 +0000 Rebase and re-enable hurd patches - patches/hurd-i386/tg-gsync-libc.diff: rebased. - patches/hurd-i386/tg-hurdsig-global-dispositions.diff: rebased. - patches/hurd-i386/tg-pipe2.diff: rebased. - patches/hurd-i386/tg-socket_flags.diff: rebased. - patches/hurd-i386/tg2.25-tls.diff: rebased. --- debian/changelog | 26 ++- debian/patches/hurd-i386/tg-gsync-libc.diff | 177 ++++++++++----------- .../hurd-i386/tg-hurdsig-global-dispositions.diff | 2 +- debian/patches/hurd-i386/tg-pipe2.diff | 9 -- debian/patches/hurd-i386/tg-socket_flags.diff | 7 - debian/patches/hurd-i386/tg2.25-tls.diff | 22 +-- debian/patches/series | 34 ++-- 7 files changed, 122 insertions(+), 155 deletions(-) diff --git a/debian/changelog b/debian/changelog index a327ab8..a0a1774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ glibc (2.26-0experimental0~ppa4) UNRELEASED; urgency=medium + [ Adam Conrad ] * New upstream release (LP: #1703368), with git updates to 2017-09-01: - debian/{symbols.wildcards,control}: Update and regen for 2.26. - debian/patches/alpha/submitted-termios_h.diff: upstreamed. @@ -25,23 +26,6 @@ glibc (2.26-0experimental0~ppa4) UNRELEASED; urgency=medium - debian/patches/localedata/locales-fr.diff: rebased. - debian/patches/powerpc/submitted-tst-tlsopt-powerpc.diff: rebased. - debian/patches/sparc/submitted-sparc64-socketcall.diff: rebased. - - Disabled the following hurd-i386 patches to speed up Linux porting: - - hurd-i386/tg-hurdsig-global-dispositions.diff: disabled. - - hurd-i386/local-hurdsig-global-dispositions-version.diff: disabled. - - hurd-i386/tg-hurdsig-SA_SIGINFO.diff: disabled. - - hurd-i386/tg-hurdsig-fixes-2.diff: disabled. - - hurd-i386/submitted-exec_filename.diff: disabled. - - hurd-i386/tg-hurdsig-boot-fix.diff: disabled. - - hurd-i386/tg-io_select_timeout.diff: disabled. - - hurd-i386/tg-poll_errors_fixes.diff: disabled. - - hurd-i386/tg-socket_flags.diff: disabled. - - hurd-i386/tg-pipe2.diff: disabled. - - hurd-i386/tg-sigstate_thread_reference.diff: disabled. - - hurd-i386/tg-extern_inline.diff: disabled. - - hurd-i386/tg-gsync-libc.diff: disabled. - - hurd-i386/tg-ONSTACK.diff: disabled. - - hurd-i386/tg-libc_rwlock_recursive.diff: disabled. - - hurd-i386/tg2.25-tls.diff: disabled. - debian/patches/localedata/local-hu_HU-sort.diff: Make testsuite agree with the sorting we see in Debian, may need another look. - debian/control.in/libc: Drop ancient Breaks satisfied in oldoldstable. @@ -56,6 +40,14 @@ glibc (2.26-0experimental0~ppa4) UNRELEASED; urgency=medium on cache sizes and noisiness of the build system, which is unreliable. - debian/testsuite-xfail-debian.mk: Use granular pow/setpayloadsig xfails. + [ Samuel Thibault ] + - patches/hurd-i386/tg-gsync-libc.diff: rebased. + - patches/hurd-i386/tg-hurdsig-global-dispositions.diff: rebased. + - patches/hurd-i386/tg-pipe2.diff: rebased. + - patches/hurd-i386/tg-socket_flags.diff: rebased. + - patches/hurd-i386/tg2.25-tls.diff: rebased. + + -- Adam Conrad <adcon...@0c3.net> Sat, 02 Sep 2017 12:15:10 -0600 glibc (2.25-0experimental4) UNRELEASED; urgency=medium diff --git a/debian/patches/hurd-i386/tg-gsync-libc.diff b/debian/patches/hurd-i386/tg-gsync-libc.diff index 414812f..6b22a7f 100644 --- a/debian/patches/hurd-i386/tg-gsync-libc.diff +++ b/debian/patches/hurd-i386/tg-gsync-libc.diff @@ -51,10 +51,10 @@ cleanup routines now use gcc's cleanup attribute sysdeps/mach/hurd/setsid.c | 10 +- 18 files changed, 666 insertions(+), 309 deletions(-) -Index: glibc-2.23/hurd/Makefile +Index: glibc-2.26/hurd/Makefile =================================================================== ---- glibc-2.23.orig/hurd/Makefile -+++ glibc-2.23/hurd/Makefile +--- glibc-2.26.orig/hurd/Makefile ++++ glibc-2.26/hurd/Makefile @@ -56,6 +56,7 @@ routines = hurdstartup hurdinit \ ports-get ports-set hurdports hurdmsg \ errno-loc \ @@ -63,10 +63,10 @@ Index: glibc-2.23/hurd/Makefile $(sig) $(dtable) $(inlines) port-cleanup report-wait xattr sig = hurdsig hurdfault siginfo hurd-raise preempt-sig \ trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \ -Index: glibc-2.23/hurd/Versions +Index: glibc-2.26/hurd/Versions =================================================================== ---- glibc-2.23.orig/hurd/Versions -+++ glibc-2.23/hurd/Versions +--- glibc-2.26.orig/hurd/Versions ++++ glibc-2.26/hurd/Versions @@ -161,4 +161,13 @@ libc { cthread_keycreate; cthread_getspecific; cthread_setspecific; __libc_getspecific; @@ -81,10 +81,10 @@ Index: glibc-2.23/hurd/Versions + lll_set_wake; lll_robust_unlock; lll_requeue; + } } -Index: glibc-2.23/hurd/hurdlock.c +Index: glibc-2.26/hurd/hurdlock.c =================================================================== --- /dev/null -+++ glibc-2.23/hurd/hurdlock.c ++++ glibc-2.26/hurd/hurdlock.c @@ -0,0 +1,247 @@ +/* Copyright (C) 1999-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -333,10 +333,10 @@ Index: glibc-2.23/hurd/hurdlock.c + } +} + -Index: glibc-2.23/hurd/hurdlock.h +Index: glibc-2.26/hurd/hurdlock.h =================================================================== --- /dev/null -+++ glibc-2.23/hurd/hurdlock.h ++++ glibc-2.26/hurd/hurdlock.h @@ -0,0 +1,117 @@ +/* Copyright (C) 1999-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -455,10 +455,10 @@ Index: glibc-2.23/hurd/hurdlock.h + }) + +#endif -Index: glibc-2.23/hurd/hurdpid.c +Index: glibc-2.26/hurd/hurdpid.c =================================================================== ---- glibc-2.23.orig/hurd/hurdpid.c -+++ glibc-2.23/hurd/hurdpid.c +--- glibc-2.26.orig/hurd/hurdpid.c ++++ glibc-2.26/hurd/hurdpid.c @@ -16,6 +16,8 @@ <http://www.gnu.org/licenses/>. */ @@ -476,10 +476,10 @@ Index: glibc-2.23/hurd/hurdpid.c return 0; } -Index: glibc-2.23/hurd/hurdsig.c +Index: glibc-2.26/hurd/hurdsig.c =================================================================== ---- glibc-2.23.orig/hurd/hurdsig.c -+++ glibc-2.23/hurd/hurdsig.c +--- glibc-2.26.orig/hurd/hurdsig.c ++++ glibc-2.26/hurd/hurdsig.c @@ -1617,14 +1617,14 @@ reauth_proc (mach_port_t new) __mach_port_destroy (__mach_task_self (), ref); @@ -497,10 +497,10 @@ Index: glibc-2.23/hurd/hurdsig.c (void) &reauth_proc; /* Silence compiler warning. */ } -Index: glibc-2.23/hurd/setauth.c +Index: glibc-2.26/hurd/setauth.c =================================================================== ---- glibc-2.23.orig/hurd/setauth.c -+++ glibc-2.23/hurd/setauth.c +--- glibc-2.26.orig/hurd/setauth.c ++++ glibc-2.26/hurd/setauth.c @@ -18,14 +18,13 @@ #include <hurd.h> #include <hurd/port.h> @@ -518,10 +518,10 @@ Index: glibc-2.23/hurd/setauth.c /* Set the auth port to NEW, and reauthenticate everything used by the library. */ -Index: glibc-2.23/hurd/sysvshm.c +Index: glibc-2.26/hurd/sysvshm.c =================================================================== ---- glibc-2.23.orig/hurd/sysvshm.c -+++ glibc-2.23/hurd/sysvshm.c +--- glibc-2.26.orig/hurd/sysvshm.c ++++ glibc-2.26/hurd/sysvshm.c @@ -26,6 +26,7 @@ #include <dirent.h> #include <sys/stat.h> @@ -539,10 +539,10 @@ Index: glibc-2.23/hurd/sysvshm.c /* Adds a segment attachment. */ -Index: glibc-2.23/mach/Makefile +Index: glibc-2.26/mach/Makefile =================================================================== ---- glibc-2.23.orig/mach/Makefile -+++ glibc-2.23/mach/Makefile +--- glibc-2.26.orig/mach/Makefile ++++ glibc-2.26/mach/Makefile @@ -23,7 +23,7 @@ headers = mach_init.h mach.h mach_error. $(interface-headers) mach/mach.h mach/mig_support.h mach/error.h \ $(lock-headers) machine-sp.h @@ -552,11 +552,11 @@ Index: glibc-2.23/mach/Makefile routines = $(mach-syscalls) $(mach-shortcuts) \ mach_init mig_strncpy msg \ mig-alloc mig-dealloc mig-reply \ -Index: glibc-2.23/mach/lock-intern.h +Index: glibc-2.26/mach/lock-intern.h =================================================================== ---- glibc-2.23.orig/mach/lock-intern.h -+++ glibc-2.23/mach/lock-intern.h -@@ -19,73 +19,92 @@ +--- glibc-2.26.orig/mach/lock-intern.h ++++ glibc-2.26/mach/lock-intern.h +@@ -19,12 +19,19 @@ #define _LOCK_INTERN_H #include <sys/cdefs.h> @@ -577,9 +577,7 @@ Index: glibc-2.23/mach/lock-intern.h /* Initialize LOCK. */ - void __spin_lock_init (__spin_lock_t *__lock); - - #if defined __USE_EXTERN_INLINES && defined _LIBC +@@ -34,14 +41,11 @@ void __spin_lock_init (__spin_lock_t *__ _EXTERN_INLINE void __spin_lock_init (__spin_lock_t *__lock) { @@ -595,8 +593,7 @@ Index: glibc-2.23/mach/lock-intern.h /* Lock the spin lock LOCK. */ void __spin_lock (__spin_lock_t *__lock); - - #if defined __USE_EXTERN_INLINES && defined _LIBC +@@ -50,31 +54,47 @@ void __spin_lock (__spin_lock_t *__lock) _EXTERN_INLINE void __spin_lock (__spin_lock_t *__lock) { @@ -662,9 +659,7 @@ Index: glibc-2.23/mach/lock-intern.h /* Lock the mutex lock LOCK. */ - void __mutex_lock (void *__lock); - - #if defined __USE_EXTERN_INLINES && defined _LIBC +@@ -84,8 +104,7 @@ void __mutex_lock (void *__lock); _EXTERN_INLINE void __mutex_lock (void *__lock) { @@ -674,7 +669,7 @@ Index: glibc-2.23/mach/lock-intern.h } #endif -@@ -97,19 +116,18 @@ __mutex_lock (void *__lock) +@@ -97,8 +116,7 @@ void __mutex_unlock (void *__lock); _EXTERN_INLINE void __mutex_unlock (void *__lock) { @@ -684,10 +679,7 @@ Index: glibc-2.23/mach/lock-intern.h } #endif - - int __mutex_trylock (void *__lock); - - #if defined __USE_EXTERN_INLINES && defined _LIBC +@@ -109,7 +127,7 @@ int __mutex_trylock (void *__lock); _EXTERN_INLINE int __mutex_trylock (void *__lock) { @@ -696,10 +688,10 @@ Index: glibc-2.23/mach/lock-intern.h } #endif -Index: glibc-2.23/mach/lowlevellock.h +Index: glibc-2.26/mach/lowlevellock.h =================================================================== --- /dev/null -+++ glibc-2.23/mach/lowlevellock.h ++++ glibc-2.26/mach/lowlevellock.h @@ -0,0 +1,80 @@ +/* Copyright (C) 1994-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -781,10 +773,10 @@ Index: glibc-2.23/mach/lowlevellock.h + }) + +#endif -Index: glibc-2.23/mach/mutex-init.c +Index: glibc-2.26/mach/mutex-init.c =================================================================== ---- glibc-2.23.orig/mach/mutex-init.c -+++ glibc-2.23/mach/mutex-init.c +--- glibc-2.26.orig/mach/mutex-init.c ++++ glibc-2.26/mach/mutex-init.c @@ -17,13 +17,10 @@ <http://www.gnu.org/licenses/>. */ @@ -801,10 +793,10 @@ Index: glibc-2.23/mach/mutex-init.c - mutex_init ((struct mutex *) lock); + *(int *)lock = LLL_INITIALIZER; } -Index: glibc-2.23/sysdeps/mach/Makefile +Index: glibc-2.26/sysdeps/mach/Makefile =================================================================== ---- glibc-2.23.orig/sysdeps/mach/Makefile -+++ glibc-2.23/sysdeps/mach/Makefile +--- glibc-2.26.orig/sysdeps/mach/Makefile ++++ glibc-2.26/sysdeps/mach/Makefile @@ -50,4 +50,22 @@ mach-before-compile: before-compile += $(mach-before-compile) endif @@ -828,10 +820,10 @@ Index: glibc-2.23/sysdeps/mach/Makefile +endif + endif # in-Makerules -Index: glibc-2.23/sysdeps/mach/libc-lock.h +Index: glibc-2.26/sysdeps/mach/libc-lock.h =================================================================== ---- glibc-2.23.orig/sysdeps/mach/libc-lock.h -+++ glibc-2.23/sysdeps/mach/libc-lock.h +--- glibc-2.26.orig/sysdeps/mach/libc-lock.h ++++ glibc-2.26/sysdeps/mach/libc-lock.h @@ -20,10 +20,31 @@ #define _LIBC_LOCK_H 1 @@ -1061,42 +1053,39 @@ Index: glibc-2.23/sysdeps/mach/libc-lock.h +#endif #endif /* libc-lock.h */ -Index: glibc-2.23/sysdeps/mach/hurd/bits/errno.h +Index: glibc-2.26/sysdeps/mach/hurd/bits/errno.h =================================================================== ---- glibc-2.23.orig/sysdeps/mach/hurd/bits/errno.h -+++ glibc-2.23/sysdeps/mach/hurd/bits/errno.h -@@ -224,6 +224,10 @@ enum __error_t_codes - #define ETIME _HURD_ERRNO (117)/* Timer expired */ - ECANCELED = _HURD_ERRNO (119), - #define ECANCELED _HURD_ERRNO (119)/* Operation canceled */ -+ EOWNERDEAD = _HURD_ERRNO (120), -+#define EOWNERDEAD _HURD_ERRNO (120)/* Robust mutex owner died */ -+ ENOTRECOVERABLE = _HURD_ERRNO (121), -+#define ENOTRECOVERABLE _HURD_ERRNO (121)/* Robust mutex irrecoverable */ - - /* Errors from <mach/message.h>. */ - EMACH_SEND_IN_PROGRESS = 0x10000001, -@@ -280,6 +284,8 @@ enum __error_t_codes - EKERN_MEMORY_PRESENT = 23, - EKERN_WRITE_PROTECTION_FAILURE = 24, - EKERN_TERMINATED = 26, -+ EKERN_TIMEDOUT = 27, -+ EKERN_INTERRUPTED = 28, - - /* Errors from <mach/mig_errors.h>. */ - EMIG_TYPE_ERROR = -300 /* client type check failure */, -@@ -307,7 +313,7 @@ enum __error_t_codes - - }; - --#define _HURD_ERRNOS 120 -+#define _HURD_ERRNOS 122 - - /* User-visible type of error codes. It is ok to use `int' or - `kern_return_t' for these, but with `error_t' the debugger prints -Index: glibc-2.23/sysdeps/mach/hurd/libc-lock.h +--- glibc-2.26.orig/sysdeps/mach/hurd/bits/errno.h ++++ glibc-2.26/sysdeps/mach/hurd/bits/errno.h +@@ -129,6 +129,8 @@ enum __error_t_codes + EPROTO = 0x40000074, /* Protocol error */ + ETIME = 0x40000075, /* Timer expired */ + ECANCELED = 0x40000077, /* Operation canceled */ ++ EOWNERDEAD = 0x40000078, /* Robust mutex owner died */ ++ ENOTRECOVERABLE = 0x40000079, /* Robust mutex irrecoverable */ + + /* Errors from <mach/message.h>. */ + EMACH_SEND_IN_PROGRESS = 0x10000001, +@@ -334,6 +336,8 @@ typedef enum __error_t_codes error_t; + #define EPROTO 0x40000074 + #define ETIME 0x40000075 + #define ECANCELED 0x40000077 ++#define EOWNERDEAD 0x40000078 ++#define ENOTRECOVERABLE 0x40000079 + + /* Errors from <mach/message.h>. */ + #define EMACH_SEND_IN_PROGRESS 0x10000001 +@@ -417,6 +421,6 @@ typedef enum __error_t_codes error_t; + #define ED_NO_MEMORY 2508 + #define ED_READ_ONLY 2509 + +-#define _HURD_ERRNOS 120 ++#define _HURD_ERRNOS 122 + + #endif /* bits/errno.h. */ +Index: glibc-2.26/sysdeps/mach/hurd/libc-lock.h =================================================================== ---- glibc-2.23.orig/sysdeps/mach/hurd/libc-lock.h +--- glibc-2.26.orig/sysdeps/mach/hurd/libc-lock.h +++ /dev/null @@ -1,219 +0,0 @@ -/* libc-internal interface for mutex locks. Hurd version using Mach cthreads. @@ -1318,10 +1307,10 @@ Index: glibc-2.23/sysdeps/mach/hurd/libc-lock.h -#endif - -#endif /* libc-lock.h */ -Index: glibc-2.23/sysdeps/mach/hurd/setpgid.c +Index: glibc-2.26/sysdeps/mach/hurd/setpgid.c =================================================================== ---- glibc-2.23.orig/sysdeps/mach/hurd/setpgid.c -+++ glibc-2.23/sysdeps/mach/hurd/setpgid.c +--- glibc-2.26.orig/sysdeps/mach/hurd/setpgid.c ++++ glibc-2.26/sysdeps/mach/hurd/setpgid.c @@ -19,6 +19,7 @@ #include <unistd.h> #include <hurd.h> @@ -1346,10 +1335,10 @@ Index: glibc-2.23/sysdeps/mach/hurd/setpgid.c return 0; -Index: glibc-2.23/sysdeps/mach/hurd/setsid.c +Index: glibc-2.26/sysdeps/mach/hurd/setsid.c =================================================================== ---- glibc-2.23.orig/sysdeps/mach/hurd/setsid.c -+++ glibc-2.23/sysdeps/mach/hurd/setsid.c +--- glibc-2.26.orig/sysdeps/mach/hurd/setsid.c ++++ glibc-2.26/sysdeps/mach/hurd/setsid.c @@ -21,6 +21,7 @@ #include <hurd/port.h> #include <hurd/fd.h> @@ -1374,5 +1363,3 @@ Index: glibc-2.23/sysdeps/mach/hurd/setsid.c } HURD_CRITICAL_END; --- -tg: (bde3bfa..) t/gsync-libc (depends on: t/gsync-libc-merge) diff --git a/debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff b/debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff index 9ed282f..321aa1b 100644 --- a/debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff +++ b/debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff @@ -176,7 +176,7 @@ during/around the time __proc_dostop executes. + instead of this one. */ struct sigaction actions[NSIG]; + - struct sigaltstack sigaltstack; + stack_t sigaltstack; /* Chain of thread-local signal preemptors; see <hurd/sigpreempt.h>. @@ -124,6 +130,26 @@ extern struct hurd_sigstate *_hurd_self_ diff --git a/debian/patches/hurd-i386/tg-pipe2.diff b/debian/patches/hurd-i386/tg-pipe2.diff index 2c2e6d7..4a16e61 100644 --- a/debian/patches/hurd-i386/tg-pipe2.diff +++ b/debian/patches/hurd-i386/tg-pipe2.diff @@ -15,15 +15,6 @@ Subject: [PATCH] pipe2 sysdeps/mach/hurd/pipe2.c | 61 +++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 20 deletions(-) -diff --git a/sysdeps/mach/hurd/kernel-features.h b/sysdeps/mach/hurd/kernel-features.h -index 2b10327..d603be8 100644 ---- a/sysdeps/mach/hurd/kernel-features.h -+++ b/sysdeps/mach/hurd/kernel-features.h -@@ -24,3 +24,4 @@ - #define __ASSUME_DUP3 1 - #define __ASSUME_ACCEPT4 1 - #define __ASSUME_SOCK_CLOEXEC 1 -+#define __ASSUME_PIPE2 1 diff --git a/sysdeps/mach/hurd/pipe.c b/sysdeps/mach/hurd/pipe.c index 5f91648..24a74ca 100644 --- a/sysdeps/mach/hurd/pipe.c diff --git a/debian/patches/hurd-i386/tg-socket_flags.diff b/debian/patches/hurd-i386/tg-socket_flags.diff index 0c51478..f6b41a6 100644 --- a/debian/patches/hurd-i386/tg-socket_flags.diff +++ b/debian/patches/hurd-i386/tg-socket_flags.diff @@ -13,13 +13,6 @@ Subject: [PATCH] socket_flags sysdeps/mach/hurd/socket.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) ---- a/sysdeps/mach/hurd/kernel-features.h -+++ b/sysdeps/mach/hurd/kernel-features.h -@@ -23,3 +23,4 @@ - #define __ASSUME_O_CLOEXEC 1 - #define __ASSUME_DUP3 1 - #define __ASSUME_ACCEPT4 1 -+#define __ASSUME_SOCK_CLOEXEC 1 --- a/sysdeps/mach/hurd/socket.c +++ b/sysdeps/mach/hurd/socket.c @@ -21,6 +21,7 @@ diff --git a/debian/patches/hurd-i386/tg2.25-tls.diff b/debian/patches/hurd-i386/tg2.25-tls.diff index 5e274e4..0e28032 100644 --- a/debian/patches/hurd-i386/tg2.25-tls.diff +++ b/debian/patches/hurd-i386/tg2.25-tls.diff @@ -12,22 +12,26 @@ Signed-off-by: Samuel Thibault <samuel.thiba...@ens-lyon.org> sysdeps/mach/hurd/i386/init-first.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---- a/csu/libc-start.c -+++ b/csu/libc-start.c -@@ -185,8 +185,10 @@ LIBC_START_MAIN (int (*main) (int, char +Index: glibc-2.26/csu/libc-start.c +=================================================================== +--- glibc-2.26.orig/csu/libc-start.c ++++ glibc-2.26/csu/libc-start.c +@@ -193,8 +193,10 @@ LIBC_START_MAIN (int (*main) (int, char /* Perform IREL{,A} relocations. */ - apply_irel (); + ARCH_SETUP_IREL (); +#ifndef __GNU__ /* The stack guard goes into the TCB, so initialize it early. */ __libc_setup_tls (); +#endif - /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random); ---- a/sysdeps/mach/hurd/i386/init-first.c -+++ b/sysdeps/mach/hurd/i386/init-first.c -@@ -197,7 +197,8 @@ init (int *data) + /* In some architectures, IREL{,A} relocations happen after TLS setup in + order to let IFUNC resolvers benefit from TCB information, e.g. powerpc's +Index: glibc-2.26/sysdeps/mach/hurd/i386/init-first.c +=================================================================== +--- glibc-2.26.orig/sysdeps/mach/hurd/i386/init-first.c ++++ glibc-2.26/sysdeps/mach/hurd/i386/init-first.c +@@ -189,7 +189,8 @@ init (int *data) assert (d->phdrsz % sizeof (ElfW(Phdr)) == 0); } diff --git a/debian/patches/series b/debian/patches/series index dd60262..871388f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -69,18 +69,18 @@ hurd-i386/tg-posix_thread.diff hurd-i386/tg-gai_misc.diff hurd-i386/local-madvise_warn.diff hurd-i386/tg-hurdsig-fixes.diff -#hurd-i386/tg-hurdsig-global-dispositions.diff -#hurd-i386/local-hurdsig-global-dispositions-version.diff -#hurd-i386/tg-hurdsig-SA_SIGINFO.diff -#hurd-i386/tg-hurdsig-fixes-2.diff +hurd-i386/tg-hurdsig-global-dispositions.diff +hurd-i386/local-hurdsig-global-dispositions-version.diff +hurd-i386/tg-hurdsig-SA_SIGINFO.diff +hurd-i386/tg-hurdsig-fixes-2.diff hurd-i386/tg-hooks.diff hurd-i386/cvs-libpthread.diff hurd-i386/libpthread_build.diff hurd-i386/tg-libpthread_depends.diff hurd-i386/libpthread_version.diff -#hurd-i386/submitted-exec_filename.diff +hurd-i386/submitted-exec_filename.diff hurd-i386/unsubmitted-gnumach.defs.diff -#hurd-i386/tg-hurdsig-boot-fix.diff +hurd-i386/tg-hurdsig-boot-fix.diff hurd-i386/tg-single-select-timeout.diff hurd-i386/tg-setitimer.diff hurd-i386/tg-pie-sbrk.diff @@ -89,17 +89,17 @@ hurd-i386/tg-remap_getcwd.diff hurd-i386/tg-exec-static.diff hurd-i386/tg-EIEIO-fr.diff hurd-i386/tg-EGREGIOUS-fr.diff -#hurd-i386/tg-io_select_timeout.diff -#hurd-i386/tg-poll_errors_fixes.diff +hurd-i386/tg-io_select_timeout.diff +hurd-i386/tg-poll_errors_fixes.diff hurd-i386/unsubmitted-clock_t_centiseconds.diff hurd-i386/submitted-path_mounted.diff hurd-i386/unsubmitted-NO_HIDDEN.diff -#hurd-i386/tg-socket_flags.diff +hurd-i386/tg-socket_flags.diff hurd-i386/tg-socketpair_flags.diff -#hurd-i386/tg-pipe2.diff +hurd-i386/tg-pipe2.diff hurd-i386/tg-libc_getspecific.diff hurd-i386/tg-futimens.diff -#hurd-i386/tg-sigstate_thread_reference.diff +hurd-i386/tg-sigstate_thread_reference.diff hurd-i386/tg-tls_thread_leak.diff hurd-i386/submitted-bind_umask2.diff hurd-i386/local-libpthread-stacksize.diff @@ -112,23 +112,23 @@ hurd-i386/local-bootstrap.diff hurd-i386/local-mach_print.diff hurd-i386/submitted-hurd-abilist.diff hurd-i386/local-versions.diff -#hurd-i386/submitted-anon-mmap-shared.diff +hurd-i386/submitted-anon-mmap-shared.diff hurd-i386/tg-faccessat.diff -#hurd-i386/tg-extern_inline.diff +hurd-i386/tg-extern_inline.diff hurd-i386/tg-eintr.diff -#hurd-i386/tg-gsync-libc.diff +hurd-i386/tg-gsync-libc.diff hurd-i386/tg-pthread_deps.diff hurd-i386/tg-libpthread-gsync-spin.diff -#hurd-i386/tg-ONSTACK.diff +hurd-i386/tg-ONSTACK.diff hurd-i386/tg-libpthread-gsync-mutex.diff hurd-i386/tg-NOFOLLOW.diff hurd-i386/tg-NOFOLLOW-DIRECTORY.diff -#hurd-i386/tg-libc_rwlock_recursive.diff +hurd-i386/tg-libc_rwlock_recursive.diff hurd-i386/tg-magic-pid.diff hurd-i386/tg-mlockall.diff hurd-i386/submitted-shm_open_pthread.diff hurd-i386/cvs-libc_init_secure.diff -#hurd-i386/tg2.25-tls.diff +hurd-i386/tg2.25-tls.diff hurd-i386/local-nocheck-installed-headers.diff hurd-i386/git-bits-sysmacros.h.diff hurd-i386/git-stack_chk_fail_local.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git