about summary refs log tree commit diff
path: root/sunrpc/rpc_common.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-05-11 15:36:50 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-05-11 15:36:50 +0200
commit89aacb513eb77549a29df2638913a0f8178cf3f5 (patch)
tree160dfa13091d79de8091b4d7a33af318ee6cfa95 /sunrpc/rpc_common.c
parentbb066cb806dfe55511cf2fb59bf013751152608f (diff)
downloadglibc-89aacb513eb77549a29df2638913a0f8178cf3f5.tar.gz
glibc-89aacb513eb77549a29df2638913a0f8178cf3f5.tar.xz
glibc-89aacb513eb77549a29df2638913a0f8178cf3f5.zip
sunrpc: Remove stray exports without --enable-obsolete-rpc [BZ #23166]
This is needed to avoid a warning when linking against libtirpc:

/lib64/libc.so.6: warning: common of `rpc_createerr@@TIRPC_0.3.0' overridden by definition
/usr/lib64/libtirpc.so: warning: defined here

This ld warning is not enabled by default; -Wl,--warn-common enables it.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sunrpc/rpc_common.c')
-rw-r--r--sunrpc/rpc_common.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
index 710191163c..2d42827a87 100644
--- a/sunrpc/rpc_common.c
+++ b/sunrpc/rpc_common.c
@@ -46,7 +46,14 @@
    the variable is declared.  So we use the section attribute.  */
 struct opaque_auth _null_auth __attribute__ ((nocommon));
 libc_hidden_nolink_sunrpc (_null_auth, GLIBC_2_0)
-fd_set svc_fdset;
-struct rpc_createerr rpc_createerr;
-struct pollfd *svc_pollfd;
-int svc_max_pollfd;
+
+/* 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)