r2614 - in glibc-package/branches/glibc-2.7/debian: . patches/hurd-i386
Author: aurel32
Date: 2007-10-27 11:15:32 +0000 (Sat, 27 Oct 2007)
New Revision: 2614
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-trivial.diff
Log:
* Update hurd-i386/submitted-trivial.diff.
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 11:14:34 UTC (rev 2613)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 11:15:32 UTC (rev 2614)
@@ -1,12 +1,17 @@
glibc (2.7-0exp2) UNRELEASED; urgency=low
+ [ Pierre Habouzit ]
* Remove any/local-iconv-fix-trampoline.diff (obsolete).
* Remove any/submitted-strfry.diff (merged).
* Update any/submitted-rfc3484-sortv4.diff.
* Update localedata/*first_weekday.diff.
- -- Pierre Habouzit <madcoder@debian.org> Sat, 27 Oct 2007 10:46:55 +0200
+ [ Aurelien Jarno ]
+ * Improve any/submitted-rfc3484-sortv4.diff.
+ * Update hurd-i386/submitted-trivial.diff.
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 27 Oct 2007 13:14:49 +0200
+
glibc (2.7-0exp1) experimental; urgency=low
[ Clint Adams ]
Modified: glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-trivial.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-trivial.diff 2007-10-27 11:14:34 UTC (rev 2613)
+++ glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/submitted-trivial.diff 2007-10-27 11:15:32 UTC (rev 2614)
@@ -1,42 +1,3 @@
-Not yet applied. Needed on glibc-2_5-branch and HEAD.
-
-2006-06-13 Thomas Schwinge <tschwinge@gnu.org>
-
- * sysdeps/mach/hurd/tls.h: Change `ASSEMBLER' conditional to
- `__ASSEMBLER__'.
- * sysdeps/mach/hurd/i386/tls.h: Likewise.
-
---- sysdeps/mach/hurd/tls.h.orig
-+++ sysdeps/mach/hurd/tls.h
-@@ -20,7 +20,7 @@
- #ifndef _TLS_H
- #define _TLS_H
-
--#if defined HAVE_TLS_SUPPORT && !defined ASSEMBLER
-+#if defined HAVE_TLS_SUPPORT && !defined __ASSEMBLER__
-
- # include <stddef.h>
- # include <stdbool.h>
---- sysdeps/mach/hurd/i386/tls.h.orig
-+++ sysdeps/mach/hurd/i386/tls.h
-@@ -29,7 +29,7 @@
- thread pointer points to is unspecified. Allocate the TCB there. */
- # define TLS_TCB_AT_TP 1
-
--# ifndef ASSEMBLER
-+# ifndef __ASSEMBLER__
-
- /* Use i386-specific RPCs to arrange that %gs segment register prefix
- addresses the TCB in each thread. */
-@@ -198,7 +198,7 @@
- return err;
- }
-
--# endif /* !ASSEMBLER */
-+# endif /* !__ASSEMBLER__ */
- #endif /* HAVE_TLS_SUPPORT */
-
- #endif /* i386/tls.h */
--- argp/argp-help.c.orig
+++ argp/argp-help.c
@@ -42,6 +42,7 @@
Reply to: