diff options
Diffstat (limited to 'linuxthreads')
14 files changed, 49 insertions, 22 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 16e26d8950..fafea62907 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,5 +1,29 @@ 2002-12-31 Jakub Jelinek <jakub@redhat.com> + * sysdeps/i386/i686/pt-machine.h: Use __ASSEMBLER__ instead of + ASSEMBLER test macro. + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise. + * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise. + + * sysdeps/pthread/errno-loc.c (__errno_location): Add + libc_hidden_def. + * sysdeps/pthread/herrno-loc.c (__h_errno_location): Likewise. + * sysdeps/pthread/res-state.c (__res_state): Likewise. + * sysdeps/unix/sysv/linux/allocrtsig.c (__libc_current_sigrtmin, + __libc_current_sigrtmax): Likewise. + * Versions [libc] (GLIBC_PRIVATE): Remove __libc_internal_tsd_get, + __libc_internal_tsd_set, __libc_internal_tsd_address, + __libc_alloca_cutoff. + [libpthread] (GLIBC_PRIVATE): Remove __libc_internal_tsd_get, + __libc_internal_tsd_set, __libc_internal_tsd_address. + + * sysdeps/pthread/list.h: Remove assert.h include. + * sysdeps/unix/sysv/linux/fork.c: Include <fork.h>, not "fork.h". + * sysdeps/pthread/list.h: New file. * sysdeps/unix/sysv/linux/jmp-unwind.c: New file. * sysdeps/unix/sysv/linux/fork.c: New file. diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h index 3596224c12..3c28118f2e 100644 --- a/linuxthreads/sysdeps/i386/i686/pt-machine.h +++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h @@ -27,7 +27,7 @@ #endif #include "kernel-features.h" -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ extern long int testandset (int *spinlock); extern int __compare_and_swap (long int *p, long int oldval, long int newval); diff --git a/linuxthreads/sysdeps/pthread/errno-loc.c b/linuxthreads/sysdeps/pthread/errno-loc.c index e79a7cf814..86dca2829e 100644 --- a/linuxthreads/sysdeps/pthread/errno-loc.c +++ b/linuxthreads/sysdeps/pthread/errno-loc.c @@ -42,3 +42,4 @@ __errno_location (void) #endif return &errno; } +libc_hidden_def (__errno_location) diff --git a/linuxthreads/sysdeps/pthread/herrno-loc.c b/linuxthreads/sysdeps/pthread/herrno-loc.c index ead9a16065..24712c706d 100644 --- a/linuxthreads/sysdeps/pthread/herrno-loc.c +++ b/linuxthreads/sysdeps/pthread/herrno-loc.c @@ -39,3 +39,4 @@ __h_errno_location (void) #endif return &h_errno; } +libc_hidden_def (__h_errno_location) diff --git a/linuxthreads/sysdeps/pthread/list.h b/linuxthreads/sysdeps/pthread/list.h index 1d6a4cfa65..43186a2d51 100644 --- a/linuxthreads/sysdeps/pthread/list.h +++ b/linuxthreads/sysdeps/pthread/list.h @@ -20,8 +20,6 @@ #ifndef _LIST_H #define _LIST_H 1 -#include <assert.h> - /* The definitions of this file are adopted from those which can be found in the Linux kernel headers to enable people familiar with the latter find their way in these sources as well. */ diff --git a/linuxthreads/sysdeps/pthread/res-state.c b/linuxthreads/sysdeps/pthread/res-state.c index 90fe41c80b..afa48b89ff 100644 --- a/linuxthreads/sysdeps/pthread/res-state.c +++ b/linuxthreads/sysdeps/pthread/res-state.c @@ -41,3 +41,4 @@ __res_state (void) #endif return &_res; } +libc_hidden_def (__res_state) diff --git a/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c b/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c index a18753233a..af1581a4c3 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c +++ b/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c @@ -57,6 +57,7 @@ __libc_current_sigrtmin (void) return current_rtmin; } strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private); +libc_hidden_def (__libc_current_sigrtmin) /* Return number of available real-time signal with lowest priority. */ int @@ -67,6 +68,7 @@ __libc_current_sigrtmax (void) return current_rtmax; } strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private); +libc_hidden_def (__libc_current_sigrtmax) /* Allocate real-time signal with highest/lowest available priority. Please note that we don't use a lock since we assume diff --git a/linuxthreads/sysdeps/unix/sysv/linux/fork.c b/linuxthreads/sysdeps/unix/sysv/linux/fork.c index c519fa0677..49f1b088c5 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/fork.c +++ b/linuxthreads/sysdeps/unix/sysv/linux/fork.c @@ -18,7 +18,7 @@ 02111-1307 USA. */ #include <errno.h> -#include "fork.h" +#include <fork.h> #include <bits/libc-lock.h> weak_extern (__pthread_fork); diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index c2455a7464..6189b7b152 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -20,7 +20,7 @@ #include <sysdep.h> #include <tls.h> #include <pt-machine.h> -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ # include <linuxthreads/internals.h> #endif @@ -83,7 +83,7 @@ # define __local_multiple_threads __pthread_multiple_threads #endif -# ifndef ASSEMBLER +# ifndef __ASSEMBLER__ # if defined FLOATING_STACKS && USE___THREAD && defined PIC # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ @@ -112,7 +112,7 @@ extern int __local_multiple_threads attribute_hidden; # endif # endif -#elif !defined ASSEMBLER +#elif !defined __ASSEMBLER__ /* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) diff --git a/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h index 723c2e4117..ec787da31c 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h @@ -19,7 +19,7 @@ #include <sysdep.h> #include <tls.h> -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ # include <linuxthreads/internals.h> #endif @@ -99,7 +99,7 @@ __syscall_error_##args: \ #define COPY_ARGS_6 COPY_ARGS_5 mov out5 = in5; #define COPY_ARGS_7 COPY_ARGS_6 mov out6 = in6; -# ifndef ASSEMBLER +# ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ p_header.data.multiple_threads) == 0, 1) @@ -108,7 +108,7 @@ __syscall_error_##args: \ adds r14 = MULTIPLE_THREADS_OFFSET, r13 ;; ld4 r14 = [r14] ;; cmp4.ne p6, p7 = 0, r14 ;; # endif -#elif !defined ASSEMBLER +#elif !defined __ASSEMBLER__ /* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) diff --git a/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h index fb6e92c37a..2711c222d4 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h @@ -18,7 +18,7 @@ 02111-1307 USA. */ #include <sysdep.h> -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ # include <linuxthreads/internals.h> #endif @@ -90,7 +90,7 @@ # define __local_multiple_threads __pthread_multiple_threads # endif -# ifndef ASSEMBLER +# ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1) # else @@ -107,7 +107,7 @@ extern int __local_multiple_threads attribute_hidden; # endif # endif -#elif !defined ASSEMBLER +#elif !defined __ASSEMBLER__ /* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h index f6afb81373..66aaeabdde 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h @@ -19,7 +19,7 @@ #include <sysdep.h> #include <tls.h> -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ # include <linuxthreads/internals.h> #endif @@ -81,7 +81,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \ #define COPY_ARGS_5 COPY_ARGS_4 mov %i4, %o4; #define COPY_ARGS_6 COPY_ARGS_5 mov %i5, %o5; -# ifndef ASSEMBLER +# ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ p_header.data.multiple_threads) == 0, 1) @@ -89,7 +89,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \ # define SINGLE_THREAD_P ld [%g6 + MULTIPLE_THREADS_OFFSET], %g1 # endif -#elif !defined ASSEMBLER +#elif !defined __ASSEMBLER__ /* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h index d236bf33b7..7d4f9b5ea8 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h @@ -19,7 +19,7 @@ #include <sysdep.h> #include <tls.h> -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ # include <linuxthreads/internals.h> #endif @@ -80,7 +80,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \ #define COPY_ARGS_5 COPY_ARGS_4 mov %i4, %o4; #define COPY_ARGS_6 COPY_ARGS_5 mov %i5, %o5; -# ifndef ASSEMBLER +# ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ p_header.data.multiple_threads) == 0, 1) @@ -88,7 +88,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \ # define SINGLE_THREAD_P ld [%g6 + MULTIPLE_THREADS_OFFSET], %g1 # endif -#elif !defined ASSEMBLER +#elif !defined __ASSEMBLER__ /* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h index 1c7a95dcd8..ca8183f4e9 100644 --- a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h +++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h @@ -20,7 +20,7 @@ #include <sysdep.h> #include <tls.h> #include <pt-machine.h> -#ifndef ASSEMBLER +#ifndef __ASSEMBLER__ # include <linuxthreads/internals.h> #endif @@ -102,7 +102,7 @@ # define __local_multiple_threads __libc_multiple_threads # endif -# ifndef ASSEMBLER +# ifndef __ASSEMBLER__ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P \ __builtin_expect (__local_multiple_threads == 0, 1) @@ -110,7 +110,7 @@ extern int __local_multiple_threads attribute_hidden; # define SINGLE_THREAD_P cmpl $0, __local_multiple_threads(%rip) # endif -#elif !defined ASSEMBLER +#elif !defined __ASSEMBLER__ /* This code should never be used but we define it anyhow. */ # define SINGLE_THREAD_P (1) |