r1938 - in glibc-package/branches/glibc-2.5/debian: . patches patches/any
Author: aurel32
Date: 2007-02-05 09:59:30 +0100 (Mon, 05 Feb 2007)
New Revision: 1938
Added:
glibc-package/branches/glibc-2.5/debian/patches/any/cvs-lt-update.diff
Removed:
glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* patches/any/cvs-lt-update.diff: new patch (linuxthreads update) from
upstream CVS.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-05 06:57:44 UTC (rev 1937)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-05 08:59:30 UTC (rev 1938)
@@ -87,9 +87,9 @@
kernel version to 2.6.1, except on m68k where it is set to 2.4.1.
* patches/any/cvs-2.5-branch-update.diff: new patch (2.5 branch update) from
upstream CVS.
+ * patches/any/cvs-lt-update.diff: new patch (linuxthreads update) from
+ upstream CVS.
* debhelper.in/locales.templates: recommends UTF-8 locales by default.
- * patches/any/local-linuxthreads-sigprocmask.diff: new patch (fix build of
- linuxthreads on linux architectures).
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Added: glibc-package/branches/glibc-2.5/debian/patches/any/cvs-lt-update.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/cvs-lt-update.diff 2007-02-05 06:57:44 UTC (rev 1937)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/cvs-lt-update.diff 2007-02-05 08:59:30 UTC (rev 1938)
@@ -0,0 +1,119 @@
+diff -Nurd linuxthreads.orig/ChangeLog linuxthreads/ChangeLog
+--- linuxthreads.orig/ChangeLog 2006-10-01 19:05:33.000000000 +0200
++++ linuxthreads/ChangeLog 2007-01-08 03:14:22.000000000 +0100
+@@ -1,3 +1,34 @@
++2006-10-31 Ian Lance Taylor <ian@airs.com>
++
++ * specific.c (__pthread_destroy_specifics): Clear pointer before
++ freeing.
++
++2006-10-31 Mike Frysinger <vapier@gentoo.org>
++
++ * sysdeps/ia64/tcb-offsets.sym (MULTIPLE_THREADS_OFFSET): Fix typo
++ TLS_PRE_TCB_SIZE.
++
++2006-10-03 Richard Sandiford <richard@codesourcery.com>
++
++ * sysdeps/m68k/pt-machine.h (__compare_and_swap): Don't define for
++ Coldfire.
++ (HAS_COMPARE_AND_SWAP): Likewise.
++ * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h (PSEUDO): Pass a
++ temporary register to SINGLE_THREAD_P.
++ (__local_multiple_threads): Do not mark hidden in librt.
++ (SINGLE_THREAD_P): Make the assembler version take a temporary
++ register argument. Load __local_multiple_threads from the GOT
++ when generating PIC for librt. Use separate PIC implementations
++ for m680x0 and Coldfire.
++ * sysdeps/unix/sysv/linux/m68k/vfork.S (__vfork): On Coldfire targets,
++ load the GOTPC offset into a temporary register first.
++
++2006-10-02 Daniel Jacobowitz <dan@codesourcery.com>
++
++ * sysdeps/pthread/gai_misc.h (__gai_start_notify_thread): Use
++ sigprocmask instead.
++ (__gai_create_helper_thread): Likewise.
++
+ 2006-10-01 Petr Salinger <Petr.Salinger@seznam..cz>
+
+ * sysdeps/pthread/gai_misc.h (__gai_start_notify_thread): Use
+diff -Nurd linuxthreads.orig/specific.c linuxthreads/specific.c
+--- linuxthreads.orig/specific.c 2006-07-24 19:25:34.000000000 +0200
++++ linuxthreads/specific.c 2007-01-08 03:14:22.000000000 +0100
+@@ -204,8 +204,9 @@
+ __pthread_lock(THREAD_GETMEM(self, p_lock), self);
+ for (i = 0; i < PTHREAD_KEY_1STLEVEL_SIZE; i++) {
+ if (THREAD_GETMEM_NC(self, p_specific[i]) != NULL) {
+- free(THREAD_GETMEM_NC(self, p_specific[i]));
++ void *p = THREAD_GETMEM_NC(self, p_specific[i]);
+ THREAD_SETMEM_NC(self, p_specific[i], NULL);
++ free(p);
+ }
+ }
+ __pthread_unlock(THREAD_GETMEM(self, p_lock));
+diff -Nurd linuxthreads.orig/sysdeps/ia64/tcb-offsets.sym linuxthreads/sysdeps/ia64/tcb-offsets.sym
+--- linuxthreads.orig/sysdeps/ia64/tcb-offsets.sym 2006-04-26 17:04:13.000000000 +0200
++++ linuxthreads/sysdeps/ia64/tcb-offsets.sym 2007-01-08 03:14:22.000000000 +0100
+@@ -3,7 +3,7 @@
+
+ --
+ #ifdef USE_TLS
+-MULTIPLE_THREADS_OFFSET offsetof (struct _pthread_descr_struct, p_multiple_threads) - TCB_PRE_SIZE
++MULTIPLE_THREADS_OFFSET offsetof (struct _pthread_descr_struct, p_multiple_threads) - TLS_PRE_TCB_SIZE
+ #else
+ MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads)
+ #endif
+diff -Nurd linuxthreads.orig/sysdeps/m68k/pt-machine.h linuxthreads/sysdeps/m68k/pt-machine.h
+--- linuxthreads.orig/sysdeps/m68k/pt-machine.h 2003-07-31 21:15:42.000000000 +0200
++++ linuxthreads/sysdeps/m68k/pt-machine.h 2007-01-08 03:14:22.000000000 +0100
+@@ -27,7 +27,9 @@
+ #endif
+
+ extern long int testandset (int *spinlock);
++#ifndef __mcoldfire__
+ extern int __compare_and_swap (long int *p, long int oldval, long int newval);
++#endif
+
+ /* Spinlock implementation; required. */
+ PT_EI long int
+@@ -50,6 +52,7 @@
+ register char * stack_pointer __asm__ ("%sp");
+
+
++#ifndef __mcoldfire__
+ /* Compare-and-swap for semaphores. */
+
+ #define HAS_COMPARE_AND_SWAP
+@@ -65,5 +68,6 @@
+
+ return ret;
+ }
++#endif
+
+ #endif /* pt-machine.h */
+diff -Nurd linuxthreads.orig/sysdeps/pthread/gai_misc.h linuxthreads/sysdeps/pthread/gai_misc.h
+--- linuxthreads.orig/sysdeps/pthread/gai_misc.h 2006-10-01 06:06:14.000000000 +0200
++++ linuxthreads/sysdeps/pthread/gai_misc.h 2007-01-08 03:14:22.000000000 +0100
+@@ -34,7 +34,7 @@
+ {
+ sigset_t ss;
+ sigemptyset (&ss);
+- __sigprocmask (SIG_SETMASK, &ss, NULL);
++ sigprocmask (SIG_SETMASK, &ss, NULL);
+ }
+
+ extern inline int
+@@ -55,12 +55,12 @@
+ sigset_t ss;
+ sigset_t oss;
+ sigfillset (&ss);
+- __sigprocmask (SIG_SETMASK, &ss, &oss);
++ sigprocmask (SIG_SETMASK, &ss, &oss);
+
+ int ret = pthread_create (threadp, &attr, tf, arg);
+
+ /* Restore the signal mask. */
+- __sigprocmask (SIG_SETMASK, &oss, NULL);
++ sigprocmask (SIG_SETMASK, &oss, NULL);
+
+ (void) pthread_attr_destroy (&attr);
+ return ret;
Deleted: glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff 2007-02-05 06:57:44 UTC (rev 1937)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/local-linuxthreads-sigprocmask.diff 2007-02-05 08:59:30 UTC (rev 1938)
@@ -1,38 +0,0 @@
---- linuxthreads/sysdeps/pthread/gai_misc.h.orig 2007-02-05 07:51:33.000000000 +0100
-+++ linuxthreads/sysdeps/pthread/gai_misc.h 2007-02-05 07:55:01.000000000 +0100
-@@ -34,7 +34,12 @@
- {
- sigset_t ss;
- sigemptyset (&ss);
-+#ifdef __linux__
-+ INTERNAL_SYSCALL_DECL (err);
-+ INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, NULL, _NSIG / 8);
-+#else
- __sigprocmask (SIG_SETMASK, &ss, NULL);
-+#endif
- }
-
- extern inline int
-@@ -55,12 +60,22 @@
- sigset_t ss;
- sigset_t oss;
- sigfillset (&ss);
-+#ifdef __linux__
-+ INTERNAL_SYSCALL_DECL (err);
-+ INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8);
-+#else
- __sigprocmask (SIG_SETMASK, &ss, &oss);
-+#endif
-
- int ret = pthread_create (threadp, &attr, tf, arg);
-
- /* Restore the signal mask. */
-+#ifdef __linux__
-+ INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &oss, NULL,
-+ _NSIG / 8);
-+#else
- __sigprocmask (SIG_SETMASK, &oss, NULL);
-+#endif
-
- (void) pthread_attr_destroy (&attr);
- return ret;
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-05 06:57:44 UTC (rev 1937)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-05 08:59:30 UTC (rev 1938)
@@ -92,6 +92,7 @@
any/cvs-2.5-branch-update.diff -p1
any/cvs-itoa-c.diff -p1
+cvs-lt-update.diff -p0
any/cvs-zdump-64-bit.diff -p1
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
@@ -111,7 +112,6 @@
any/local-libgcc-compat-main.diff -p0
any/local-libgcc-compat-ports.diff -p0
any/local-linuxthreads-semaphore_h.diff -p1
-any/local-linuxthreads-sigprocmask.diff -p0
any/local-linuxthreads-tst-sighandler.diff -p1
any/local-localedef-fix-trampoline.diff -p1
any/local-makeconfig.diff -p0
Reply to: