lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-26 08:22:38 +03:00
Code Activity

Update.

Browse Source 
2003-06-17  Jakub Jelinek  <jakub@redhat.com>

	* posix/regcomp.c (build_word_op): Use alnum instead of alpha class.
This commit is contained in:
Ulrich Drepper
2003-06-17 22:40:05 +00:00
parent 60d73a7ac4
commit f23b30e23b
23 changed files with 838 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
linuxthreads/ChangeLog
View File

@@ -1,3 +1,28 @@
2003-06-18 Jakub Jelinek <jakub@redhat.com>
* internals.h (__librt_multiple_threads, __librt_enable_asynccancel,
__librt_disable_asynccancel): Declare.
(LIBC_CANCEL_ASYNC, LIBC_CANCEL_RESET, LIBC_CANCEL_HANDLED): Define
for IS_IN_librt.
* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Support cancellation
in librt.
* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/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/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: Likewise.
* sysdeps/x86_64/tcb-offsets.sym: New file.
* sysdeps/x86_64/Makefile: New file.
* sysdeps/x86_64/tls.h (tcbhead_t): Add multiple_threads.
* Versions (libc): Export __librt_enable_asynccancel,
__librt_disable_asynccancel and __librt_multiple_threads as
GLIBC_PRIVATE.
* libc-cancellation.c (__librt_multiple_threads,
__librt_enable_asynccancel, __librt_disable_asynccancel): New aliases.
2003-06-12 Steven Munroe <sjmunroe@us.ibm.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h

3
linuxthreads/Versions
View File

@@ -31,7 +31,8 @@ libc {
__libc_creat; __libc_poll; __libc_pselect; __libc_select;
__libc_sigpause; __libc_sigsuspend; __libc_sigwait; __libc_sigwaitinfo;
__libc_waitid; __libc___xpg_sigpause;
__libc_waitid; __libc___xpg_sigpause; __librt_enable_asynccancel;
__librt_disable_asynccancel; __librt_multiple_threads;
}
}

15
linuxthreads/internals.h
View File

@@ -257,6 +257,7 @@ static inline int nonexisting_handle(pthread_handle h, pthread_t id)
/* Defined and used in libc.so. */
extern int __libc_multiple_threads attribute_hidden;
extern int __librt_multiple_threads;
/* Debugging */
@@ -468,6 +469,10 @@ extern int __libc_enable_asynccancel (void) attribute_hidden;
extern void __libc_disable_asynccancel (int oldtype)
internal_function attribute_hidden;
/* The two functions are in libc.so and are exported. */
extern int __librt_enable_asynccancel (void);
extern void __librt_disable_asynccancel (int oldtype) internal_function;
extern void __pthread_cleanup_upto (__jmp_buf target,
char *targetframe) attribute_hidden;
extern pid_t __pthread_fork (struct fork_block *b) attribute_hidden;
@@ -480,7 +485,7 @@ extern pid_t __pthread_fork (struct fork_block *b) attribute_hidden;
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__libc_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__libc_disable_asynccancel")
#elif defined NOT_IN_libc && defined IS_IN_libpthread
#elif defined IS_IN_libpthread
# define LIBC_CANCEL_ASYNC() \
__pthread_enable_asynccancel ()
# define LIBC_CANCEL_RESET(oldtype) \
@@ -488,6 +493,14 @@ extern pid_t __pthread_fork (struct fork_block *b) attribute_hidden;
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__pthread_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__pthread_disable_asynccancel")
#elif defined IS_IN_librt
# define LIBC_CANCEL_ASYNC() \
__librt_enable_asynccancel ()
# define LIBC_CANCEL_RESET(oldtype) \
__librt_disable_asynccancel (oldtype)
# define LIBC_CANCEL_HANDLED() \
__asm (".globl " __SYMBOL_PREFIX "__librt_enable_asynccancel"); \
__asm (".globl " __SYMBOL_PREFIX "__librt_disable_asynccancel")
#else
# define LIBC_CANCEL_ASYNC() 0 /* Just a dummy value. */
# define LIBC_CANCEL_RESET(val) ((void)(val)) /* Nothing, but evaluate it. */

5
linuxthreads/libc-cancellation.c
View File

@@ -31,7 +31,8 @@
weak_extern (__pthread_do_exit)
# endif
int __libc_multiple_threads attribute_hidden;
int __libc_multiple_threads attribute_hidden __attribute__((nocommon));
strong_alias (__libc_multiple_threads, __librt_multiple_threads);
/* The next two functions are similar to pthread_setcanceltype() but
more specialized for the use in the cancelable functions like write().
@@ -49,6 +50,7 @@ __libc_enable_asynccancel (void)
(PTHREAD_CANCELED, CURRENT_STACK_FRAME), 0);
return oldtype;
}
strong_alias (__libc_enable_asynccancel, __librt_enable_asynccancel)
void
internal_function attribute_hidden
@@ -57,5 +59,6 @@ __libc_disable_asynccancel (int oldtype)
pthread_descr self = thread_self();
LIBC_THREAD_SETMEM(self, p_canceltype, oldtype);
}
strong_alias (__libc_disable_asynccancel, __librt_disable_asynccancel)
#endif

24
linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
View File

@@ -24,7 +24,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -108,8 +108,10 @@
#if !defined NOT_IN_libc
# define __local_multiple_threads __libc_multiple_threads
#else
#elif defined IS_IN_libpthread
# define __local_multiple_threads __pthread_multiple_threads
#else
# define __local_multiple_threads __librt_multiple_threads
#endif
# ifndef __ASSEMBLER__
@@ -118,7 +120,12 @@
__builtin_expect (THREAD_GETMEM (THREAD_SELF, \
p_header.data.multiple_threads) == 0, 1)
# else
extern int __local_multiple_threads attribute_hidden;
extern int __local_multiple_threads
# if !defined NOT_IN_libc || defined IS_IN_libpthread
attribute_hidden;
# else
;
# endif
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
# endif
# else
@@ -127,16 +134,23 @@ extern int __local_multiple_threads attribute_hidden;
# elif defined FLOATING_STACKS && USE___THREAD
# define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET
# else
# if !defined NOT_IN_libc || defined IS_IN_libpthread
# define __SINGLE_THREAD_CMP cmpl $0, __local_multiple_threads@GOTOFF(%ecx)
# else
# define __SINGLE_THREAD_CMP \
movl __local_multiple_threads@GOT(%ecx), %ecx;\
cmpl $0, (%ecx)
# endif
# if !defined HAVE_HIDDEN || !USE___THREAD
# define SINGLE_THREAD_P \
SETUP_PIC_REG (cx); \
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
cmpl $0, __local_multiple_threads@GOTOFF(%ecx)
__SINGLE_THREAD_CMP
# else
# define SINGLE_THREAD_P \
call __i686.get_pc_thunk.cx; \
addl $_GLOBAL_OFFSET_TABLE_, %ecx; \
cmpl $0, __local_multiple_threads@GOTOFF(%ecx)
__SINGLE_THREAD_CMP
# endif
# endif
# endif

7
linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
View File

@@ -23,7 +23,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -85,9 +85,12 @@ __syscall_error_##args: \
# ifdef IS_IN_libpthread
# define CENABLE br.call.sptk.many b0 = __pthread_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __pthread_disable_asynccancel
# else
# elif !defined NOT_IN_libc
# define CENABLE br.call.sptk.many b0 = __libc_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __libc_disable_asynccancel
# else
# define CENABLE br.call.sptk.many b0 = __librt_enable_asynccancel
# define CDISABLE br.call.sptk.many b0 = __librt_disable_asynccancel
# endif
#define COPY_ARGS_0 /* Nothing */

7
linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h
View File

@@ -23,7 +23,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -78,9 +78,12 @@
# ifdef IS_IN_libpthread
# define CENABLE bl JUMPTARGET(__pthread_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__pthread_disable_asynccancel)
# else
# elif !defined NOT_IN_libc
# define CENABLE bl JUMPTARGET(__libc_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__libc_disable_asynccancel)
# else
# define CENABLE bl JUMPTARGET(__librt_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel)
# endif
# ifndef __ASSEMBLER__

15
linuxthreads/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h
View File

@@ -22,7 +22,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -78,14 +78,23 @@
# define CENABLE bl JUMPTARGET(__pthread_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__pthread_disable_asynccancel)
# define __local_multiple_threads __pthread_multiple_threads
# else
# elif !defined NOT_IN_libc
# define CENABLE bl JUMPTARGET(__libc_enable_asynccancel)
# define CDISABLE bl JUMPTARGET(__libc_disable_asynccancel)
# define __local_multiple_threads __libc_multiple_threads
# else
# define CENABLE bl JUMPTARGET(__librt_enable_asynccancel); nop
# define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel); nop
# define __local_multiple_threads __librt_multiple_threads
# endif
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
extern int __local_multiple_threads
# if !defined NOT_IN_libc || defined IS_IN_libpthread
attribute_hidden;
# else
;
# endif
# define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
# else
# define SINGLE_THREAD_P \

7
linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h
View File

@@ -23,7 +23,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -62,9 +62,12 @@ L(pseudo_end):
# ifdef IS_IN_libpthread
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
# else
# elif !defined NOT_IN_libc
# define CENABLE __libc_enable_asynccancel
# define CDISABLE __libc_disable_asynccancel
# else
# define CENABLE __librt_enable_asynccancel
# define CDISABLE __librt_disable_asynccancel
# endif
#define STM_0 /* Nothing */

32
linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h
View File

@@ -23,7 +23,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -58,10 +58,13 @@ L(pseudo_end):
# define CENABLE __pthread_enable_asynccancel
# define CDISABLE __pthread_disable_asynccancel
# define __local_multiple_threads __pthread_multiple_threads
# else
# elif !defined NOT_IN_libc
# define CENABLE __libc_enable_asynccancel
# define CDISABLE __libc_disable_asynccancel
# define __local_multiple_threads __libc_multiple_threads
# else
# define CENABLE __librt_enable_asynccancel
# define CDISABLE __librt_disable_asynccancel
# endif
#define STM_0 /* Nothing */
@@ -78,14 +81,31 @@ L(pseudo_end):
#define LM_4 lmg %r2,%r5,16+160(%r15);
#define LM_5 lmg %r2,%r5,16+160(%r15);
# ifndef __ASSEMBLER__
# if !defined NOT_IN_libc || defined IS_IN_libpthread
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
# define SINGLE_THREAD_P \
__builtin_expect (__local_multiple_threads == 0, 1)
# else
# define SINGLE_THREAD_P \
# else
# define SINGLE_THREAD_P \
larl %r1,__local_multiple_threads; \
icm %r0,15,0(%r1);
# endif
# else
# ifndef __ASSEMBLER__
# define SINGLE_THREAD_P \
__builtin_expect (THREAD_GETMEM (THREAD_SELF, \
p_header.data.multiple_threads) == 0, 1)
# else
# define SINGLE_THREAD_P \
ear %r1,%a0; \
sllg %r1,%r1,32; \
ear %r1,%a1; \
icm %r1,15,MULTIPLE_THREADS_OFFSET(%r1);
# endif
# endif
#elif !defined __ASSEMBLER__

7
linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
View File

@@ -23,7 +23,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -68,9 +68,12 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \
# ifdef IS_IN_libpthread
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
# else
# elif defined !NOT_IN_libc
# define CENABLE call __libc_enable_asynccancel
# define CDISABLE call __libc_disable_asynccancel
# else
# define CENABLE call __librt_enable_asynccancel
# define CDISABLE call __librt_disable_asynccancel
# endif
#define COPY_ARGS_0 /* Nothing */

7
linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
View File

@@ -23,7 +23,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -67,9 +67,12 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2) \
# ifdef IS_IN_libpthread
# define CENABLE call __pthread_enable_asynccancel
# define CDISABLE call __pthread_disable_asynccancel
# else
# elif !defined NOT_IN_libc
# define CENABLE call __libc_enable_asynccancel
# define CDISABLE call __libc_disable_asynccancel
# else
# define CENABLE call __librt_enable_asynccancel
# define CDISABLE call __librt_disable_asynccancel
# endif
#define COPY_ARGS_0 /* Nothing */

24
linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
View File

@@ -24,7 +24,7 @@
# include <linuxthreads/internals.h>
#endif
#if !defined NOT_IN_libc || defined IS_IN_libpthread
#if !defined NOT_IN_libc || defined IS_IN_libpthread || defined IS_IN_librt
# undef PSEUDO
# define PSEUDO(name, syscall_name, args) \
@@ -94,18 +94,34 @@
# define CENABLE call __pthread_enable_asynccancel;
# define CDISABLE call __pthread_disable_asynccancel;
# define __local_multiple_threads __pthread_multiple_threads
# else
# elif !defined NOT_IN_libc
# define CENABLE call __libc_enable_asynccancel;
# define CDISABLE call __libc_disable_asynccancel;
# define __local_multiple_threads __libc_multiple_threads
# else
# define CENABLE call __librt_enable_asynccancel@plt;
# define CDISABLE call __librt_disable_asynccancel@plt;
# endif
# ifndef __ASSEMBLER__
# if defined IS_IN_libpthread || !defined NOT_IN_libc
# ifndef __ASSEMBLER__
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
__builtin_expect (__local_multiple_threads == 0, 1)
# else
# define SINGLE_THREAD_P cmpl $0, __local_multiple_threads(%rip)
# endif
# else
# define SINGLE_THREAD_P cmpl $0, __local_multiple_threads(%rip)
# ifndef __ASSEMBLER__
# define SINGLE_THREAD_P \
__builtin_expect (THREAD_GETMEM (THREAD_SELF, \
p_header.data.multiple_threads) == 0, 1)
# else
# define SINGLE_THREAD_P cmpl $0, %fs:MULTIPLE_THREADS_OFFSET
# endif
# endif
#elif !defined __ASSEMBLER__

3
linuxthreads/sysdeps/x86_64/Makefile Normal file
View File

@@ -0,0 +1,3 @@
ifeq ($(subdir),csu)
gen-as-const-headers += tcb-offsets.sym
endif

4
linuxthreads/sysdeps/x86_64/tcb-offsets.sym Normal file
View File

@@ -0,0 +1,4 @@
#include <sysdep.h>
#include <tls.h>
MULTIPLE_THREADS_OFFSET offsetof (tcbhead_t, multiple_threads)

1
linuxthreads/sysdeps/x86_64/tls.h
View File

@@ -39,6 +39,7 @@ typedef struct
thread descriptor used by libpthread. */
dtv_t *dtv;
void *self; /* Pointer to the thread descriptor. */
int multiple_threads;
} tcbhead_t;
#endif