From dbb949f53d4801b91885b2dfac9875b83a8710bf Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 2 Jul 2021 11:45:00 +0200 Subject: resolv: Move libanl into libc (if libpthread is in libc) The symbols gai_cancel, gai_error, gai_suspend, getaddrinfo_a, __gai_suspend_time64 were moved using scripts/move-symbol-to-libc.py. For Hurd (which remains !PTHREAD_IN_LIBC), a few #define redirects had to be added because several pthread functions are not available under __. (Linux uses __ prefixes for most hidden aliases, and has to in some cases to avoid linknamespace issues.) --- resolv/gai_error.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'resolv/gai_error.c') diff --git a/resolv/gai_error.c b/resolv/gai_error.c index 4f9ac55..9fe9c40 100644 --- a/resolv/gai_error.c +++ b/resolv/gai_error.c @@ -17,11 +17,20 @@ . */ #include - +#include #include int -gai_error (struct gaicb *req) +__gai_error (struct gaicb *req) { return req->__return; } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __gai_error, gai_error, GLIBC_2_34); + +# if OTHER_SHLIB_COMPAT (libanl, GLIBC_2_2_3, GLIBC_2_34) +compat_symbol (libanl, __gai_error, gai_error, GLIBC_2_2_3); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__gai_error, gai_error) +#endif /* !PTHREAD_IN_LIBC */ -- cgit v1.1