aboutsummaryrefslogtreecommitdiff
path: root/sunrpc
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2020-07-08 07:58:51 +0200
committerFlorian Weimer <fweimer@redhat.com>2020-07-08 08:39:39 +0200
commit78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd (patch)
tree53004e59ca0dc4f64ec8e1aaa35ddb746ec05aae /sunrpc
parent01ac385ca819599f7f1815115ffe926b5e1460ef (diff)
downloadglibc-78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd.zip
glibc-78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd.tar.gz
glibc-78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd.tar.bz2
sunrpc: Remove hidden aliases for global data symbols (bug 26210)
It is generally not possible to add hidden aliases for global data symbols: If the main executable contains a copy relocation against the symbol, the hidden aliases keep pointing to the glibc-internal copy of the symbol, instead of the symbol actually used by the application. Fixes commit 89aacb513eb77549a29df2638913a0f8178cf3f5 ("sunrpc: Remove stray exports without --enable-obsolete-rpc [BZ #23166]"). Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sunrpc')
-rw-r--r--sunrpc/rpc_common.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
index 2a5d0dc..05abab2 100644
--- a/sunrpc/rpc_common.c
+++ b/sunrpc/rpc_common.c
@@ -48,10 +48,14 @@ libc_hidden_nolink_sunrpc (_null_auth, GLIBC_2_0)
/* The variables need the nocommon attribute, so that it is possible
to create aliases and specify symbol versions. */
fd_set svc_fdset __attribute__ ((nocommon));
-libc_hidden_nolink_sunrpc (svc_fdset, GLIBC_2_0)
struct rpc_createerr rpc_createerr __attribute__ ((nocommon));
-libc_hidden_nolink_sunrpc (rpc_createerr, GLIBC_2_0)
struct pollfd *svc_pollfd __attribute__ ((nocommon));
-libc_hidden_nolink_sunrpc (svc_pollfd, GLIBC_2_2)
int svc_max_pollfd __attribute__ ((nocommon));
-libc_hidden_nolink_sunrpc (svc_max_pollfd, GLIBC_2_2)
+#ifdef SHARED
+# ifndef EXPORT_RPC_SYMBOLS
+compat_symbol (libc, svc_fdset, svc_fdset, GLIBC_2_0);
+compat_symbol (libc, rpc_createerr, rpc_createerr, GLIBC_2_0);
+compat_symbol (libc, svc_pollfd, svc_pollfd, GLIBC_2_2);
+compat_symbol (libc, svc_max_pollfd, svc_max_pollfd, GLIBC_2_2);
+# endif
+#endif