r2053 - in glibc-package/trunk/debian: . patches/any patches/m68k
Author: aurel32
Date: 2007-04-13 10:52:31 +0000 (Fri, 13 Apr 2007)
New Revision: 2053
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-notls.diff
glibc-package/trunk/debian/patches/m68k/cvs-m68k-update.diff
Log:
* patches/any/local-notls.diff: also include pthread.h from
linuxthreads/sysdeps/pthread/gai_misc.h.
m68k/cvs-m68k-update.diff: update from CVS. Closes: #418881.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-13 09:22:27 UTC (rev 2052)
+++ glibc-package/trunk/debian/changelog 2007-04-13 10:52:31 UTC (rev 2053)
@@ -18,11 +18,14 @@
* debian/locales-depver: remove exp from the locales version.
* Replace patches/alpha/submitted-sigsuspend.diff by
patches/alpha/cvs-sigsuspend.diff from upstream.
- * any/local-ldconfig-fsync.diff: call fsync() before closing
+ * patches/any/local-ldconfig-fsync.diff: call fsync() before closing
/etc/ld.so.cache. Closes: #416716.
* Update Korean debconf translation, by Sunjae Park. Closes: #418872.
+ * patches/any/local-notls.diff: also include pthread.h from
+ linuxthreads/sysdeps/pthread/gai_misc.h.
+ m68k/cvs-m68k-update.diff: update from CVS. Closes: #418881.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 12 Apr 2007 18:18:07 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 13 Apr 2007 12:49:18 +0200
glibc (2.5-1) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/any/local-notls.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-notls.diff 2007-04-13 09:22:27 UTC (rev 2052)
+++ glibc-package/trunk/debian/patches/any/local-notls.diff 2007-04-13 10:52:31 UTC (rev 2053)
@@ -2,6 +2,10 @@
# DP: Upstream status: Submitted parts have been rejected. Parts
submitted would very probably be rejected.
+2007-04-13 Aurelien Jarno <aurelien@aurel32.net>
+
+ linuxthreads/sysdeps/pthread/gai_misc.h: Include <pthread.h>.
+
2007-02-09 Aurelien Jarno <aurelien@aurel32.net>
resolv/gai_misc.h: Include <pthread.h>.
@@ -134,6 +138,18 @@
+
+#endif
+
+Index: linuxthreads/sysdeps/pthread/gai_misc.h
+===================================================================
+--- linuxthreads/sysdeps/pthread/gai_misc.h.orig
++++ linuxthreads/sysdeps/pthread/gai_misc.h
+@@ -23,6 +23,7 @@
+
+ #include <assert.h>
+ #include <signal.h>
++#include <pthread.h>
+
+ #undef DONT_NEED_GAI_MISC_COND
+
Index: resolv/gai_misc.h
===================================================================
--- resolv/gai_misc.h.orig
Modified: glibc-package/trunk/debian/patches/m68k/cvs-m68k-update.diff
===================================================================
--- glibc-package/trunk/debian/patches/m68k/cvs-m68k-update.diff 2007-04-13 09:22:27 UTC (rev 2052)
+++ glibc-package/trunk/debian/patches/m68k/cvs-m68k-update.diff 2007-04-13 10:52:31 UTC (rev 2053)
@@ -1,7 +1,12 @@
diff -Nurd ports/ChangeLog.m68k ports/ChangeLog.m68k
--- ports/ChangeLog.m68k 2006-02-28 11:12:50.000000000 +0100
+++ ports/ChangeLog.m68k 2007-02-10 13:35:42.000000000 +0100
-@@ -1,3 +1,25 @@
+@@ -1,3 +1,30 @@
++2006-11-28 Andreas Schwab <schwab@suse.de>
++
++ * sysdeps/unix/sysv/linux/m68k/sysdep.h (DOARGS_6, _DOARGS_6)
++ (UNDOARGS_6): Define for 6-argument syscall stubs.
++
+2006-10-03 Richard Sandiford <richard@codesourcery.com>
+
+ * sysdeps/m68k/dl-trampoline.S (_dl_runtime_profile): Round up the
@@ -426,7 +431,18 @@
#include <sysdeps/unix/sysdep.h>
#include <sysdeps/m68k/sysdep.h>
-@@ -293,3 +296,4 @@
+@@ -192,6 +195,10 @@
+ #define _DOARGS_5(n) move.l %d5, -(%sp); move.l n+4(%sp), %d5; _DOARGS_4 (n)
+ #define UNDOARGS_5 UNDOARGS_4; move.l (%sp)+, %d5
+
++#define DOARGS_6 _DOARGS_6 (24)
++#define _DOARGS_6(n) _DOARGS_5 (n-4); move.l %a0, -(%sp); move.l n+12(%sp), %a0;
++#define UNDOARGS_6 move.l (%sp)+, %a0; UNDOARGS_5
++
+
+ #define ret rts
+ #if 0 /* Not used by Linux */
+@@ -293,3 +300,4 @@
#define ASM_ARGS_6 ASM_ARGS_5, "a" (_a0)
#endif /* not __ASSEMBLER__ */
Reply to: