diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/libc-tsd.h | 29 | ||||
| -rw-r--r-- | sysdeps/generic/sysdep.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.h | 4 |
3 files changed, 24 insertions, 13 deletions
diff --git a/sysdeps/generic/bits/libc-tsd.h b/sysdeps/generic/bits/libc-tsd.h index 80bd1d3..fc17be1 100644 --- a/sysdeps/generic/bits/libc-tsd.h +++ b/sysdeps/generic/bits/libc-tsd.h @@ -1,5 +1,5 @@ -/* libc-internal interface for thread-specific data. Stub version. - Copyright (C) 1998, 2001 Free Software Foundation, Inc. +/* libc-internal interface for thread-specific data. Stub or TLS version. + Copyright (C) 1998,2001,02 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,8 +17,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef _BITS_LIBC_TSD_H -#define _BITS_LIBC_TSD_H 1 +#ifndef _GENERIC_BITS_LIBC_TSD_H +#define _GENERIC_BITS_LIBC_TSD_H 1 /* This file defines the following macros for accessing a small fixed set of thread-specific `void *' data used only internally by libc. @@ -40,13 +40,22 @@ Some implementations may not provide any enum at all and instead using string pasting in the macros. */ -/* This is the generic/stub implementation for wholly single-threaded - systems. We don't define an enum for the possible key values, because - the KEYs translate directly into variables by macro magic. */ +#include <tls.h> -#define __libc_tsd_define(CLASS, KEY) CLASS void *__libc_tsd_##KEY##_data; -#define __libc_tsd_get(KEY) (__libc_tsd_##KEY##_data) -#define __libc_tsd_set(KEY, VALUE) (__libc_tsd_##KEY##_data = (VALUE)) +/* When full support for __thread variables is available, this interface is + just a trivial wrapper for it. Without TLS, this is the generic/stub + implementation for wholly single-threaded systems. + We don't define an enum for the possible key values, because the KEYs + translate directly into variables by macro magic. */ + +#if USE_TLS && HAVE___THREAD +# define __libc_tsd_define(CLASS, KEY) CLASS __thread void *__libc_tsd_##KEY; +#else +# define __libc_tsd_define(CLASS, KEY) CLASS void *__libc_tsd_##KEY; +#endif + +#define __libc_tsd_get(KEY) (__libc_tsd_##KEY) +#define __libc_tsd_set(KEY, VALUE) (__libc_tsd_##KEY = (VALUE)) #endif /* bits/libc-tsd.h */ diff --git a/sysdeps/generic/sysdep.h b/sysdeps/generic/sysdep.h index 3e46461..280e0e4 100644 --- a/sysdeps/generic/sysdep.h +++ b/sysdeps/generic/sysdep.h @@ -1,5 +1,5 @@ /* Generic asm macros used on many machines. - Copyright (C) 1991, 92, 93, 96, 98 Free Software Foundation, Inc. + Copyright (C) 1991,92,93,96,98,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -36,8 +36,10 @@ #endif +#ifdef __ASSEMBLER__ /* Mark the end of function named SYM. This is used on some platforms to generate correct debugging information. */ #ifndef END #define END(sym) #endif +#endif /* __ASSEMBLER__ */ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index a6f18ec..de60df4 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -33,12 +33,12 @@ #undef SYS_ify #define SYS_ify(syscall_name) __NR_##syscall_name +#ifdef __ASSEMBLER__ + /* ELF-like local names start with `.L'. */ #undef L #define L(name) .L##name -#ifdef __ASSEMBLER__ - /* Linux uses a negative return value to indicate syscall errors, unlike most Unices, which use the condition codes' carry flag. |