Author: aurel32
Date: 2008-07-28 22:50:50 +0000 (Mon, 28 Jul 2008)
New Revision: 3021
Added:
glibc-package/trunk/debian/patches/hppa/cvs-lowlevellock.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* hppa/cvs-lowlevellock.diff: new patch from upstream to fix build of NPTL
glibc on hppa. Closes: #486589.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-07-28 22:41:18 UTC (rev
3020)
+++ glibc-package/trunk/debian/changelog 2008-07-28 22:50:50 UTC (rev
3021)
@@ -14,6 +14,8 @@
* Update Swedish debconf translation, by Martin Bagge. Closes: #492191.
* Revert the changes to patches/hppa/cvs-atomic.diff, it was not the cause
of the "tst-regex problem".
+ * hppa/cvs-lowlevellock.diff: new patch from upstream to fix build of NPTL
+ glibc on hppa. Closes: #486589.
[ Petr Salinger]
* debian/sysdeps/kfreebsd.mk: also use the bsm/ directory from kernel
@@ -45,7 +47,7 @@
* Cherry-pick upstream fixes with respect to locale rwlocks, merge them into
patches/any/cvs-strerror_r.diff. Closes: #489906.
- -- Aurelien Jarno <[EMAIL PROTECTED]> Sat, 26 Jul 2008 20:54:33 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]> Tue, 29 Jul 2008 00:50:02 +0200
glibc (2.7-12) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/hppa/cvs-lowlevellock.diff
===================================================================
--- glibc-package/trunk/debian/patches/hppa/cvs-lowlevellock.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/hppa/cvs-lowlevellock.diff
2008-07-28 22:50:50 UTC (rev 3021)
@@ -0,0 +1,48 @@
+2007-12-05 Jeff Bailey <[EMAIL PROTECTED]>
+
+ * sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h
+ (__lll_unlock): Use define instead of inline function.
+ (__lll_robust_unlock): Likewise.
+
+===================================================================
+RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h 2007/10/19
01:47:47 1.5
++++ ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h 2007/12/09
02:20:34 1.6
+@@ -289,22 +289,20 @@
+ #define lll_robust_timedlock(futex, abstime, id, private) \
+ __lll_robust_timedlock (&(futex), abstime, id, private)
+
+-static inline void __attribute__ ((always_inline))
+-__lll_unlock (lll_lock_t *futex, int private)
+-{
+- int val = atomic_exchange_rel (futex, 0);
+- if (__builtin_expect (val > 1, 0))
+- lll_futex_wake (futex, 1, private);
+-}
++#define __lll_unlock(futex, private) \
++ (void) \
++ ({ int val = atomic_exchange_rel (futex, 0); \
++ if (__builtin_expect (val > 1, 0)) \
++ lll_futex_wake (futex, 1, private); \
++ })
+ #define lll_unlock(futex, private) __lll_unlock(&(futex), private)
+
+-static inline void __attribute__ ((always_inline))
+-__lll_robust_unlock (int *futex, int private)
+-{
+- int val = atomic_exchange_rel (futex, 0);
+- if (__builtin_expect (val & FUTEX_WAITERS, 0))
+- lll_futex_wake (futex, 1, private);
+-}
++#define __lll_robust_unlock(futex,private) \
++ (void) \
++ ({ int val = atomic_exchange_rel (futex, 0); \
++ if (__builtin_expect (val & FUTEX_WAITERS, 0)) \
++ lll_futex_wake (futex, 1, private); \
++ })
+ #define lll_robust_unlock(futex, private) \
+ __lll_robust_unlock(&(futex), private)
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2008-07-28 22:41:18 UTC (rev
3020)
+++ glibc-package/trunk/debian/patches/series 2008-07-28 22:50:50 UTC (rev
3021)
@@ -64,7 +64,8 @@
arm/local-no-hwcap.diff -p0
arm/submitted-RTLD_SINGLE_THREAD_P.diff -p0
-hppa/cvs-atomic.diff -p0
+hppa/cvs-atomic.diff -p1
+hppa/cvs-lowlevellock.diff -p1
hppa/submitted-atomic_h.diff -p0
hppa/submitted-fadvise64_64.diff -p0
hppa/submitted-fesetenv.diff -p0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
