| 1 |
vapier 07/12/10 01:17:25 |
| 2 |
|
| 3 |
Added: 1515_all_glibc-hppa-tls-lock-build-fix.patch |
| 4 |
Log: |
| 5 |
fix from upstream for #196933 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1 src/patchsets/glibc/2.7/1515_all_glibc-hppa-tls-lock-build-fix.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.7/1515_all_glibc-hppa-tls-lock-build-fix.patch?rev=1.1&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.7/1515_all_glibc-hppa-tls-lock-build-fix.patch?rev=1.1&content-type=text/plain |
| 12 |
|
| 13 |
Index: 1515_all_glibc-hppa-tls-lock-build-fix.patch |
| 14 |
=================================================================== |
| 15 |
http://bugs.gentoo.org/196933 |
| 16 |
http://sourceware.org/ml/libc-ports/2007-10/msg00029.html |
| 17 |
http://sourceware.org/ml/libc-ports/2007-12/msg00006.html |
| 18 |
|
| 19 |
--- ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h.old 2007-12-05 19:12:32.000000000 +0000 |
| 20 |
+++ ports/sysdeps/unix/sysv/linux/hppa/nptl/lowlevellock.h 2007-12-05 19:19:35.000000000 +0000 |
| 21 |
@@ -289,22 +289,20 @@ |
| 22 |
#define lll_robust_timedlock(futex, abstime, id, private) \ |
| 23 |
__lll_robust_timedlock (&(futex), abstime, id, private) |
| 24 |
|
| 25 |
-static inline void __attribute__ ((always_inline)) |
| 26 |
-__lll_unlock (lll_lock_t *futex, int private) |
| 27 |
-{ |
| 28 |
- int val = atomic_exchange_rel (futex, 0); |
| 29 |
- if (__builtin_expect (val > 1, 0)) |
| 30 |
- lll_futex_wake (futex, 1, private); |
| 31 |
-} |
| 32 |
+#define __lll_unlock(futex, private) \ |
| 33 |
+ (void) \ |
| 34 |
+ ({ int val = atomic_exchange_rel (futex, 0); \ |
| 35 |
+ if (__builtin_expect (val > 1, 0)) \ |
| 36 |
+ lll_futex_wake (futex, 1, private); \ |
| 37 |
+ }) |
| 38 |
#define lll_unlock(futex, private) __lll_unlock(&(futex), private) |
| 39 |
|
| 40 |
-static inline void __attribute__ ((always_inline)) |
| 41 |
-__lll_robust_unlock (int *futex, int private) |
| 42 |
-{ |
| 43 |
- int val = atomic_exchange_rel (futex, 0); |
| 44 |
- if (__builtin_expect (val & FUTEX_WAITERS, 0)) |
| 45 |
- lll_futex_wake (futex, 1, private); |
| 46 |
-} |
| 47 |
+#define __lll_robust_unlock(futex,private) \ |
| 48 |
+ (void) \ |
| 49 |
+ ({ int val = atomic_exchange_rel (futex, 0); \ |
| 50 |
+ if (__builtin_expect (val & FUTEX_WAITERS, 0)) \ |
| 51 |
+ lll_futex_wake (futex, 1, private); \ |
| 52 |
+ }) |
| 53 |
#define lll_robust_unlock(futex, private) \ |
| 54 |
__lll_robust_unlock(&(futex), private) |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
-- |
| 60 |
gentoo-commits@g.o mailing list |
Archives