diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sunrpc/Makefile | 7 | ||||
| -rw-r--r-- | sunrpc/clnt_perr.c | 4 | ||||
| -rw-r--r-- | sunrpc/svc_run.c | 4 | ||||
| -rw-r--r-- | sunrpc/svc_udp.c | 4 |
5 files changed, 25 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 0c8282e168..fe486f8cb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-04-20 H.J. Lu <hongjiu.lu@intel.com> + + * sunrpc/Makefile (need-export-routines): Add svc_run. + (routines): Remove svc_run. + ($(objpfx)thrsvc): Add $(common-objpfx)linkobj/libc.so. + * sunrpc/clnt_perr.c (clnt_perrno): Export. + * sunrpc/svc_run.c (svc_run): Likewise. + * sunrpc/svc_udp.c (svcudp_create): Likewise. + 2011-04-21 Ulrich Drepper <drepper@gmail.com> * nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn): Fix diff --git a/sunrpc/Makefile b/sunrpc/Makefile index f86393abe3..bcaa2152c9 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -64,12 +64,13 @@ ifeq ($(versioning),yes) need-export-routines := auth_des auth_unix clnt_gen clnt_perr clnt_tcp \ clnt_udp get_myaddr key_call netname pm_getport \ rpc_thread svc svc_tcp svc_udp xcrypt xdr_array xdr \ - xdr_intXX_t xdr_mem xdr_ref xdr_sizeof xdr_stdio + xdr_intXX_t xdr_mem xdr_ref xdr_sizeof xdr_stdio \ + svc_run routines := auth_none authuxprot bindrsvprt clnt_raw clnt_simp \ rpc_dtable getrpcport pmap_clnt pm_getmaps pmap_prot pmap_prot2 \ pmap_rmt rpc_prot rpc_common rpc_cmsg svc_auth svc_authux svc_raw \ - svc_run svc_simple xdr_float xdr_rec publickey authdes_prot \ + svc_simple xdr_float xdr_rec publickey authdes_prot \ des_crypt des_impl des_soft key_prot openchild rtime svcauth_des \ clnt_unix svc_unix create_xid $(need-export-routines) # We only add the RPC for compatibility to libc.so. @@ -212,4 +213,4 @@ ifneq ($(no_deps),t) endif endif -$(objpfx)thrsvc: $(shared-thread-library) +$(objpfx)thrsvc: $(common-objpfx)linkobj/libc.so $(shared-thread-library) diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c index 734c2b3636..e6b2460ec5 100644 --- a/sunrpc/clnt_perr.c +++ b/sunrpc/clnt_perr.c @@ -270,7 +270,11 @@ clnt_perrno (enum clnt_stat num) { (void) __fxprintf (NULL, "%s", clnt_sperrno (num)); } +#ifdef EXPORT_RPC_SYMBOLS +libc_hidden_def (clnt_perrno) +#else libc_hidden_nolink (clnt_perrno, GLIBC_2_0) +#endif char * clnt_spcreateerror (const char *msg) diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c index d92ad57fed..09f40dd188 100644 --- a/sunrpc/svc_run.c +++ b/sunrpc/svc_run.c @@ -101,4 +101,8 @@ svc_run (void) free (my_pollfd); } +#ifdef EXPORT_RPC_SYMBOLS +libc_hidden_def (svc_run) +#else libc_hidden_nolink (svc_run, GLIBC_2_0) +#endif diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index 1e6e456066..71be4f8221 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -195,7 +195,11 @@ svcudp_create (sock) { return svcudp_bufcreate (sock, UDPMSGSIZE, UDPMSGSIZE); } +#ifdef EXPORT_RPC_SYMBOLS +libc_hidden_def (svcudp_create) +#else libc_hidden_nolink (svcudp_create, GLIBC_2_0) +#endif static enum xprt_stat svcudp_stat (xprt) |