summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-06 23:07:16 +0000
committerUlrich Drepper <drepper@redhat.com>2006-01-06 23:07:16 +0000
commitae4ad00acb5638a32f5c04a85afb12bf2d6bc56c (patch)
tree01f19418e2c81e5057b993f17c0e3c2e0ca80687 /nptl
parentced368f7dc4df79822d88988365a82b5dd3bec16 (diff)
downloadglibc-ae4ad00acb5638a32f5c04a85afb12bf2d6bc56c.tar.gz
glibc-ae4ad00acb5638a32f5c04a85afb12bf2d6bc56c.tar.xz
glibc-ae4ad00acb5638a32f5c04a85afb12bf2d6bc56c.zip
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Include tls.h.
	(SYSCALL_ERROR_HANDLER_ENTRY): Use %g4 instead of %g2, to avoid
	the need of .register directive for it.
	* configure.in (libc_cv_asm_cfi_directives): Use CFI rel offset
	2047 instead of 0 in the test on sparc64.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/descr.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 4f68aec2a2..f985cd79c5 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* descr.h [!__PTHREAD_MUTEX_HAVE_PREV] (DEQUEUE_MUTEX): Use
+	correct type.
+
 2006-01-06  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h (PSEUDO):
diff --git a/nptl/descr.h b/nptl/descr.h
index 2a607d3d21..6dcc574c24 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -165,7 +165,7 @@ struct pthread
   } while (0)
 # define DEQUEUE_MUTEX(mutex) \
   do {									      \
-    struct pthread_mutex_s *runp = THREAD_GETMEM (THREAD_SELF, robust_list);  \
+    struct __pthread_mutex_s *runp = THREAD_GETMEM (THREAD_SELF, robust_list);\
     if (runp == &mutex->__data)						      \
       THREAD_SETMEM (THREAD_SELF, robust_list, runp->__next);		      \
     else								      \