r6023 - glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386
Author: adconrad
Date: 2014-04-23 01:55:39 +0000 (Wed, 23 Apr 2014)
New Revision: 6023
Modified:
glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/tg-tls-threadvar.diff
Log:
Fix double-patch error in hurd-i386/tg-tls-threadvar.diff
Modified: glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/tg-tls-threadvar.diff
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/tg-tls-threadvar.diff 2014-04-21 22:58:26 UTC (rev 6022)
+++ glibc-package/branches/eglibc-2.19/debian/patches/hurd-i386/tg-tls-threadvar.diff 2014-04-23 01:55:39 UTC (rev 6023)
@@ -684,6 +684,15 @@
mach_port_t port = *reply_port;
--- a/sysdeps/mach/hurd/i386/tls.h
+++ b/sysdeps/mach/hurd/i386/tls.h
+@@ -47,6 +47,8 @@ typedef struct
+ void *__private_tm[4];
+ /* GCC split stack support. */
+ void *__private_ss;
++ mach_port_t reply_port; /* This thread's reply port. */
++ struct hurd_sigstate *_hurd_sigstate;
+ } tcbhead_t;
+ #endif
+
@@ -53,6 +53,17 @@
| (((unsigned int) (tcb)) & 0xff000000) /* base 24..31 */ \
}
@@ -820,14 +829,3 @@
this. */
#define __mig_get_reply_port() profil_reply_port
---- a/sysdeps/mach/hurd/i386/tls.h
-+++ b/sysdeps/mach/hurd/i386/tls.h
-@@ -47,6 +47,8 @@ typedef struct
- void *__private_tm[4];
- /* GCC split stack support. */
- void *__private_ss;
-+ mach_port_t reply_port; /* This thread's reply port. */
-+ struct hurd_sigstate *_hurd_sigstate;
- } tcbhead_t;
- #endif
-
Reply to: