r1694 - in glibc-package/trunk/debian: . patches/ia64
Author: aurel32
Date: 2006-08-01 15:00:57 +0000 (Tue, 01 Aug 2006)
New Revision: 1694
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff
Log:
[ Aurelien Jarno ]
* Update ia64/cvs-gcc41-atomic_h.diff again (fix build failure with gcc-4.1,
nptl part) from upstream.
[ Aurelien Jarno ]
* Update ia64/cvs-gcc41-atomic_h.diff again (fix build failure with gcc-4.1,
nptl part) from upstream.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-07-31 08:59:40 UTC (rev 1693)
+++ glibc-package/trunk/debian/changelog 2006-08-01 15:00:57 UTC (rev 1694)
@@ -1,8 +1,12 @@
-glibc (2.3.6-18) UNRELEASED; urgency=low
+glibc (2.3.6-18) unstable; urgency=medium
- *
+ (urgency set to medium as it fixes a FTBFS)
+
+ [ Aurelien Jarno ]
+ * Update ia64/cvs-gcc41-atomic_h.diff again (fix build failure with gcc-4.1,
+ nptl part) from upstream.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 31 Jul 2006 10:59:17 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 1 Aug 2006 16:59:33 +0200
glibc (2.3.6-17) 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-31 08:59:40 UTC (rev 1693)
+++ glibc-package/trunk/debian/patches/ia64/cvs-gcc41-atomic_h.diff 2006-08-01 15:00:57 UTC (rev 1694)
@@ -65,10 +65,11 @@
#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.
+ (__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
@@ -94,3 +95,42 @@
}
weak_alias (__pthread_spin_trylock, pthread_spin_trylock)
+2005-05-21 Ulrich Drepper <drepper@redhat.com>
+
+ Use __sync_val_compare_and_swap, not explicit _si variant.
+
+===================================================================
+RCS file: /cvs/glibc/libc/nptl/sysdeps/ia64/pthread_spin_lock.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- libc/nptl/sysdeps/ia64/pthread_spin_lock.c 2004/03/24 00:05:17 1.2
++++ libc/nptl/sysdeps/ia64/pthread_spin_lock.c 2005/05/21 18:35:38 1.3
+@@ -25,7 +25,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
+
+2005-05-21 Ulrich Drepper <drepper@redhat.com>
+
+ Use __sync_val_compare_and_swap, not explicit _si variant.
+
+===================================================================
+RCS file: /cvs/glibc/libc/nptl/sysdeps/ia64/pthread_spin_trylock.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- libc/nptl/sysdeps/ia64/pthread_spin_trylock.c 2003/03/11 09:20:41 1.1
++++ libc/nptl/sysdeps/ia64/pthread_spin_trylock.c 2005/05/21 18:35:38 1.2
+@@ -24,5 +24,5 @@
+ pthread_spin_trylock (lock)
+ 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;
+ }
Reply to: