diff options
| author | Roland McGrath <roland@gnu.org> | 2002-10-15 22:50:43 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-10-15 22:50:43 +0000 |
| commit | 9b21e6bcf8986e076ca8aa4862bb76b76605e591 (patch) | |
| tree | 9654d1175dfcc8eb8d7cfd9dc8958b207d988e4f /sysdeps | |
| parent | 146a03db8950595fe7ce64e4c9c397746d92d4b9 (diff) | |
| download | glibc-9b21e6bcf8986e076ca8aa4862bb76b76605e591.tar.gz glibc-9b21e6bcf8986e076ca8aa4862bb76b76605e591.tar.xz glibc-9b21e6bcf8986e076ca8aa4862bb76b76605e591.zip | |
2002-10-16 Jakub Jelinek <jakub@redhat.com>
* include/libc-symbols.h (attribute_tls_model_ie): Define.
* include/errno.h (errno): Define to __libc_errno in libc.so.
Add attribute_tls_model_ie.
* include/netdb.h (h_errno): Define to __libc_h_errno in libc.so.
Add attribute_tls_model_ie.
* include/resolv.h (_res): Define to __libc_res in libc.so. Add
attribute_tls_model_ie.
* inet/herrno.c (__libc_h_errno): Add hidden alias to h_errno.
(h_errno): Define.
* resolv/res_libc.c (__libc_res): Add hidden alias to _res.
(_res): Define.
* sysdeps/generic/bits/libc-tsd.h (__libc_tsd_define): Add
attribute_tls_model_ie.
* sysdeps/generic/errno-loc.c (errno): Only undefine if not using
__thread.
* sysdeps/generic/errno.c (__libc_errno): Add hidden alias to errno.
* sysdeps/unix/sysv/linux/i386/sysdep.h (SYSCALL_ERROR_HANDLER): Use
__libc_errno in USE___THREAD case.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_ERROR_HANDLER):
Likewise.
* configure.in (HAVE_TLS_MODEL_ATTRIBUTE): Check for
__attribute__((tls_model (""))).
* configure: Rebuilt.
* config.h.in (HAVE_TLS_MODEL_ATTRIBUTE): Add.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/bits/libc-tsd.h | 3 | ||||
| -rw-r--r-- | sysdeps/generic/errno-loc.c | 6 | ||||
| -rw-r--r-- | sysdeps/generic/errno.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/sysdep.h | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/sysdeps/generic/bits/libc-tsd.h b/sysdeps/generic/bits/libc-tsd.h index cc2c2c1219..d39382952a 100644 --- a/sysdeps/generic/bits/libc-tsd.h +++ b/sysdeps/generic/bits/libc-tsd.h @@ -52,7 +52,8 @@ translate directly into variables by macro magic. */ #if USE___THREAD -# define __libc_tsd_define(CLASS, KEY) CLASS __thread void *__libc_tsd_##KEY; +# define __libc_tsd_define(CLASS, KEY) \ + CLASS __thread void *__libc_tsd_##KEY attribute_tls_model_ie; # define __libc_tsd_address(KEY) (&__libc_tsd_##KEY) # define __libc_tsd_get(KEY) (__libc_tsd_##KEY) diff --git a/sysdeps/generic/errno-loc.c b/sysdeps/generic/errno-loc.c index bda9fa4211..032b48306c 100644 --- a/sysdeps/generic/errno-loc.c +++ b/sysdeps/generic/errno-loc.c @@ -20,11 +20,9 @@ #include <errno.h> #include <tls.h> -#undef errno -#if USE_TLS && HAVE___THREAD -extern __thread int errno; -#else +#if !(USE_TLS && HAVE___THREAD) +#undef errno extern int errno; #endif diff --git a/sysdeps/generic/errno.c b/sysdeps/generic/errno.c index cba5ab9c3b..e33c6b88ad 100644 --- a/sysdeps/generic/errno.c +++ b/sysdeps/generic/errno.c @@ -23,6 +23,8 @@ #if USE___THREAD __thread int errno; +extern __thread int __libc_errno __attribute__ ((alias ("errno"))) + attribute_hidden; #else /* This differs from plain `int errno;' in that it doesn't create a common definition, but a plain symbol that resides in .bss, diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h index f6763b14f2..4c907f2d4a 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.h +++ b/sysdeps/unix/sysv/linux/i386/sysdep.h @@ -114,7 +114,7 @@ __i686.get_pc_thunk.reg: \ # define SYSCALL_ERROR_HANDLER \ 0:SETUP_PIC_REG (cx); \ addl $_GLOBAL_OFFSET_TABLE_, %ecx; \ - movl errno@gotntpoff(%ecx), %ecx; \ + movl __libc_errno@GOTNTPOFF(%ecx), %ecx; \ xorl %edx, %edx; \ subl %eax, %edx; \ movl %edx, %gs:0(%ecx); \ diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h index de6bb44d9f..adccc50bba 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h @@ -95,7 +95,7 @@ #elif USE___THREAD # define SYSCALL_ERROR_HANDLER \ 0: \ - movq errno@GOTTPOFF(%rip), %rcx; \ + movq __libc_errno@GOTTPOFF(%rip), %rcx; \ xorq %rdx, %rdx; \ subq %rax, %rdx; \ movl %edx, %fs:(%rcx); \ |