Author: sthibault
Date: 2013-10-24 22:35:18 +0000 (Thu, 24 Oct 2013)
New Revision: 5740
Modified:
glibc-package/trunk/debian/patches/hurd-i386/tg-extern_inline.diff
Log:
Refresh patch
Modified: glibc-package/trunk/debian/patches/hurd-i386/tg-extern_inline.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/tg-extern_inline.diff
2013-10-24 22:29:24 UTC (rev 5739)
+++ glibc-package/trunk/debian/patches/hurd-i386/tg-extern_inline.diff
2013-10-24 22:35:18 UTC (rev 5740)
@@ -231,26 +231,23 @@
#endif /* hurd/port.h */
--- a/hurd/hurd/signal.h
+++ b/hurd/hurd/signal.h
-@@ -130,15 +130,17 @@
- #define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline
+@@ -130,13 +130,15 @@
#endif
+ extern __thread struct hurd_sigstate *_hurd_sigstate;
+#if defined __USE_EXTERN_INLINES && defined _LIBC
_HURD_SIGNAL_H_EXTERN_INLINE struct hurd_sigstate *
_hurd_self_sigstate (void)
{
-- struct hurd_sigstate **location =
-+ struct hurd_sigstate **location = (struct hurd_sigstate **)
- (void *) __hurd_threadvar_location (_HURD_THREADVAR_SIGSTATE);
- if (*location == NULL)
- *location = _hurd_thread_sigstate (__mach_thread_self ());
- return *location;
+ if (_hurd_sigstate == NULL)
+ _hurd_sigstate = _hurd_thread_sigstate (__mach_thread_self ());
+ return _hurd_sigstate;
}
+#endif
/* Thread listening on our message port; also called the "signal thread". */
-@@ -165,10 +167,13 @@
+@@ -165,6 +167,9 @@
interrupted lest the signal handler try to take the same lock and
deadlock result. */
@@ -260,11 +257,6 @@
_HURD_SIGNAL_H_EXTERN_INLINE void *
_hurd_critical_section_lock (void)
{
-- struct hurd_sigstate **location =
-+ struct hurd_sigstate **location = (struct hurd_sigstate **)
- (void *) __hurd_threadvar_location (_HURD_THREADVAR_SIGSTATE);
- struct hurd_sigstate *ss = *location;
- if (ss == NULL)
@@ -190,7 +195,11 @@
_hurd_critical_section_unlock to unlock it. */
return ss;
@@ -326,10 +318,12 @@
}
+#endif
-
- #endif /* hurd/threadvar.h */
---- a/hurd/hurd/userlink.h
-+++ b/hurd/hurd/userlink.h
+ extern mach_port_t __hurd_reply_port0;
+ #define __hurd_local_reply_port (*(__libc_no_tls() ? &__hurd_reply_port0 :
&THREAD_SELF->reply_port))
+Index: eglibc-2.17/hurd/hurd/userlink.h
+===================================================================
+--- eglibc-2.17.orig/hurd/hurd/userlink.h 2013-10-24 01:20:25.000000000
+0000
++++ eglibc-2.17/hurd/hurd/userlink.h 2013-10-24 01:20:25.000000000 +0000
@@ -76,6 +76,11 @@
/* Attach LINK to the chain of users at *CHAINP. */
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vztut-0000dt...@vasks.debian.org
