From 2458c74851b3ea8a02561d5e026f2ea75b69873f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 23 Sep 2008 18:50:28 +0000 Subject: [PATCH] * sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_lock, lll_robust_lock, lll_cond_lock, lll_robust_cond_lock, lll_timedlock, lll_robust_timedlock, lll_unlock, lll_robust_unlock): Promote private to int. 2008-09-08 Richard Guenther * sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_lock, lll_robust_lock, lll_cond_lock, lll_robust_cond_lock, lll_timedlock, lll_robust_timedlock, lll_unlock, lll_robust_unlock): Promote private to int. --- nptl/ChangeLog | 7 +++++++ .../unix/sysv/linux/i386/lowlevellock.h | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index d638dde585..b8833a2e84 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,10 @@ +2008-09-08 Richard Guenther + + * sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_lock, + lll_robust_lock, lll_cond_lock, lll_robust_cond_lock, + lll_timedlock, lll_robust_timedlock, lll_unlock, + lll_robust_unlock): Promote private to int. + 2008-08-15 Ulrich Drepper * sysdeps/x86_64/pthreaddef.h: Remove ARCH_MAP_FLAGS and diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h index 8f67616af7..d53559c074 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -323,7 +323,7 @@ LLL_STUB_UNWIND_INFO_END "=m" (futex), "=&d" (ignore3) \ : "1" (1), "m" (futex), \ "i" (MULTIPLE_THREADS_OFFSET), "0" (0), \ - "g" (private) \ + "g" ((int) (private)) \ : "memory"); \ } \ }) @@ -345,7 +345,7 @@ LLL_STUB_UNWIND_INFO_END "18:" \ : "=a" (result), "=c" (ignore1), "=m" (futex), \ "=&d" (ignore2) \ - : "0" (0), "1" (id), "m" (futex), "g" (private) \ + : "0" (0), "1" (id), "m" (futex), "g" ((int) (private))\ : "memory"); \ result; }) @@ -370,7 +370,7 @@ LLL_STUB_UNWIND_INFO_END "18:" \ : "=a" (ignore1), "=c" (ignore2), "=m" (futex), \ "=&d" (ignore3) \ - : "0" (0), "1" (2), "m" (futex), "g" (private) \ + : "0" (0), "1" (2), "m" (futex), "g" ((int) (private))\ : "memory"); \ }) @@ -393,7 +393,7 @@ LLL_STUB_UNWIND_INFO_END : "=a" (result), "=c" (ignore1), "=m" (futex), \ "=&d" (ignore2) \ : "0" (0), "1" (id | FUTEX_WAITERS), "m" (futex), \ - "g" (private) \ + "g" ((int) (private)) \ : "memory"); \ result; }) @@ -416,7 +416,7 @@ LLL_STUB_UNWIND_INFO_END : "=a" (result), "=c" (ignore1), "=&d" (ignore2), \ "=m" (futex), "=S" (ignore3) \ : "0" (0), "1" (1), "m" (futex), "m" (timeout), \ - "4" (private) \ + "4" ((int) (private)) \ : "memory"); \ result; }) @@ -439,7 +439,7 @@ LLL_STUB_UNWIND_INFO_END : "=a" (result), "=c" (ignore1), "=&d" (ignore2), \ "=m" (futex), "=S" (ignore3) \ : "0" (0), "1" (id), "m" (futex), "m" (timeout), \ - "4" (private) \ + "4" ((int) (private)) \ : "memory"); \ result; }) @@ -489,7 +489,7 @@ LLL_STUB_UNWIND_INFO_END "18:" \ : "=m" (futex), "=&a" (ignore), "=&c" (ignore2) \ : "i" (MULTIPLE_THREADS_OFFSET), "m" (futex), \ - "g" (private) \ + "g" ((int) (private)) \ : "memory"); \ } \ }) @@ -511,7 +511,8 @@ LLL_STUB_UNWIND_INFO_END LLL_STUB_UNWIND_INFO_4 \ "18:" \ : "=m" (futex), "=&a" (ignore), "=&c" (ignore2) \ - : "i" (FUTEX_WAITERS), "m" (futex), "g" (private) \ + : "i" (FUTEX_WAITERS), "m" (futex), \ + "g" ((int) (private)) \ : "memory"); \ }) -- 2.43.5