aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2007-08-03 22:58:57 +0000
committerCarlos O'Donell <carlos@systemhalted.org>2007-08-03 22:58:57 +0000
commit57165d450fbbdeb38c80d19bc96c20d3b4ecf581 (patch)
treef4d6b6ae8cc935ff6046e68e05e55040b9f9ff7a
parent5cfc3d44a502385d891820c7c5b17252eff994fa (diff)
downloadglibc-57165d450fbbdeb38c80d19bc96c20d3b4ecf581.tar.xz
glibc-57165d450fbbdeb38c80d19bc96c20d3b4ecf581.zip
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.
-rw-r--r--ChangeLog.hppa6
-rw-r--r--sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index ff0a7a4830..7bb338751a 100644
--- 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 e01936a3db..51d6cf3943 100644
--- 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 */