r5579 - in glibc-package/trunk/debian: . patches patches/any
Author: ps-guest
Date: 2013-05-10 22:46:12 +0000 (Fri, 10 May 2013)
New Revision: 5579
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff
glibc-package/trunk/debian/patches/series
Log:
reenable "lost" patches local-linuxthreads-setclock.diff and local-linuxthreads-XPG7.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-10 20:19:12 UTC (rev 5578)
+++ glibc-package/trunk/debian/changelog 2013-05-10 22:46:12 UTC (rev 5579)
@@ -34,6 +34,8 @@
* patches/kfreebsd/local-freopen.diff: support architecture without dup3()
* patches/kfreebsd/local-linuxthreads-ctype_init.diff: follow upstream
changes in ctype initialization
+ * reenable lost any/local-linuxthreads-XPG7.diff
+ any/local-linuxthreads-setclock.diff
* kfreebsd/local-sysdeps.diff: update to revision 4427 (from glibc-bsd).
* Add into testsuite-checking/expected-results-*-kfreebsd-gnu-*
tst-timer5 test and new tst-backtrace[4-6] tests that are known to fail.
Modified: glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff 2013-05-10 20:19:12 UTC (rev 5578)
+++ glibc-package/trunk/debian/patches/any/local-linuxthreads-setclock.diff 2013-05-10 22:46:12 UTC (rev 5579)
@@ -225,11 +225,11 @@
--- a/linuxthreads/sysdeps/pthread/pthread.h
+++ b/linuxthreads/sysdeps/pthread/pthread.h
@@ -41,7 +41,7 @@
- {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __LOCK_ALT_INITIALIZER}
+ {0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, __LOCK_INITIALIZER}
#endif
--#define PTHREAD_COND_INITIALIZER {__LOCK_ALT_INITIALIZER, 0, "", 0}
-+#define PTHREAD_COND_INITIALIZER {__LOCK_ALT_INITIALIZER, 0, CLOCK_REALTIME, "", 0}
+-#define PTHREAD_COND_INITIALIZER {__LOCK_INITIALIZER, 0, "", 0}
++#define PTHREAD_COND_INITIALIZER {__LOCK_INITIALIZER, 0, CLOCK_REALTIME, "", 0}
#if defined __USE_UNIX98 || defined __USE_XOPEN2K
# define PTHREAD_RWLOCK_INITIALIZER \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-05-10 20:19:12 UTC (rev 5578)
+++ glibc-package/trunk/debian/patches/series 2013-05-10 22:46:12 UTC (rev 5579)
@@ -195,6 +195,8 @@
any/local-linuxthreads-tst-sighandler.diff
any/local-linuxthreads-unwind.diff
any/local-linuxthreads-weak.diff
+any/local-linuxthreads-XPG7.diff
+any/local-linuxthreads-setclock.diff
any/local-localedef-fix-trampoline.diff
any/local-mktemp.diff
any/local-no-pagesize.diff
Reply to: