aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-24 23:53:39 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-24 23:53:39 +0000
commit68dc4dcbddb050072f959118b6793dfadf395a06 (patch)
treedfd2d389dbf2897afb3c922bd072dbca312e66aa /nptl
parent9ce0ecbe384f09030cd5d014e17179725e778fa6 (diff)
downloadglibc-68dc4dcbddb050072f959118b6793dfadf395a06.tar
glibc-68dc4dcbddb050072f959118b6793dfadf395a06.tar.gz
glibc-68dc4dcbddb050072f959118b6793dfadf395a06.tar.bz2
glibc-68dc4dcbddb050072f959118b6793dfadf395a06.zip
Update.
2004-03-24 Ulrich Drepper <drepper@redhat.com> * stdio-common/vfscanf.c [!COMPILE_WSCANF] (TOLOWER): Cast first parameter to unsigned char. * sysdeps/generic/strcasestr.c [_LIBC] (TOLOWER): Likewise.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog3
-rw-r--r--nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index b0bce881cd..4b8e43d6e5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
2004-03-24 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+ (lll_mutex_cond_trylock): Define as wrapper around __lll_cond_trylock.
+
* sysdeps/unix/sysv/linux/getpid.c (really_getpid): Reorganize
code to avoid warning.
diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
index e9f895d6e8..e107ef5975 100644
--- a/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
@@ -101,7 +101,7 @@
#define lll_mutex_trylock(lock) __lll_trylock (&(lock))
/* Set *futex to 2 if it is 0, atomically. Returns the old value */
-#define lll_mutex_cond_trylock(futex) \
+#define __lll_cond_trylock(futex) \
({ int __val; \
__asm __volatile ("1: lwarx %0,0,%2\n" \
" cmpwi 0,%0,0\n" \
@@ -114,6 +114,7 @@
: "cr0", "memory"); \
__val; \
})
+#define lll_mutex_cond_trylock(lock) __lll_cond_trylock (&(lock))
extern void __lll_lock_wait (int *futex) attribute_hidden;