Author: aurel32
Date: 2007-05-03 20:56:45 +0000 (Thu, 03 May 2007)
New Revision: 2169
Removed:
glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hppa/cvs-hppa-update.diff
Log:
merge debian/patches/hppa/cvs-pthreadtypes_h.diff into
debian/patches/hppa/cvs-hppa-update.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-05-03 20:44:05 UTC (rev
2168)
+++ glibc-package/trunk/debian/changelog 2007-05-03 20:56:45 UTC (rev
2169)
@@ -4,8 +4,8 @@
upstream (fix enormous alloca triggered with %-X.Ys like formats
specifier, with Y big, and in multi-byte locales). Closes: #380195,
#421555.
- * patches/hppa/cvs-pthreadtypes_h.diff: new patch from CVS (fix
- bits/pthreadtypes.h on hppa).
+ * patches/hppa/cvs-hppa-update.diff: update from CVS to fix
+ bits/pthreadtypes.h on hppa.
* patches/any/local-disable-nscd-host-caching.diff: the comment lines
should have the '#' on the first column. Closes: #421882.
* Remove patches/any/local-Rminkernel.diff (not needed anymore).
@@ -14,7 +14,7 @@
* debian/patches/hppa/submitted-nptl-carlos2.diff: New patch to add
STACK_GROWS_UP case to NPTL.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 03 May 2007 22:42:36 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 03 May 2007 22:55:45 +0200
glibc (2.5-5) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/hppa/cvs-hppa-update.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/cvs-hppa-update.diff
2007-05-03 20:44:05 UTC (rev 2168)
+++ glibc-package/trunk/debian/patches/hppa/cvs-hppa-update.diff
2007-05-03 20:56:45 UTC (rev 2169)
@@ -1,7 +1,13 @@
diff -Nurd ports.orig/ChangeLog.hppa ports/ChangeLog.hppa
--- ports.orig/ChangeLog.hppa 2006-10-01 19:06:06.000000000 +0200
+++ ports/ChangeLog.hppa 2007-02-06 10:11:40.000000000 +0100
-@@ -1,3 +1,37 @@
+@@ -1,3 +1,43 @@
++2007-05-01 Carlos O'Donell <[EMAIL PROTECTED]>
++
++ * sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h
++ [__USE_XOPEN2K]: Define pthread_rwlock_t and
++ pthread_rwlockattr_t.
++
+2007-02-02 Carlos O'Donell <[EMAIL PROTECTED]>
+
+ * sysdeps/unix/sysv/linux/hppa/sysdep.h (PTR_MANGLE): Define.
@@ -1649,6 +1655,19 @@
__THROW;
/* In-kernel implementation of tee for pipe buffers. */
+diff -Nurd
ports.orig/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h
ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/bits/pthreadtypes.h
+--- ports.orig/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
+ {
diff -Nurd ports.orig/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
--- ports.orig/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
2006-10-01 19:06:06.000000000 +0200
+++ ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h 2007-02-06
10:11:16.000000000 +0100
Deleted: glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff
2007-05-03 20:44:05 UTC (rev 2168)
+++ glibc-package/trunk/debian/patches/hppa/cvs-pthreadtypes_h.diff
2007-05-03 20:56:45 UTC (rev 2169)
@@ -1,28 +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;
-
-===================================================================
-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
- {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
