r1952 - in glibc-package/branches/glibc-2.5/debian: . patches patches/hurd-i386
Author: aurel32
Date: 2007-02-07 19:17:23 +0100 (Wed, 07 Feb 2007)
New Revision: 1952
Added:
glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-trivial.diff
Removed:
glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-stdlib-fmtmsg.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* hurd-i386/submitted-trivia.diff: new patch from Thomas Schwinge (make glibc
partly buildable on Hurd).
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-07 17:51:56 UTC (rev 1951)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-07 18:17:23 UTC (rev 1952)
@@ -100,8 +100,8 @@
pthread_detach(3). Closes: #98852.
* Update any/local-__thread.diff (make glibc buildable without __thread support)
from Petr Saliner.
- * hurd-i386/submitted-stdlib-fmtmsg.diff: new patch to make glibc (partly)
- buildable on Hurd.
+ * hurd-i386/submitted-trivia.diff: new patch from Thomas Schwinge (make glibc
+ partly buildable on Hurd).
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Deleted: glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-stdlib-fmtmsg.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-stdlib-fmtmsg.diff 2007-02-07 17:51:56 UTC (rev 1951)
+++ glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-stdlib-fmtmsg.diff 2007-02-07 18:17:23 UTC (rev 1952)
@@ -1,17 +0,0 @@
-http://sourceware.org/bugzilla/show_bug.cgi?id=3992
-
-Index: stdlib/fmtmsg.c
-===================================================================
-RCS file: /cvs/glibc/libc/stdlib/fmtmsg.c,v
-retrieving revision 1.20
-diff -u -d -p -r1.20 stdlib/fmtmsg.c
---- stdlib/fmtmsg.c 15 May 2006 18:41:18 -0000 1.20
-+++ stdlib/fmtmsg.c 7 Feb 2007 14:06:37 -0000
-@@ -20,6 +20,7 @@
- #include <fmtmsg.h>
- #include <bits/libc-lock.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/syslog.h>
Added: glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-trivial.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-trivial.diff 2007-02-07 17:51:56 UTC (rev 1951)
+++ glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-trivial.diff 2007-02-07 18:17:23 UTC (rev 1952)
@@ -0,0 +1,118 @@
+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.
+
+Index: sysdeps/mach/hurd/tls.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/tls.h,v
+retrieving revision 1.3
+diff -u -p -r1.3 tls.h
+--- sysdeps/mach/hurd/tls.h 2 Feb 2005 19:43:56 -0000 1.3
++++ sysdeps/mach/hurd/tls.h 13 Jun 2006 13:57:55 -0000
+@@ -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>
+Index: sysdeps/mach/hurd/i386/tls.h
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/i386/tls.h,v
+retrieving revision 1.11
+diff -u -p -r1.11 tls.h
+--- sysdeps/mach/hurd/i386/tls.h 5 Mar 2006 02:52:58 -0000 1.11
++++ sysdeps/mach/hurd/i386/tls.h 13 Jun 2006 13:57:55 -0000
+@@ -32,7 +32,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. */
+@@ -168,7 +168,7 @@ _hurd_tls_fork (thread_t child, struct i
+ return err;
+ }
+
+-# endif /* !ASSEMBLER */
++# endif /* !__ASSEMBLER__ */
+ #endif /* HAVE_TLS_SUPPORT */
+
+ #endif /* i386/tls.h */
+
+
+Needed for HEAD. Not sure about glibc-2_5-branch.
+
+2007-02-07 Thomas Schwinge <tschwinge@gnu.org>
+
+ * argp/argp-help.c: Include <stdbool.h>.
+
+Index: argp/argp-help.c
+===================================================================
+RCS file: /cvs/glibc/libc/argp/argp-help.c,v
+retrieving revision 1.54
+diff -u -p -r1.54 argp-help.c
+--- argp/argp-help.c 10 May 2006 06:28:06 -0000 1.54
++++ argp/argp-help.c 7 Feb 2007 12:07:17 -0000
+@@ -41,6 +41,7 @@ char *alloca ();
+ # endif
+ #endif
+
++#include <stdbool.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+
+
+Needed for HEAD. Not sure about glibc-2_5-branch.
+
+2007-02-07 Thomas Schwinge <tschwinge@gnu.org>
+
+ * posix/wordexp.c: Include <stdbool.h>.
+
+Index: posix/wordexp.c
+===================================================================
+RCS file: /cvs/glibc/libc/posix/wordexp.c,v
+retrieving revision 1.54
+diff -u -p -r1.54 wordexp.c
+--- posix/wordexp.c 25 Jan 2007 00:43:39 -0000 1.54
++++ posix/wordexp.c 7 Feb 2007 12:10:15 -0000
+@@ -28,6 +28,7 @@
+ #include <paths.h>
+ #include <pwd.h>
+ #include <signal.h>
++#include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+
+
+Needed for HEAD and glibc-2_5-branch.
+
+2007-02-07 Thomas Schwinge <tschwinge@gnu.org>
+
+ * stdlib/fmtmsg.c: Include <stdint.h>.
+
+Index: stdlib/fmtmsg.c
+===================================================================
+RCS file: /cvs/glibc/libc/stdlib/fmtmsg.c,v
+retrieving revision 1.20
+diff -u -p -r1.20 fmtmsg.c
+--- stdlib/fmtmsg.c 15 May 2006 18:41:18 -0000 1.20
++++ stdlib/fmtmsg.c 7 Feb 2007 12:12:36 -0000
+@@ -19,6 +19,7 @@
+
+ #include <fmtmsg.h>
+ #include <bits/libc-lock.h>
++#include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-07 17:51:56 UTC (rev 1951)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-07 18:17:23 UTC (rev 1952)
@@ -60,8 +60,8 @@
hurd-i386/local-enable-ldconfig.diff -p1
hurd-i386/local-mlock.diff -p1
hurd-i386/submitted-ioctl-decode-argument.diff -p0
-hurd-i386/submitted-stdlib-fmtmsg.diff -p0
hurd-i386/submitted-sysvshm.diff -p1
+hurd-i386/submitted-trivia.diff -p0
i386/local-biarch.diff -p1
i386/local-cmov.diff -p0
Reply to: