diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 16:50:28 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-10 16:50:28 -0400 |
| commit | d063d164335938d557460bebaa7cfe388157b627 (patch) | |
| tree | 92ef3f54771c0a28190b76ee45f90d16fd39714f /csu | |
| parent | 3ce1f2959437e952b9db4eaeed2407424f11a4d1 (diff) | |
Remove support for !USE___THREAD
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/errno-loc.c | 10 | ||||
| -rw-r--r-- | csu/errno.c | 21 |
2 files changed, 3 insertions, 28 deletions
diff --git a/csu/errno-loc.c b/csu/errno-loc.c index 633590f4f9..f7de2b7b08 100644 --- a/csu/errno-loc.c +++ b/csu/errno-loc.c @@ -1,6 +1,6 @@ /* MT support function to get address of `errno' variable, non-threaded version. - Copyright (C) 1996, 1998, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 2002, 2004, 2011 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 @@ -21,15 +21,7 @@ #include <errno.h> #include <tls.h> -#if ! USE___THREAD && !RTLD_PRIVATE_ERRNO -#undef errno -extern int errno; -#endif - int * -#if ! USE___THREAD -weak_const_function -#endif __errno_location (void) { return &errno; diff --git a/csu/errno.c b/csu/errno.c index 03d661b717..d5d2c98fb7 100644 --- a/csu/errno.c +++ b/csu/errno.c @@ -1,5 +1,5 @@ /* Definition of `errno' variable. Canonical version. - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2011 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 @@ -27,27 +27,10 @@ /* Code compiled for rtld refers only to this name. */ int rtld_errno attribute_hidden; -#elif USE___THREAD +#else __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, - which can have an alias. */ -int errno __attribute__ ((nocommon)); -strong_alias (errno, _errno) - -/* We declare these with compat_symbol so that they are not visible at - link time. Programs must use the accessor functions. RTLD is special, - since it's not exported from there at any time. */ -# if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING -# include <shlib-compat.h> -compat_symbol (libc, errno, errno, GLIBC_2_0); -compat_symbol (libc, _errno, _errno, GLIBC_2_0); -# endif - #endif |