diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-07-05 14:12:22 +0200 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-07-05 14:26:02 -0700 |
| commit | 0d6ee549bc86fd330672a79d9a87d2c3825eea67 (patch) | |
| tree | 8d81f634249bc8efadf378deaf9510bc84a7966b | |
| parent | dfb389dea84f667bc890c5a188f38dc41b9ed9c6 (diff) | |
don't make __errno_location / __h_errno_location hidden
Closes #2089 (https://bugs.busybox.net/show_bug.cgi?id=2089)
__errno_location / __h_errno_location access has to go through the PLT
like malloc/free, so the linuxthread variants gets used instead when
compiling with -pthread.
Based on http://github.com/mat-c/uClibc/commit/328d392c54aa5dc2b8e7f398a419087de497de2b
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
| -rw-r--r-- | include/netdb.h | 1 | ||||
| -rw-r--r-- | libc/misc/internals/__errno_location.c | 3 | ||||
| -rw-r--r-- | libc/misc/internals/__h_errno_location.c | 1 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/errno.h | 1 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/bits/uClibc_errno.h | 3 |
5 files changed, 0 insertions, 9 deletions
diff --git a/include/netdb.h b/include/netdb.h index 9d3807d3a..ac411ab93 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -59,7 +59,6 @@ __BEGIN_DECLS /* Function to get address of global `h_errno' variable. */ extern int *__h_errno_location (void) __THROW __attribute__ ((__const__)); -libc_hidden_proto(__h_errno_location) /* Macros for accessing h_errno from inside libc. */ #ifdef _LIBC diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c index aec7641ce..71c5461a7 100644 --- a/libc/misc/internals/__errno_location.c +++ b/libc/misc/internals/__errno_location.c @@ -15,6 +15,3 @@ __errno_location (void) { return &errno; } -#ifdef IS_IN_libc /* not really need, only to keep in sync w/ libc_hidden_proto */ -libc_hidden_weak(__errno_location) -#endif diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c index 213d39894..235df4ec6 100644 --- a/libc/misc/internals/__h_errno_location.c +++ b/libc/misc/internals/__h_errno_location.c @@ -10,4 +10,3 @@ int * weak_const_function __h_errno_location (void) { return &h_errno; } -libc_hidden_weak(__h_errno_location) diff --git a/libc/sysdeps/linux/common/bits/errno.h b/libc/sysdeps/linux/common/bits/errno.h index 0bf6354fb..de9688ac1 100644 --- a/libc/sysdeps/linux/common/bits/errno.h +++ b/libc/sysdeps/linux/common/bits/errno.h @@ -43,7 +43,6 @@ # ifndef __ASSEMBLER__ /* Function to get address of global `errno' variable. */ extern int *__errno_location (void) __THROW __attribute__ ((__const__)); -libc_hidden_proto(__errno_location) # ifdef __UCLIBC_HAS_THREADS__ /* When using threads, errno is a per-thread value. */ diff --git a/libc/sysdeps/linux/common/bits/uClibc_errno.h b/libc/sysdeps/linux/common/bits/uClibc_errno.h index 9c1561841..79eb7e6bd 100644 --- a/libc/sysdeps/linux/common/bits/uClibc_errno.h +++ b/libc/sysdeps/linux/common/bits/uClibc_errno.h @@ -33,9 +33,6 @@ extern int *__errno_location (void) __THROW __attribute__ ((__const__)) ; # if defined __UCLIBC_HAS_THREADS__ # include <tls.h> -# if defined USE___THREAD && USE___THREAD -libc_hidden_proto(__errno_location) -# endif # endif #endif /* !__ASSEMBLER__ */ |