aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-10-30 00:41:07 +0000
committerUlrich Drepper <drepper@redhat.com>2006-10-30 00:41:07 +0000
commitedece8f10161ced3bed66845b7bee64f7e9fea4b (patch)
tree6e5b38ebdb9bc98d00555a62cd886e5093e77141
parent536e40e287df5438683e78e64867009f7a0d2698 (diff)
downloadglibc-edece8f10161ced3bed66845b7bee64f7e9fea4b.zip
glibc-edece8f10161ced3bed66845b7bee64f7e9fea4b.tar.gz
glibc-edece8f10161ced3bed66845b7bee64f7e9fea4b.tar.bz2
* sysdeps/ia64/pthread_spin_unlock.c (pthread_spin_unlock): Use
__sync_lock_release instead of __sync_lock_release_si.
-rwxr-xr-xconfigure4
-rw-r--r--configure.in2
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/ia64/pthread_spin_unlock.c4
4 files changed, 11 insertions, 4 deletions
diff --git a/configure b/configure
index c9d321a..d19d5d3 100755
--- a/configure
+++ b/configure
@@ -5652,7 +5652,7 @@ else
libc_cv_z_relro=yes
else
case "$base_machine" in
- i3456786 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;;
+ i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;;
*) libc_cv_z_relro="not required" ;;
esac
fi
@@ -5660,7 +5660,7 @@ else
fi
echo "$as_me:$LINENO: result: $libc_cv_z_relro" >&5
echo "${ECHO_T}$libc_cv_z_relro" >&6
- if test $libc_cv_z_relro = no; then
+ if test "$libc_cv_z_relro" = no; then
{ { echo "$as_me:$LINENO: error: linker with -z relro support required" >&5
echo "$as_me: error: linker with -z relro support required" >&2;}
{ (exit 1); exit 1; }; }
diff --git a/configure.in b/configure.in
index ca795c4..5cb3035 100644
--- a/configure.in
+++ b/configure.in
@@ -1445,10 +1445,12 @@ EOF
then
libc_cv_z_relro=yes
else
+changequote(,)dnl
case "$base_machine" in
i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;;
*) libc_cv_z_relro="not required" ;;
esac
+changequote([,])dnl
fi
fi])
if test "$libc_cv_z_relro" = no; then
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 121d9ed..c65b60d 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-30 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/ia64/pthread_spin_unlock.c (pthread_spin_unlock): Use
+ __sync_lock_release instead of __sync_lock_release_si.
+
2006-10-29 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (RTLD_SINGLE_THREAD_P):
diff --git a/nptl/sysdeps/ia64/pthread_spin_unlock.c b/nptl/sysdeps/ia64/pthread_spin_unlock.c
index 6232764..50d9c5f 100644
--- a/nptl/sysdeps/ia64/pthread_spin_unlock.c
+++ b/nptl/sysdeps/ia64/pthread_spin_unlock.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
@@ -23,6 +23,6 @@
int
pthread_spin_unlock (pthread_spinlock_t *lock)
{
- __sync_lock_release_si ((int *) lock);
+ __sync_lock_release ((int *) lock);
return 0;
}