diff options
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/Versions | 11 | ||||
| -rw-r--r-- | resolv/res_libc.c | 18 |
2 files changed, 23 insertions, 6 deletions
diff --git a/resolv/Versions b/resolv/Versions index 09dca6aa2a..238d579d8c 100644 --- a/resolv/Versions +++ b/resolv/Versions @@ -29,15 +29,18 @@ libc { # r* __res_state; __res_init; __res_nclose; __res_ninit; _res_hconf; } - GLIBC_2.3 { + GLIBC_PRIVATE { + __gai_sigqueue; + %if USE_TLS && HAVE___THREAD # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol. h_errno; _res; +%else + # These internal aliases are solely to give libpthread access + # to the variables that are not directly user-visible. + __libc_h_errno; __libc_res; %endif } - GLIBC_PRIVATE { - __gai_sigqueue; - } } libresolv { diff --git a/resolv/res_libc.c b/resolv/res_libc.c index 60f7febf05..b1132b0ffd 100644 --- a/resolv/res_libc.c +++ b/resolv/res_libc.c @@ -31,8 +31,22 @@ extern __thread struct __res_state __libc_res __attribute__ ((alias ("_res"))) attribute_hidden; # define _res __libc_res #else -/* The resolver state for use by single-threaded programs. */ -struct __res_state _res; +/* The resolver state for use by single-threaded programs. + + This differs from a plain uninitialized definition in that it doesn't + create a common definition, but a plain symbol that resides in .bss, + which can have an alias. */ +struct __res_state _res __attribute__ ((section (".bss"))); + +/* This alias is needed by libpthread. */ +strong_alias (_res, __libc_res) + +/* We declare this with compat_symbol so that it's not + visible at link time. Programs must use the accessor functions. */ +# if defined HAVE_ELF && defined SHARED && defined DO_VERSIONING +# include <shlib-compat.h> +compat_symbol (libc, _res, _res, GLIBC_2_0); +# endif #endif /* This function is used to access the resolver state in |