r1689 - in glibc-package/trunk/debian: . patches/ia64
Author: aurel32
Date: 2006-07-28 17:38:19 +0000 (Fri, 28 Jul 2006)
New Revision: 1689
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff
Log:
* Update ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
upstream.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-07-27 00:47:11 UTC (rev 1688)
+++ glibc-package/trunk/debian/changelog 2006-07-28 17:38:19 UTC (rev 1689)
@@ -1,8 +1,11 @@
-glibc (2.3.6-17) UNRELEASED; urgency=low
+glibc (2.3.6-17) UNRELEASED; urgency=medium
- *
+ (urgency set to medium as it fixes a FTBFS)
+
+ * Update ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
+ upstream.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 25 Jul 2006 05:43:57 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 28 Jul 2006 19:37:37 +0200
glibc (2.3.6-16) unstable; urgency=medium
Modified: glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff
===================================================================
--- glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff 2006-07-27 00:47:11 UTC (rev 1688)
+++ glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff 2006-07-28 17:38:19 UTC (rev 1689)
@@ -63,3 +63,34 @@
__result; })
#define atomic_decrement_if_positive(mem) \
+
+2005-05-21 Ulrich Drepper <drepper@redhat.com>
+(__pthread_spin_lock): Usebitrary revisions
+__sync_val_compare_and_swap, not explicit _si variant.
+(__pthread_spin_trylock): Likewise.
+
+===================================================================
+RCS file: /cvs/glibc/linuxthreads/linuxthreads/sysdeps/ia64/pspinlock.c,v
+retrieving revision 1.4
+retrieving revision 1.5
+diff -u -r1.4 -r1.5
+--- linuxthreads/linuxthreads/sysdeps/ia64/pspinlock.c 2003/03/07 22:22:38 1.4
++++ linuxthreads/linuxthreads/sysdeps/ia64/pspinlock.c 2005/05/21 18:30:17 1.5
+@@ -31,7 +31,7 @@
+ {
+ int *p = (int *) lock;
+
+- while (__builtin_expect (__sync_val_compare_and_swap_si (p, 0, 1), 0))
++ while (__builtin_expect (__sync_val_compare_and_swap (p, 0, 1), 0))
+ {
+ /* Spin without using the atomic instruction. */
+ do
+@@ -46,7 +46,7 @@
+ int
+ __pthread_spin_trylock (pthread_spinlock_t *lock)
+ {
+- return __sync_val_compare_and_swap_si ((int *) lock, 0, 1) == 0 ? 0 : EBUSY;
++ return __sync_val_compare_and_swap ((int *) lock, 0, 1) == 0 ? 0 : EBUSY;
+ }
+ weak_alias (__pthread_spin_trylock, pthread_spin_trylock)
+
Reply to: