r2163 - in glibc-package/trunk/debian: . patches patches/hppa
Author: aurel32
Date: 2007-05-02 06:25:06 +0000 (Wed, 02 May 2007)
New Revision: 2163
Added:
glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff
Removed:
glibc-package/trunk/debian/patches/hppa/submitted-pthreadtypes_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
replace patches/hppa/submitted-pthreadtypes_h.diff by patches/hppa/cvs-pthreadtypes_h.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-05-01 19:21:02 UTC (rev 2162)
+++ glibc-package/trunk/debian/changelog 2007-05-02 06:25:06 UTC (rev 2163)
@@ -4,10 +4,10 @@
upstream (fix enormous alloca triggered with %-X.Ys like formats
specifier, with Y big, and in multi-byte locales). Closes: #380195,
#421555.
- * patches/hppa/submitted-pthreadtypes_h.diff: new patch to fix
- bits/pthreadtypes.h on hppa.
+ * patches/hppa/cvs-pthreadtypes_h.diff: new patch from CVS (fix
+ bits/pthreadtypes.h on hppa).
- -- Aurelien Jarno <aurel32@debian.org> Tue, 01 May 2007 21:20:04 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 02 May 2007 08:22:13 +0200
glibc (2.5-5) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff 2007-05-01 19:21:02 UTC (rev 2162)
+++ glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff 2007-05-02 06:25:06 UTC (rev 2163)
@@ -0,0 +1,28 @@
+--- libc/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h 2007-05-01 21:15:38.000000000 +020
++++ libc/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h 2007-05-01 21:16:03.000000000 +0200
+@@ -134,7 +134,7 @@
+ } pthread_rwlockattr_t;
+ #endif
+
+-#ifdef __USE_XOPEN2K
++#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+ /* POSIX spinlock data type. */
+ typedef __atomic_lock_t pthread_spinlock_t;
+
+===================================================================
+RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h 2006/04/19 05:35:34 1.1
++++ ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h 2007/05/02 02:07:38 1.2
+@@ -111,8 +111,7 @@
+ /* Once-only execution */
+ typedef int pthread_once_t;
+
+-
+-#ifdef __USE_UNIX98
++#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+ /* Read-write locks. */
+ typedef struct _pthread_rwlock_t
+ {
Deleted: glibc-package/trunk/debian/patches/hppa/submitted-pthreadtypes_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/submitted-pthreadtypes_h.diff 2007-05-01 19:21:02 UTC (rev 2162)
+++ glibc-package/trunk/debian/patches/hppa/submitted-pthreadtypes_h.diff 2007-05-02 06:25:06 UTC (rev 2163)
@@ -1,11 +0,0 @@
---- libc/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h 2007-05-01 21:15:38.000000000 +020
-+++ libc/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h 2007-05-01 21:16:03.000000000 +0200
-@@ -134,7 +134,7 @@
- } pthread_rwlockattr_t;
- #endif
-
--#ifdef __USE_XOPEN2K
-+#if defined __USE_UNIX98 || defined __USE_XOPEN2K
- /* POSIX spinlock data type. */
- typedef __atomic_lock_t pthread_spinlock_t;
-
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-05-01 19:21:02 UTC (rev 2162)
+++ glibc-package/trunk/debian/patches/series 2007-05-02 06:25:06 UTC (rev 2163)
@@ -50,10 +50,10 @@
arm/local-no-hwcap.diff -p0
hppa/cvs-hppa-update.diff -p0
+hppa/cvs-pthreadtypes_h.diff -p0
hppa/local-Rminkernel.diff -p0
hppa/submitted-lt.diff -p0
hppa/submitted-nptl-carlos.diff -p0
-hppa/submitted-pthreadtypes_h.diff -p1
hppa/local-inlining.diff -p0
hurd-i386/cvs-futimes.diff -p1
Reply to: