2007-08-03 Aurelien Jarno <aurelien@aurel32.net>

	* sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h:
	(__local_multiple_threads): Declare as hidden only in libc and
	in libpthread.

diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index ff0a7a483035a9a5d5bac6869a78827c5526d46f..7bb338751aab3f89d7ec0b4c2c18d82d7848929b 100644 (file)
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,3 +1,9 @@
+2007-08-03  Aurelien Jarno  <aurelien@aurel32.net>
+
+       * 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@systemhalted.org>
 
        * sysdeps/unix/sysv/linux/hppa/nptl/internaltypes.h: Remove.

diff --git a/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h
index e01936a3db6f162240b1aa64c16f19c4f98e465c..51d6cf39438d2b11ccac2eca533809249ceb500e 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h
@@ -206,7 +206,11 @@ L(pre_end):                                                ASM_LINE_SEP    \
 # 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 */