r3367 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibaul-guest
Date: 2009-03-03 00:44:27 +0000 (Tue, 03 Mar 2009)
New Revision: 3367
Removed:
glibc-package/trunk/debian/patches/hurd-i386/local-tls-dtv-offset.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff
glibc-package/trunk/debian/patches/series.hurd-i386
Log:
* debian/patches/hurd-i386/local-tls-dtv-offset.diff: remove patch, make
local-tls-support.diff create tlsdesc.sym instead.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-03-03 00:35:26 UTC (rev 3366)
+++ glibc-package/trunk/debian/changelog 2009-03-03 00:44:27 UTC (rev 3367)
@@ -24,6 +24,8 @@
* debian/patches/hurd-i386/local-pthread_types.diff: make it create a new
sysdep/mach/hurd/bits/pthreadtypes.h instead of modifying
bits/pthreadtypes.h. Move from series.hurd-i386 to series.
+ * debian/patches/hurd-i386/local-tls-dtv-offset.diff: remove patch, make
+ local-tls-support.diff create tlsdesc.sym instead.
-- Aurelien Jarno <aurel32@debian.org> Tue, 03 Mar 2009 00:54:27 +0100
Deleted: glibc-package/trunk/debian/patches/hurd-i386/local-tls-dtv-offset.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-tls-dtv-offset.diff 2009-03-03 00:35:26 UTC (rev 3366)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-tls-dtv-offset.diff 2009-03-03 00:44:27 UTC (rev 3367)
@@ -1,14 +0,0 @@
---- glibc/sysdeps/i386/tlsdesc.sym.orig 2009-01-27 22:50:04.000000000 +0000
-+++ glibc/sysdeps/i386/tlsdesc.sym 2009-01-27 22:50:27.000000000 +0000
-@@ -8,7 +8,11 @@
-
- -- Abuse tls.h macros to derive offsets relative to the thread register.
-
-+#if 0
- DTV_OFFSET offsetof(struct pthread, header.dtv)
-+#else
-+DTV_OFFSET offsetof(tcbhead_t, dtv)
-+#endif
-
- TLSDESC_ARG offsetof(struct tlsdesc, arg)
-
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff 2009-03-03 00:35:26 UTC (rev 3366)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff 2009-03-03 00:44:27 UTC (rev 3367)
@@ -18,7 +18,8 @@
sysdeps/mach/i386/thread_state.h | 11 ++++++
sysdeps/mach/powerpc/thread_state.h | 1
sysdeps/mach/thread_state.h | 3 +
- 19 files changed, 144 insertions(+), 70 deletions(-)
+ sysdeps/mach/hurd/i386/tlsdesc.sym | 17 +++++++++
+ 20 files changed, 161 insertions(+), 70 deletions(-)
--- a/csu/libc-start.c
+++ b/csu/libc-start.c
@@ -483,3 +484,23 @@
# include <stdbool.h>
# include <mach/mig_errors.h>
# include <mach.h>
+--- /dev/null
++++ b/sysdeps/mach/hurd/i386/tlsdesc.sym
+@@ -0,0 +1,17 @@
++#include <stddef.h>
++#include <sysdep.h>
++#include <tls.h>
++#include <link.h>
++#include <dl-tlsdesc.h>
++
++--
++
++-- Abuse tls.h macros to derive offsets relative to the thread register.
++
++DTV_OFFSET offsetof(struct pthread, header.dtv)
++
++TLSDESC_ARG offsetof(tcbhead_t, dtv)
++
++TLSDESC_GEN_COUNT offsetof(struct tlsdesc_dynamic_arg, gen_count)
++TLSDESC_MODID offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_module)
++TLSDESC_MODOFF offsetof(struct tlsdesc_dynamic_arg, tlsinfo.ti_offset)
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2009-03-03 00:35:26 UTC (rev 3366)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2009-03-03 00:44:27 UTC (rev 3367)
@@ -5,4 +5,3 @@
hurd-i386/local-pthread-unsupported-stubs.diff
hurd-i386/local-unlockpt-chroot.diff
hurd-i386/local-msg-nosignal.diff
-hurd-i386/local-tls-dtv-offset.diff
Reply to: