commit 021db4be6f1f4189f66feee066a495d49e92b93e Author: Andreas Jaeger Date: Thu May 10 20:16:53 2012 +0200 Make sunrpc code usable again New configure option --enable-obsolete-rpc makes the deprecated RPC headers and functions available at compile time as they were before version 2.14. This option will be removed at some time in the future after the TI-RPC library becomes fully sufficient for the needs of existing applications. --- config.h.in | 3 +++ config.make.in | 1 + configure | 18 ++++++++++++++++++ configure.in | 11 +++++++++++ include/libc-symbols.h | 7 ++++++- nis/Makefile | 6 ++++++ sunrpc/Makefile | 6 ++++++ sunrpc/auth_des.c | 4 ++-- sunrpc/auth_none.c | 2 +- sunrpc/auth_unix.c | 4 ++-- sunrpc/authdes_prot.c | 4 ++-- sunrpc/authuxprot.c | 2 +- sunrpc/clnt_gen.c | 2 +- sunrpc/clnt_perr.c | 10 +++++----- sunrpc/clnt_raw.c | 2 +- sunrpc/clnt_simp.c | 2 +- sunrpc/clnt_tcp.c | 2 +- sunrpc/clnt_udp.c | 6 +++--- sunrpc/clnt_unix.c | 2 +- sunrpc/des_crypt.c | 4 ++-- sunrpc/des_soft.c | 2 +- sunrpc/get_myaddr.c | 2 +- sunrpc/key_call.c | 18 +++++++++--------- sunrpc/key_prot.c | 20 ++++++++++---------- sunrpc/netname.c | 10 +++++----- sunrpc/pm_getmaps.c | 2 +- sunrpc/pm_getport.c | 4 ++-- sunrpc/pmap_clnt.c | 4 ++-- sunrpc/pmap_prot.c | 2 +- sunrpc/pmap_prot2.c | 2 +- sunrpc/pmap_rmt.c | 8 ++++---- sunrpc/publickey.c | 4 ++-- sunrpc/rpc_cmsg.c | 2 +- sunrpc/rpc_common.c | 2 +- sunrpc/rpc_dtable.c | 2 +- sunrpc/rpc_prot.c | 14 +++++++------- sunrpc/rpc_thread.c | 8 ++++---- sunrpc/rtime.c | 2 +- sunrpc/svc.c | 32 ++++++++++++++++---------------- sunrpc/svc_auth.c | 2 +- sunrpc/svc_raw.c | 2 +- sunrpc/svc_run.c | 4 ++-- sunrpc/svc_tcp.c | 4 ++-- sunrpc/svc_udp.c | 6 +++--- sunrpc/svc_unix.c | 4 ++-- sunrpc/svcauth_des.c | 2 +- sunrpc/xcrypt.c | 4 ++-- sunrpc/xdr.c | 44 ++++++++++++++++++++++---------------------- sunrpc/xdr_array.c | 4 ++-- sunrpc/xdr_float.c | 4 ++-- sunrpc/xdr_intXX_t.c | 20 ++++++++++---------- sunrpc/xdr_mem.c | 2 +- sunrpc/xdr_rec.c | 8 ++++---- sunrpc/xdr_ref.c | 4 ++-- sunrpc/xdr_sizeof.c | 2 +- sunrpc/xdr_stdio.c | 2 +- 56 files changed, 203 insertions(+), 153 deletions(-) --- a/config.h.in +++ b/config.h.in @@ -187,6 +187,9 @@ /* Define if `.ctors' and `.dtors' sections shouldn't be used. */ #undef NO_CTORS_DTORS_SECTIONS +/* Define if obsolete RPC code should be made available for user-level code + to link against. */ +#undef LINK_OBSOLETE_RPC /* */ --- a/config.make.in +++ b/config.make.in @@ -100,6 +100,7 @@ sysdeps-add-ons = @sysdeps_add_ons@ cross-compiling = @cross_compiling@ force-install = @force_install@ +link-obsolete-rpc = @link_obsolete_rpc@ # Build tools. CC = @CC@ --- a/configure +++ b/configure @@ -692,6 +692,7 @@ base_machine add_on_subdirs add_ons +link_obsolete_rpc libc_cv_nss_crypt all_warnings force_install @@ -790,6 +791,7 @@ enable_all_warnings enable_multi_arch enable_nss_crypt +enable_obsolete_rpc with_cpu ' ac_precious_vars='build_alias @@ -1449,6 +1451,8 @@ --enable-multi-arch enable single DSO with optimizations for multiple architectures --enable-nss-crypt enable libcrypt to use nss + --enable-obsolete-rpc build and install the obsolete RPC code for + link-time usage Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3803,6 +3807,20 @@ fi +# Check whether --enable-obsolete-rpc was given. +if test "${enable_obsolete_rpc+set}" = set; then : + enableval=$enable_obsolete_rpc; link_obsolete_rpc=$enableval +else + link_obsolete_rpc=no +fi + + + +if test "$link_obsolete_rpc" = yes; then + $as_echo "#define LINK_OBSOLETE_RPC 1" >>confdefs.h + +fi + # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os --- a/configure.in +++ b/configure.in @@ -290,6 +290,17 @@ fi AC_SUBST(libc_cv_nss_crypt) +AC_ARG_ENABLE([obsolete-rpc], + AC_HELP_STRING([--enable-obsolete-rpc], + [build and install the obsolete RPC code for link-time usage]), + [link_obsolete_rpc=$enableval], + [link_obsolete_rpc=no]) +AC_SUBST(link_obsolete_rpc) + +if test "$link_obsolete_rpc" = yes; then + AC_DEFINE(LINK_OBSOLETE_RPC) +fi + # The way shlib-versions is used to generate soversions.mk uses a # fairly simplistic model for name recognition that can't distinguish # i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -626,7 +626,12 @@ # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libc_hidden_def(name) hidden_def (name) # define libc_hidden_weak(name) hidden_weak (name) -# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) +# ifdef LINK_OBSOLETE_RPC + /* libc_hidden_nolink_sunrpc should only get used in sunrpc code. */ +# define libc_hidden_nolink_sunrpc(name, version) hidden_def (name) +# else +# define libc_hidden_nolink_sunrpc(name, version) hidden_nolink (name, libc, version) +# endif # define libc_hidden_ver(local, name) hidden_ver (local, name) # define libc_hidden_data_def(name) hidden_data_def (name) # define libc_hidden_data_weak(name) hidden_data_weak (name) --- a/nis/Makefile +++ b/nis/Makefile @@ -23,6 +23,12 @@ aux := nis_hash +include ../Makeconfig + +ifeq ($(link-obsolete-rpc),yes) +headers := $(wildcard rpcsvc/*.[hx]) +endif + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ nisplus-parser.h nis_xdr.h nss \ $(wildcard rpcsvc/*.[hx]) --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -61,6 +61,10 @@ include ../Makeconfig +ifeq ($(link-obsolete-rpc),yes) +headers += $(headers-in-tirpc) $(headers-not-in-tirpc) +endif + 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 \ @@ -74,9 +78,11 @@ 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) +ifneq ($(link-obsolete-rpc),yes) # We only add the RPC for compatibility to libc.so. shared-only-routines = $(routines) endif +endif # We do not build rpcinfo anymore. It is not needed for a bootstrap # and not wanted on complete systems. --- a/sunrpc/auth_des.c +++ b/sunrpc/auth_des.c @@ -117,7 +117,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (authdes_create) #else -libc_hidden_nolink (authdes_create, GLIBC_2_1) +libc_hidden_nolink_sunrpc (authdes_create, GLIBC_2_1) #endif AUTH * @@ -211,7 +211,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (authdes_pk_create) #else -libc_hidden_nolink (authdes_pk_create, GLIBC_2_1) +libc_hidden_nolink_sunrpc (authdes_pk_create, GLIBC_2_1) #endif /* --- a/sunrpc/auth_none.c +++ b/sunrpc/auth_none.c @@ -95,7 +95,7 @@ __libc_once (authnone_private_guard, authnone_create_once); return &authnone_private.no_client; } -libc_hidden_nolink (authnone_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (authnone_create, GLIBC_2_0) static bool_t authnone_marshal (AUTH *client, XDR *xdrs) --- a/sunrpc/auth_unix.c +++ b/sunrpc/auth_unix.c @@ -149,7 +149,7 @@ marshal_new_auth (auth); return auth; } -libc_hidden_nolink (authunix_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (authunix_create, GLIBC_2_0) /* * Returns an auth handle with parameters determined by doing lots of @@ -216,7 +216,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (authunix_create_default) #else -libc_hidden_nolink (authunix_create_default, GLIBC_2_0) +libc_hidden_nolink_sunrpc (authunix_create_default, GLIBC_2_0) #endif /* --- a/sunrpc/authdes_prot.c +++ b/sunrpc/authdes_prot.c @@ -63,7 +63,7 @@ return FALSE; } } -libc_hidden_nolink (xdr_authdes_cred, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_authdes_cred, GLIBC_2_1) bool_t @@ -78,4 +78,4 @@ sizeof (verf->adv_int_u))); return TRUE; } -libc_hidden_nolink (xdr_authdes_verf, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_authdes_verf, GLIBC_2_1) --- a/sunrpc/authuxprot.c +++ b/sunrpc/authuxprot.c @@ -63,4 +63,4 @@ } return FALSE; } -libc_hidden_nolink (xdr_authunix_parms, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_authunix_parms, GLIBC_2_0) --- a/sunrpc/clnt_gen.c +++ b/sunrpc/clnt_gen.c @@ -175,5 +175,5 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (clnt_create) #else -libc_hidden_nolink (clnt_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnt_create, GLIBC_2_0) #endif --- a/sunrpc/clnt_perr.c +++ b/sunrpc/clnt_perr.c @@ -127,7 +127,7 @@ return str; } -libc_hidden_nolink (clnt_sperror, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnt_sperror, GLIBC_2_0) void clnt_perror (CLIENT * rpch, const char *msg) @@ -137,7 +137,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (clnt_perror) #else -libc_hidden_nolink (clnt_perror, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnt_perror, GLIBC_2_0) #endif @@ -270,7 +270,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (clnt_perrno) #else -libc_hidden_nolink (clnt_perrno, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnt_perrno, GLIBC_2_0) #endif char * @@ -308,7 +308,7 @@ return str; } -libc_hidden_nolink (clnt_spcreateerror, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnt_spcreateerror, GLIBC_2_0) void clnt_pcreateerror (const char *msg) @@ -318,7 +318,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (clnt_pcreateerror) #else -libc_hidden_nolink (clnt_pcreateerror, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnt_pcreateerror, GLIBC_2_0) #endif struct auth_errtab --- a/sunrpc/clnt_raw.c +++ b/sunrpc/clnt_raw.c @@ -129,7 +129,7 @@ client->cl_auth = authnone_create (); return client; } -libc_hidden_nolink (clntraw_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0) static enum clnt_stat clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout) --- a/sunrpc/clnt_simp.c +++ b/sunrpc/clnt_simp.c @@ -139,7 +139,7 @@ crp->valid = 0; return (int) clnt_stat; } -libc_hidden_nolink (callrpc, GLIBC_2_0) +libc_hidden_nolink_sunrpc (callrpc, GLIBC_2_0) #ifdef _RPC_THREAD_SAFE_ void --- a/sunrpc/clnt_tcp.c +++ b/sunrpc/clnt_tcp.c @@ -220,7 +220,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (clnttcp_create) #else -libc_hidden_nolink (clnttcp_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnttcp_create, GLIBC_2_0) #endif static enum clnt_stat --- a/sunrpc/clnt_udp.c +++ b/sunrpc/clnt_udp.c @@ -239,7 +239,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (__libc_clntudp_bufcreate) #else -libc_hidden_nolink (__libc_clntudp_bufcreate, GLIBC_PRIVATE) +libc_hidden_nolink_sunrpc (__libc_clntudp_bufcreate, GLIBC_PRIVATE) #endif CLIENT * @@ -250,7 +250,7 @@ return __libc_clntudp_bufcreate (raddr, program, version, wait, sockp, sendsz, recvsz, 0); } -libc_hidden_nolink (clntudp_bufcreate, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clntudp_bufcreate, GLIBC_2_0) CLIENT * clntudp_create (raddr, program, version, wait, sockp) @@ -266,7 +266,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (clntudp_create) #else -libc_hidden_nolink (clntudp_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clntudp_create, GLIBC_2_0) #endif static int --- a/sunrpc/clnt_unix.c +++ b/sunrpc/clnt_unix.c @@ -200,7 +200,7 @@ mem_free ((caddr_t) h, sizeof (CLIENT)); return (CLIENT *) NULL; } -libc_hidden_nolink (clntunix_create, GLIBC_2_1) +libc_hidden_nolink_sunrpc (clntunix_create, GLIBC_2_1) static enum clnt_stat clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout) --- a/sunrpc/des_crypt.c +++ b/sunrpc/des_crypt.c @@ -102,7 +102,7 @@ COPY8 (dp.des_ivec, ivec); return err; } -libc_hidden_nolink (cbc_crypt, GLIBC_2_1) +libc_hidden_nolink_sunrpc (cbc_crypt, GLIBC_2_1) /* * ECB mode encryption @@ -115,4 +115,4 @@ dp.des_mode = ECB; return common_crypt (key, buf, len, mode, &dp); } -libc_hidden_nolink (ecb_crypt, GLIBC_2_1) +libc_hidden_nolink_sunrpc (ecb_crypt, GLIBC_2_1) --- a/sunrpc/des_soft.c +++ b/sunrpc/des_soft.c @@ -70,4 +70,4 @@ p++; } } -libc_hidden_nolink (des_setparity, GLIBC_2_1) +libc_hidden_nolink_sunrpc (des_setparity, GLIBC_2_1) --- a/sunrpc/get_myaddr.c +++ b/sunrpc/get_myaddr.c @@ -99,5 +99,5 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (get_myaddress) #else -libc_hidden_nolink (get_myaddress, GLIBC_2_0) +libc_hidden_nolink_sunrpc (get_myaddress, GLIBC_2_0) #endif --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -80,7 +80,7 @@ } return 0; } -libc_hidden_nolink (key_setsecret, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_setsecret, GLIBC_2_1) /* key_secretkey_is_set() returns 1 if the keyserver has a secret key * stored for the caller's effective uid; it returns 0 otherwise @@ -109,7 +109,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (key_secretkey_is_set) #else -libc_hidden_nolink (key_secretkey_is_set, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_secretkey_is_set, GLIBC_2_1) #endif int @@ -133,7 +133,7 @@ *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_encryptsession, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_encryptsession, GLIBC_2_1) int key_decryptsession (char *remotename, des_block *deskey) @@ -155,7 +155,7 @@ *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_decryptsession, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_decryptsession, GLIBC_2_1) int key_encryptsession_pk (char *remotename, netobj *remotekey, @@ -180,7 +180,7 @@ *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_encryptsession_pk, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_encryptsession_pk, GLIBC_2_1) int key_decryptsession_pk (char *remotename, netobj *remotekey, @@ -205,7 +205,7 @@ *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_decryptsession_pk, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_decryptsession_pk, GLIBC_2_1) int key_gendes (des_block *key) @@ -239,7 +239,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (key_gendes) #else -libc_hidden_nolink (key_gendes, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_gendes, GLIBC_2_1) #endif int @@ -259,7 +259,7 @@ } return 1; } -libc_hidden_nolink (key_setnet, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_setnet, GLIBC_2_1) int key_get_conv (char *pkey, des_block *deskey) @@ -278,7 +278,7 @@ *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_get_conv, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_get_conv, GLIBC_2_1) /* * Hack to allow the keyserver to use AUTH_DES (for authenticated --- a/sunrpc/key_prot.c +++ b/sunrpc/key_prot.c @@ -38,7 +38,7 @@ return TRUE; } -libc_hidden_nolink (xdr_keystatus, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_keystatus, GLIBC_2_0) bool_t xdr_keybuf (XDR * xdrs, keybuf objp) @@ -48,7 +48,7 @@ return TRUE; } -libc_hidden_nolink (xdr_keybuf, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_keybuf, GLIBC_2_0) bool_t xdr_netnamestr (XDR * xdrs, netnamestr * objp) @@ -58,7 +58,7 @@ return TRUE; } -libc_hidden_nolink (xdr_netnamestr, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_netnamestr, GLIBC_2_1) bool_t xdr_cryptkeyarg (XDR * xdrs, cryptkeyarg * objp) @@ -71,7 +71,7 @@ return TRUE; } -libc_hidden_nolink (xdr_cryptkeyarg, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_cryptkeyarg, GLIBC_2_0) bool_t xdr_cryptkeyarg2 (XDR * xdrs, cryptkeyarg2 * objp) @@ -84,7 +84,7 @@ return FALSE; return TRUE; } -libc_hidden_nolink (xdr_cryptkeyarg2, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_cryptkeyarg2, GLIBC_2_0) bool_t xdr_cryptkeyres (XDR * xdrs, cryptkeyres * objp) @@ -102,7 +102,7 @@ } return TRUE; } -libc_hidden_nolink (xdr_cryptkeyres, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_cryptkeyres, GLIBC_2_0) bool_t xdr_unixcred (XDR * xdrs, unixcred * objp) @@ -117,7 +117,7 @@ return FALSE; return TRUE; } -libc_hidden_nolink (xdr_unixcred, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_unixcred, GLIBC_2_1) bool_t xdr_getcredres (XDR * xdrs, getcredres * objp) @@ -135,7 +135,7 @@ } return TRUE; } -libc_hidden_nolink (xdr_getcredres, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_getcredres, GLIBC_2_1) bool_t xdr_key_netstarg (XDR * xdrs, key_netstarg * objp) @@ -148,7 +148,7 @@ return FALSE; return TRUE; } -libc_hidden_nolink (xdr_key_netstarg, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_key_netstarg, GLIBC_2_0) bool_t xdr_key_netstres (XDR * xdrs, key_netstres * objp) @@ -166,4 +166,4 @@ } return TRUE; } -libc_hidden_nolink (xdr_key_netstres, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_key_netstres, GLIBC_2_0) --- a/sunrpc/netname.c +++ b/sunrpc/netname.c @@ -55,7 +55,7 @@ netname[i - 1] = '\0'; return 1; } -libc_hidden_nolink (user2netname, GLIBC_2_1) +libc_hidden_nolink_sunrpc (user2netname, GLIBC_2_1) int host2netname (char netname[MAXNETNAMELEN + 1], const char *host, @@ -119,7 +119,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (host2netname) #else -libc_hidden_nolink (host2netname, GLIBC_2_1) +libc_hidden_nolink_sunrpc (host2netname, GLIBC_2_1) #endif int @@ -135,7 +135,7 @@ dummy = user2netname (name, uid, NULL); return (dummy); } -libc_hidden_nolink (getnetname, GLIBC_2_1) +libc_hidden_nolink_sunrpc (getnetname, GLIBC_2_1) /* Type of the lookup function for netname2user. */ typedef int (*netname2user_function) (const char netname[MAXNETNAMELEN + 1], @@ -188,7 +188,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (netname2user) #else -libc_hidden_nolink (netname2user, GLIBC_2_1) +libc_hidden_nolink_sunrpc (netname2user, GLIBC_2_1) #endif int @@ -215,4 +215,4 @@ return 1; } -libc_hidden_nolink (netname2host, GLIBC_2_1) +libc_hidden_nolink_sunrpc (netname2host, GLIBC_2_1) --- a/sunrpc/pm_getmaps.c +++ b/sunrpc/pm_getmaps.c @@ -84,4 +84,4 @@ address->sin_port = 0; return head; } -libc_hidden_nolink (pmap_getmaps, GLIBC_2_0) +libc_hidden_nolink_sunrpc (pmap_getmaps, GLIBC_2_0) --- a/sunrpc/pm_getport.c +++ b/sunrpc/pm_getport.c @@ -142,7 +142,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (__libc_rpc_getport) #else -libc_hidden_nolink (__libc_rpc_getport, GLIBC_PRIVATE) +libc_hidden_nolink_sunrpc (__libc_rpc_getport, GLIBC_PRIVATE) #endif @@ -160,4 +160,4 @@ { return __libc_rpc_getport (address, program, version, protocol, 5, 60); } -libc_hidden_nolink (pmap_getport, GLIBC_2_0) +libc_hidden_nolink_sunrpc (pmap_getport, GLIBC_2_0) --- a/sunrpc/pmap_clnt.c +++ b/sunrpc/pmap_clnt.c @@ -131,7 +131,7 @@ /* (void)close(socket); CLNT_DESTROY closes it */ return rslt; } -libc_hidden_nolink (pmap_set, GLIBC_2_0) +libc_hidden_nolink_sunrpc (pmap_set, GLIBC_2_0) /* * Remove the mapping between program,version and port. @@ -162,4 +162,4 @@ /* (void)close(socket); CLNT_DESTROY already closed it */ return rslt; } -libc_hidden_nolink (pmap_unset, GLIBC_2_0) +libc_hidden_nolink_sunrpc (pmap_unset, GLIBC_2_0) --- a/sunrpc/pmap_prot.c +++ b/sunrpc/pmap_prot.c @@ -49,4 +49,4 @@ return xdr_u_long (xdrs, ®s->pm_port); return FALSE; } -libc_hidden_nolink (xdr_pmap, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_pmap, GLIBC_2_0) --- a/sunrpc/pmap_prot2.c +++ b/sunrpc/pmap_prot2.c @@ -110,4 +110,4 @@ rp = freeing ? &next : &((*rp)->pml_next); } } -libc_hidden_nolink (xdr_pmaplist, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_pmaplist, GLIBC_2_0) --- a/sunrpc/pmap_rmt.c +++ b/sunrpc/pmap_rmt.c @@ -104,7 +104,7 @@ addr->sin_port = 0; return stat; } -libc_hidden_nolink (pmap_rmtcall, GLIBC_2_0) +libc_hidden_nolink_sunrpc (pmap_rmtcall, GLIBC_2_0) /* @@ -137,7 +137,7 @@ } return FALSE; } -libc_hidden_nolink (xdr_rmtcall_args, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_rmtcall_args, GLIBC_2_0) /* * XDR remote call results @@ -160,7 +160,7 @@ } return FALSE; } -libc_hidden_nolink (xdr_rmtcallres, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_rmtcallres, GLIBC_2_0) /* @@ -388,4 +388,4 @@ AUTH_DESTROY (unix_auth); return stat; } -libc_hidden_nolink (clnt_broadcast, GLIBC_2_0) +libc_hidden_nolink_sunrpc (clnt_broadcast, GLIBC_2_0) --- a/sunrpc/publickey.c +++ b/sunrpc/publickey.c @@ -76,7 +76,7 @@ return status == NSS_STATUS_SUCCESS; } -libc_hidden_nolink (getpublickey, GLIBC_2_0) +libc_hidden_nolink_sunrpc (getpublickey, GLIBC_2_0) int @@ -119,4 +119,4 @@ return status == NSS_STATUS_SUCCESS; } -libc_hidden_nolink (getsecretkey, GLIBC_2_0) +libc_hidden_nolink_sunrpc (getsecretkey, GLIBC_2_0) --- a/sunrpc/rpc_cmsg.c +++ b/sunrpc/rpc_cmsg.c @@ -194,4 +194,4 @@ return xdr_opaque_auth (xdrs, &(cmsg->rm_call.cb_verf)); return FALSE; } -libc_hidden_nolink (xdr_callmsg, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_callmsg, GLIBC_2_0) --- a/sunrpc/rpc_common.c +++ b/sunrpc/rpc_common.c @@ -45,7 +45,7 @@ section but we cannot add const to the type because this isn't how the variable is declared. So we use the section attribute. */ struct opaque_auth _null_auth __attribute__ ((nocommon)); -libc_hidden_nolink (_null_auth, GLIBC_2_0) +libc_hidden_nolink_sunrpc (_null_auth, GLIBC_2_0) fd_set svc_fdset; struct rpc_createerr rpc_createerr; struct pollfd *svc_pollfd; --- a/sunrpc/rpc_dtable.c +++ b/sunrpc/rpc_dtable.c @@ -46,4 +46,4 @@ return size; } -libc_hidden_nolink (_rpc_dtablesize, GLIBC_2_0) +libc_hidden_nolink_sunrpc (_rpc_dtablesize, GLIBC_2_0) --- a/sunrpc/rpc_prot.c +++ b/sunrpc/rpc_prot.c @@ -57,7 +57,7 @@ &ap->oa_length, MAX_AUTH_BYTES); return FALSE; } -libc_hidden_nolink (xdr_opaque_auth, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_opaque_auth, GLIBC_2_0) /* * XDR a DES block @@ -67,7 +67,7 @@ { return xdr_opaque (xdrs, (caddr_t) blkp, sizeof (des_block)); } -libc_hidden_nolink (xdr_des_block, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_des_block, GLIBC_2_0) /* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */ @@ -95,7 +95,7 @@ } return TRUE; /* TRUE => open ended set of problems */ } -libc_hidden_nolink (xdr_accepted_reply, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_accepted_reply, GLIBC_2_0) /* * XDR the MSG_DENIED part of a reply message union @@ -118,7 +118,7 @@ } return FALSE; } -libc_hidden_nolink (xdr_rejected_reply, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_rejected_reply, GLIBC_2_0) static const struct xdr_discrim reply_dscrm[3] = { @@ -142,7 +142,7 @@ NULL_xdrproc_t); return FALSE; } -libc_hidden_nolink (xdr_replymsg, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_replymsg, GLIBC_2_0) /* @@ -167,7 +167,7 @@ return xdr_u_long (xdrs, &(cmsg->rm_call.cb_vers)); return FALSE; } -libc_hidden_nolink (xdr_callhdr, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_callhdr, GLIBC_2_0) /* ************************** Client utility routine ************* */ @@ -277,4 +277,4 @@ break; } } -libc_hidden_nolink (_seterr_reply, GLIBC_2_0) +libc_hidden_nolink_sunrpc (_seterr_reply, GLIBC_2_0) --- a/sunrpc/rpc_thread.c +++ b/sunrpc/rpc_thread.c @@ -97,7 +97,7 @@ return &svc_fdset; return &tvp->svc_fdset_s; } -libc_hidden_nolink (__rpc_thread_svc_fdset, GLIBC_2_2_3) +libc_hidden_nolink_sunrpc (__rpc_thread_svc_fdset, GLIBC_2_2_3) struct rpc_createerr * __rpc_thread_createerr (void) @@ -109,7 +109,7 @@ return &rpc_createerr; return &tvp->rpc_createerr_s; } -libc_hidden_nolink (__rpc_thread_createerr, GLIBC_2_2_3) +libc_hidden_nolink_sunrpc (__rpc_thread_createerr, GLIBC_2_2_3) struct pollfd ** __rpc_thread_svc_pollfd (void) @@ -124,7 +124,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (__rpc_thread_svc_pollfd) #else -libc_hidden_nolink (__rpc_thread_svc_pollfd, GLIBC_2_2_3) +libc_hidden_nolink_sunrpc (__rpc_thread_svc_pollfd, GLIBC_2_2_3) #endif int * @@ -140,7 +140,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (__rpc_thread_svc_max_pollfd) #else -libc_hidden_nolink (__rpc_thread_svc_max_pollfd, GLIBC_2_2_3) +libc_hidden_nolink_sunrpc (__rpc_thread_svc_max_pollfd, GLIBC_2_2_3) #endif #endif /* _RPC_THREAD_SAFE_ */ --- a/sunrpc/rtime.c +++ b/sunrpc/rtime.c @@ -140,4 +140,4 @@ timep->tv_usec = 0; return 0; } -libc_hidden_nolink (rtime, GLIBC_2_1) +libc_hidden_nolink_sunrpc (rtime, GLIBC_2_1) --- a/sunrpc/svc.c +++ b/sunrpc/svc.c @@ -115,7 +115,7 @@ POLLRDNORM | POLLRDBAND); } } -libc_hidden_nolink (xprt_register, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xprt_register, GLIBC_2_0) /* De-activate a transport handle. */ void @@ -139,7 +139,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xprt_unregister) #else -libc_hidden_nolink (xprt_unregister, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xprt_unregister, GLIBC_2_0) #endif @@ -218,7 +218,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svc_register) #else -libc_hidden_nolink (svc_register, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svc_register, GLIBC_2_0) #endif /* Remove a service program from the callout list. */ @@ -242,7 +242,7 @@ if (! svc_is_mapped (prog, vers)) pmap_unset (prog, vers); } -libc_hidden_nolink (svc_unregister, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svc_unregister, GLIBC_2_0) /* ******************* REPLY GENERATION ROUTINES ************ */ @@ -264,7 +264,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svc_sendreply) #else -libc_hidden_nolink (svc_sendreply, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svc_sendreply, GLIBC_2_0) #endif /* No procedure error reply */ @@ -282,7 +282,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svcerr_noproc) #else -libc_hidden_nolink (svcerr_noproc, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcerr_noproc, GLIBC_2_0) #endif /* Can't decode args error reply */ @@ -300,7 +300,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svcerr_decode) #else -libc_hidden_nolink (svcerr_decode, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcerr_decode, GLIBC_2_0) #endif /* Some system error */ @@ -318,7 +318,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svcerr_systemerr) #else -libc_hidden_nolink (svcerr_systemerr, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcerr_systemerr, GLIBC_2_0) #endif /* Authentication error reply */ @@ -333,7 +333,7 @@ rply.rjcted_rply.rj_why = why; SVC_REPLY (xprt, &rply); } -libc_hidden_nolink (svcerr_auth, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcerr_auth, GLIBC_2_0) /* Auth too weak error reply */ void @@ -341,7 +341,7 @@ { svcerr_auth (xprt, AUTH_TOOWEAK); } -libc_hidden_nolink (svcerr_weakauth, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcerr_weakauth, GLIBC_2_0) /* Program unavailable error reply */ void @@ -355,7 +355,7 @@ rply.acpted_rply.ar_stat = PROG_UNAVAIL; SVC_REPLY (xprt, &rply); } -libc_hidden_nolink (svcerr_noprog, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcerr_noprog, GLIBC_2_0) /* Program version mismatch error reply */ void @@ -372,7 +372,7 @@ rply.acpted_rply.ar_vers.high = high_vers; SVC_REPLY (xprt, &rply); } -libc_hidden_nolink (svcerr_progvers, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcerr_progvers, GLIBC_2_0) /* ******************* SERVER INPUT STUFF ******************* */ @@ -401,7 +401,7 @@ readfds.fds_bits[0] = rdfds; svc_getreqset (&readfds); } -libc_hidden_nolink (svc_getreq, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svc_getreq, GLIBC_2_0) void svc_getreqset (fd_set *readfds) @@ -420,7 +420,7 @@ for (mask = *maskp++; (bit = ffsl (mask)); mask ^= (1L << (bit - 1))) svc_getreq_common (sock + bit - 1); } -libc_hidden_nolink (svc_getreqset, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svc_getreqset, GLIBC_2_0) void svc_getreq_poll (struct pollfd *pfdp, int pollretval) @@ -449,7 +449,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svc_getreq_poll) #else -libc_hidden_nolink (svc_getreq_poll, GLIBC_2_2) +libc_hidden_nolink_sunrpc (svc_getreq_poll, GLIBC_2_2) #endif @@ -542,7 +542,7 @@ } while (stat == XPRT_MOREREQS); } -libc_hidden_nolink (svc_getreq_common, GLIBC_2_2) +libc_hidden_nolink_sunrpc (svc_getreq_common, GLIBC_2_2) #ifdef _RPC_THREAD_SAFE_ --- a/sunrpc/svc_auth.c +++ b/sunrpc/svc_auth.c @@ -105,7 +105,7 @@ return AUTH_REJECTEDCRED; } -libc_hidden_nolink (_authenticate, GLIBC_2_1) +libc_hidden_nolink_sunrpc (_authenticate, GLIBC_2_1) static enum auth_stat _svcauth_null (struct svc_req *rqst, struct rpc_msg *msg) --- a/sunrpc/svc_raw.c +++ b/sunrpc/svc_raw.c @@ -88,7 +88,7 @@ xdrmem_create (&srp->xdr_stream, srp->_raw_buf, UDPMSGSIZE, XDR_FREE); return &srp->server; } -libc_hidden_nolink (svcraw_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcraw_create, GLIBC_2_0) static enum xprt_stat svcraw_stat (SVCXPRT *xprt) --- a/sunrpc/svc_run.c +++ b/sunrpc/svc_run.c @@ -46,7 +46,7 @@ svc_pollfd = NULL; svc_max_pollfd = 0; } -libc_hidden_nolink (svc_exit, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svc_exit, GLIBC_2_0) void svc_run (void) @@ -104,5 +104,5 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svc_run) #else -libc_hidden_nolink (svc_run, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svc_run, GLIBC_2_0) #endif --- a/sunrpc/svc_tcp.c +++ b/sunrpc/svc_tcp.c @@ -187,7 +187,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svctcp_create) #else -libc_hidden_nolink (svctcp_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svctcp_create, GLIBC_2_0) #endif /* @@ -199,7 +199,7 @@ { return makefd_xprt (fd, sendsize, recvsize); } -libc_hidden_nolink (svcfd_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcfd_create, GLIBC_2_0) static SVCXPRT * internal_function --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -184,7 +184,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svcudp_bufcreate) #else -libc_hidden_nolink (svcudp_bufcreate, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcudp_bufcreate, GLIBC_2_0) #endif SVCXPRT * @@ -196,7 +196,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (svcudp_create) #else -libc_hidden_nolink (svcudp_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcudp_create, GLIBC_2_0) #endif static enum xprt_stat @@ -500,7 +500,7 @@ su->su_cache = (char *) uc; return 1; } -libc_hidden_nolink (svcudp_enablecache, GLIBC_2_0) +libc_hidden_nolink_sunrpc (svcudp_enablecache, GLIBC_2_0) /* --- a/sunrpc/svc_unix.c +++ b/sunrpc/svc_unix.c @@ -184,7 +184,7 @@ xprt_register (xprt); return xprt; } -libc_hidden_nolink (svcunix_create, GLIBC_2_1) +libc_hidden_nolink_sunrpc (svcunix_create, GLIBC_2_1) /* * Like svunix_create(), except the routine takes any *open* UNIX file @@ -195,7 +195,7 @@ { return makefd_xprt (fd, sendsize, recvsize); } -libc_hidden_nolink (svcunixfd_create, GLIBC_2_1) +libc_hidden_nolink_sunrpc (svcunixfd_create, GLIBC_2_1) static SVCXPRT * internal_function --- a/sunrpc/svcauth_des.c +++ b/sunrpc/svcauth_des.c @@ -583,7 +583,7 @@ groups[i] = cred->groups[i]; return 1; } -libc_hidden_nolink (authdes_getucred, GLIBC_2_1) +libc_hidden_nolink_sunrpc (authdes_getucred, GLIBC_2_1) static void internal_function --- a/sunrpc/xcrypt.c +++ b/sunrpc/xcrypt.c @@ -127,7 +127,7 @@ free (buf); return 1; } -libc_hidden_nolink (xencrypt, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xencrypt, GLIBC_2_0) /* * Decrypt secret key using passwd @@ -163,7 +163,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdecrypt) #else -libc_hidden_nolink (xdecrypt, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdecrypt, GLIBC_2_1) #endif /* --- a/sunrpc/xdr.c +++ b/sunrpc/xdr.c @@ -72,7 +72,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_free) #else -libc_hidden_nolink (xdr_free, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_free, GLIBC_2_0) #endif /* @@ -86,7 +86,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_void) #else -libc_hidden_nolink (xdr_void, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_void, GLIBC_2_0) #endif /* @@ -126,7 +126,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_int) #else -libc_hidden_nolink (xdr_int, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_int, GLIBC_2_0) #endif /* @@ -165,7 +165,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_u_int) #else -libc_hidden_nolink (xdr_u_int, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_u_int, GLIBC_2_0) #endif /* @@ -193,7 +193,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_long) #else -libc_hidden_nolink (xdr_long, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_long, GLIBC_2_0) #endif /* @@ -232,7 +232,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_u_long) #else -libc_hidden_nolink (xdr_u_long, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_u_long, GLIBC_2_0) #endif /* @@ -268,7 +268,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_hyper) #else -libc_hidden_nolink (xdr_hyper, GLIBC_2_1_1) +libc_hidden_nolink_sunrpc (xdr_hyper, GLIBC_2_1_1) #endif /* @@ -304,7 +304,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_u_hyper) #else -libc_hidden_nolink (xdr_u_hyper, GLIBC_2_1_1) +libc_hidden_nolink_sunrpc (xdr_u_hyper, GLIBC_2_1_1) #endif bool_t @@ -315,7 +315,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_longlong_t) #else -libc_hidden_nolink (xdr_longlong_t, GLIBC_2_1_1) +libc_hidden_nolink_sunrpc (xdr_longlong_t, GLIBC_2_1_1) #endif bool_t @@ -326,7 +326,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_u_longlong_t) #else -libc_hidden_nolink (xdr_u_longlong_t, GLIBC_2_1_1) +libc_hidden_nolink_sunrpc (xdr_u_longlong_t, GLIBC_2_1_1) #endif /* @@ -359,7 +359,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_short) #else -libc_hidden_nolink (xdr_short, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_short, GLIBC_2_0) #endif /* @@ -392,7 +392,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_u_short) #else -libc_hidden_nolink (xdr_u_short, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_u_short, GLIBC_2_0) #endif @@ -415,7 +415,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_char) #else -libc_hidden_nolink (xdr_char, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_char, GLIBC_2_0) #endif /* @@ -437,7 +437,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_u_char) #else -libc_hidden_nolink (xdr_u_char, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_u_char, GLIBC_2_0) #endif /* @@ -470,7 +470,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_bool) #else -libc_hidden_nolink (xdr_bool, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_bool, GLIBC_2_0) #endif /* @@ -525,7 +525,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_enum) #else -libc_hidden_nolink (xdr_enum, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_enum, GLIBC_2_0) #endif /* @@ -580,7 +580,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_opaque) #else -libc_hidden_nolink (xdr_opaque, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_opaque, GLIBC_2_0) #endif /* @@ -648,7 +648,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_bytes) #else -libc_hidden_nolink (xdr_bytes, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_bytes, GLIBC_2_0) #endif /* @@ -665,7 +665,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_netobj) #else -libc_hidden_nolink (xdr_netobj, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_netobj, GLIBC_2_0) #endif /* @@ -714,7 +714,7 @@ return ((dfault == NULL_xdrproc_t) ? FALSE : (*dfault) (xdrs, unp, LASTUNSIGNED)); } -libc_hidden_nolink (xdr_union, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_union, GLIBC_2_0) /* @@ -806,7 +806,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_string) #else -libc_hidden_nolink (xdr_string, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_string, GLIBC_2_0) #endif /* @@ -827,5 +827,5 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_wrapstring) #else -libc_hidden_nolink (xdr_wrapstring, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_wrapstring, GLIBC_2_0) #endif --- a/sunrpc/xdr_array.c +++ b/sunrpc/xdr_array.c @@ -127,7 +127,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_array) #else -libc_hidden_nolink (xdr_array, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_array, GLIBC_2_0) #endif /* @@ -162,4 +162,4 @@ } return TRUE; } -libc_hidden_nolink (xdr_vector, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_vector, GLIBC_2_0) --- a/sunrpc/xdr_float.c +++ b/sunrpc/xdr_float.c @@ -158,7 +158,7 @@ } return (FALSE); } -libc_hidden_nolink (xdr_float, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_float, GLIBC_2_0) /* * This routine works on Suns (Sky / 68000's) and Vaxen. @@ -300,4 +300,4 @@ } return (FALSE); } -libc_hidden_nolink (xdr_double, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_double, GLIBC_2_0) --- a/sunrpc/xdr_intXX_t.c +++ b/sunrpc/xdr_intXX_t.c @@ -47,14 +47,14 @@ return FALSE; } } -libc_hidden_nolink (xdr_int64_t, GLIBC_2_1_1) +libc_hidden_nolink_sunrpc (xdr_int64_t, GLIBC_2_1_1) bool_t xdr_quad_t (XDR *xdrs, quad_t *ip) { return xdr_int64_t (xdrs, (int64_t *) ip); } -libc_hidden_nolink (xdr_quad_t, GLIBC_2_3_4) +libc_hidden_nolink_sunrpc (xdr_quad_t, GLIBC_2_3_4) /* XDR 64bit unsigned integers */ bool_t @@ -83,14 +83,14 @@ return FALSE; } } -libc_hidden_nolink (xdr_uint64_t, GLIBC_2_1_1) +libc_hidden_nolink_sunrpc (xdr_uint64_t, GLIBC_2_1_1) bool_t xdr_u_quad_t (XDR *xdrs, u_quad_t *ip) { return xdr_uint64_t (xdrs, (uint64_t *) ip); } -libc_hidden_nolink (xdr_u_quad_t, GLIBC_2_3_4) +libc_hidden_nolink_sunrpc (xdr_u_quad_t, GLIBC_2_3_4) /* XDR 32bit integers */ bool_t @@ -108,7 +108,7 @@ return FALSE; } } -libc_hidden_nolink (xdr_int32_t, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_int32_t, GLIBC_2_1) /* XDR 32bit unsigned integers */ bool_t @@ -129,7 +129,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_uint32_t) #else -libc_hidden_nolink (xdr_uint32_t, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_uint32_t, GLIBC_2_1) #endif /* XDR 16bit integers */ @@ -154,7 +154,7 @@ return FALSE; } } -libc_hidden_nolink (xdr_int16_t, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_int16_t, GLIBC_2_1) /* XDR 16bit unsigned integers */ bool_t @@ -178,7 +178,7 @@ return FALSE; } } -libc_hidden_nolink (xdr_uint16_t, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_uint16_t, GLIBC_2_1) /* XDR 8bit integers */ bool_t @@ -202,7 +202,7 @@ return FALSE; } } -libc_hidden_nolink (xdr_int8_t, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_int8_t, GLIBC_2_1) /* XDR 8bit unsigned integers */ bool_t @@ -226,4 +226,4 @@ return FALSE; } } -libc_hidden_nolink (xdr_uint8_t, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_uint8_t, GLIBC_2_1) --- a/sunrpc/xdr_mem.c +++ b/sunrpc/xdr_mem.c @@ -81,7 +81,7 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdrmem_create) #else -libc_hidden_nolink (xdrmem_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdrmem_create, GLIBC_2_0) #endif /* --- a/sunrpc/xdr_rec.c +++ b/sunrpc/xdr_rec.c @@ -189,7 +189,7 @@ rstrm->fbtbc = 0; rstrm->last_frag = TRUE; } -libc_hidden_nolink (xdrrec_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdrrec_create, GLIBC_2_0) /* @@ -477,7 +477,7 @@ rstrm->last_frag = FALSE; return TRUE; } -libc_hidden_nolink (xdrrec_skiprecord, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdrrec_skiprecord, GLIBC_2_0) /* * Lookahead function. @@ -501,7 +501,7 @@ return TRUE; return FALSE; } -libc_hidden_nolink (xdrrec_eof, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdrrec_eof, GLIBC_2_0) /* * The client must tell the package when an end-of-record has occurred. @@ -528,7 +528,7 @@ rstrm->out_finger += BYTES_PER_XDR_UNIT; return TRUE; } -libc_hidden_nolink (xdrrec_endofrecord, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdrrec_endofrecord, GLIBC_2_0) /* --- a/sunrpc/xdr_ref.c +++ b/sunrpc/xdr_ref.c @@ -90,7 +90,7 @@ } return stat; } -libc_hidden_nolink (xdr_reference, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_reference, GLIBC_2_0) /* @@ -137,5 +137,5 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_pointer) #else -libc_hidden_nolink (xdr_pointer, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdr_pointer, GLIBC_2_0) #endif --- a/sunrpc/xdr_sizeof.c +++ b/sunrpc/xdr_sizeof.c @@ -161,5 +161,5 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdr_sizeof) #else -libc_hidden_nolink (xdr_sizeof, GLIBC_2_1) +libc_hidden_nolink_sunrpc (xdr_sizeof, GLIBC_2_1) #endif --- a/sunrpc/xdr_stdio.c +++ b/sunrpc/xdr_stdio.c @@ -191,5 +191,5 @@ #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (xdrstdio_create) #else -libc_hidden_nolink (xdrstdio_create, GLIBC_2_0) +libc_hidden_nolink_sunrpc (xdrstdio_create, GLIBC_2_0) #endif