From: Carlos O'Donell Date: Fri, 3 Aug 2007 22:58:57 +0000 (+0000) Subject: 2007-08-03 Aurelien Jarno X-Git-Tag: upstream/2.30~10627^2~752 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57165d450fbbdeb38c80d19bc96c20d3b4ecf581;p=external%2Fglibc.git 2007-08-03 Aurelien Jarno * 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 ff0a7a4..7bb3387 100644 --- a/ChangeLog.hppa +++ b/ChangeLog.hppa @@ -1,3 +1,9 @@ +2007-08-03 Aurelien Jarno + + * 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 * 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 e01936a..51d6cf3 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 */