r3017 - glibc-package/trunk/debian/patches/hurd-i386
Author: madcoder
Date: 2008-07-28 13:10:00 +0000 (Mon, 28 Jul 2008)
New Revision: 3017
Modified:
glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff
Log:
Fix debian/patches/hurd-i386/local-tls-support.diff so that it applies.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff 2008-07-28 12:56:00 UTC (rev 3016)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff 2008-07-28 13:10:00 UTC (rev 3017)
@@ -1,5 +1,5 @@
---- csu/libc-start.c.orig
-+++ csu/libc-start.c 2007-10-27 15:42:32.000000000 +0200
+--- csu/libc-start.c.orig
++++ csu/libc-start.c
@@ -134,10 +134,12 @@
}
# endif
@@ -122,8 +122,8 @@
#define MACHINE_THREAD_STATE_FLAVOR ALPHA_THREAD_STATE
#define MACHINE_THREAD_STATE_COUNT ALPHA_THREAD_STATE_COUNT
---- sysdeps/mach/hurd/bits/libc-tsd.h.orig
-+++ sysdeps/mach/hurd/bits/libc-tsd.h
+--- sysdeps/mach/hurd/bits/libc-tsd.h
++++ /dev/null
@@ -1,34 +0,0 @@
-/* libc-internal interface for thread-specific data. Hurd version.
- Copyright (C) 1998,2002 Free Software Foundation, Inc.
@@ -283,15 +283,7 @@
properly before before cthreads initialization, so cthreads can know
--- sysdeps/mach/hurd/i386/tls.h.orig
+++ sysdeps/mach/hurd/i386/tls.h
-@@ -23,6 +23,7 @@
- #if defined HAVE_TLS_SUPPORT && !defined __ASSEMBLER__
-
- # include <stddef.h>
-+# include <stdint.h>
- # include <stdbool.h>
- # include <mach/mig_errors.h>
- # include <mach.h>
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,7 @@
/* Fetch the selector set by the first call. */
int sel;
asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0));
@@ -300,7 +292,7 @@
{
error_t err = __i386_set_ldt (tcb->self, sel, &desc, 1);
assert_perror (err);
-@@ -143,9 +143,40 @@
+@@ -142,9 +142,40 @@
#include <mach/machine/thread_status.h>
@@ -343,7 +335,7 @@
{
/* Fetch the selector set by _hurd_tls_init. */
int sel;
-@@ -153,11 +184,13 @@
+@@ -152,11 +183,13 @@
if (sel == state->ds) /* _hurd_tls_init was never called. */
return 0;
@@ -446,8 +438,8 @@
/* These functions are of use in machine-dependent signal trampoline
implementations. */
---- sysdeps/mach/hurd/bits/libc-lock.h 29 Sep 2003 21:55:41 -0000 1.4
-+++ sysdeps/mach/hurd/bits/libc-lock.h 14 Jul 2008 02:11:48 -0000
+--- sysdeps/mach/hurd/bits/libc-lock.h.orig
++++ sysdeps/mach/hurd/bits/libc-lock.h
@@ -21,6 +21,7 @@
#define _BITS_LIBC_LOCK_H 1
@@ -456,3 +448,13 @@
#include <cthreads.h>
#include <hurd/threadvar.h>
+--- sysdeps/mach/hurd/tls.h.orig
++++ sysdeps/mach/hurd/tls.h
+@@ -23,6 +23,7 @@
+ #if defined HAVE_TLS_SUPPORT && !defined __ASSEMBLER__
+
+ # include <stddef.h>
++# include <stdint.h>
+ # include <stdbool.h>
+ # include <mach/mig_errors.h>
+ # include <mach.h>
Reply to: