aboutsummaryrefslogtreecommitdiff
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
parent01ac385ca819599f7f1815115ffe926b5e1460ef (diff)
downloadglibc-78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd.tar
glibc-78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd.tar.gz
glibc-78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd.tar.bz2
glibc-78e02c469828fcfb6a5cf73dbcceb4f60fb6fafd.zip
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>
-rw-r--r--include/rpc/clnt.h1
-rw-r--r--include/rpc/svc.h4
-rw-r--r--sunrpc/rpc_common.c12
3 files changed, 8 insertions, 9 deletions
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 80be0a9cec..a397023a93 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,7 +28,6 @@ libc_hidden_proto (clntudp_create)
libc_hidden_proto (get_myaddress)
libc_hidden_proto (clntunix_create)
libc_hidden_proto (__libc_clntudp_bufcreate)
-libc_hidden_proto (rpc_createerr)
# endif /* !_ISOMAC */
#endif
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 40ba2546a9..465bf4427d 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -3,10 +3,6 @@
# ifndef _ISOMAC
-libc_hidden_proto (svc_pollfd)
-libc_hidden_proto (svc_max_pollfd)
-libc_hidden_proto (svc_fdset)
-
libc_hidden_proto (xprt_register)
libc_hidden_proto (xprt_unregister)
libc_hidden_proto (svc_register)
diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
index 2a5d0dc1c7..05abab2a1d 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