diff options
| author | Khem Raj <raj.khem@gmail.com> | 2010-02-01 12:28:54 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-02-01 12:28:54 -0800 |
| commit | 9e22545a13d62299c59b048ae5923bf6da14ff9f (patch) | |
| tree | 2aab233cda445781073c1f7f9dec154b867aa139 /libc/misc | |
| parent | e999106d1b95e63283e9bb8246e5c34e9c1e85f7 (diff) | |
| parent | 22de495da40d7649eb28fdfc70ce1d5f3b6572ea (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
libc/stdlib/Makefile.in
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'libc/misc')
| -rw-r--r-- | libc/misc/internals/errno.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libc/misc/internals/errno.c b/libc/misc/internals/errno.c index e1b5d7e84..11d19eeef 100644 --- a/libc/misc/internals/errno.c +++ b/libc/misc/internals/errno.c @@ -4,15 +4,14 @@ __thread int errno; __thread int h_errno; -extern __thread int __libc_errno __attribute__ ((alias ("errno"))); -extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))); +extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden; +extern __thread int __libc_h_errno __attribute__ ((alias ("h_errno"))) attribute_hidden; #define h_errno __libc_h_errno #else #include "internal_errno.h" int errno = 0; int h_errno = 0; - #ifdef __UCLIBC_HAS_THREADS__ libc_hidden_def(errno) weak_alias(errno, _errno) |