[commits] r3032 - in /fsf/trunk/ports: ChangeLog.hppa sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Aug  4 00:03:40 2007
New Revision: 3032

Log:
Import glibc-ports-mainline for 2007-08-04

Modified:
    fsf/trunk/ports/ChangeLog.hppa
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h

Modified: fsf/trunk/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/ports/ChangeLog.hppa (original)
+++ fsf/trunk/ports/ChangeLog.hppa Sat Aug  4 00:03:40 2007
@@ -1,3 +1,9 @@
+2007-08-03  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h:
+	(__local_multiple_threads): Declare as hidden only in libc and
+	in libpthread.
+
 2007-07-28  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/hppa/nptl/internaltypes.h: Remove.

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h Sat Aug  4 00:03:40 2007
@@ -206,7 +206,11 @@
 # endif
 
 # ifndef __ASSEMBLER__
- extern int __local_multiple_threads attribute_hidden;
+#  if !defined NOT_IN_libc || defined IS_IN_libpthread
+extern int __local_multiple_threads attribute_hidden;
+#  else
+extern int __local_multiple_threads;
+#  endif
 #  define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
 # else
 /* This ALT version requires newer kernel support */