From 8784cc18e1a30b445f5554237378001d8e8be11c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 5 Aug 2002 22:11:14 +0000 Subject: 2002-08-05 Jakub Jelinek * include/wchar.h (wcrtomb, wcscmp, wcsftime, wcsspn, wcschr, wcscoll, wcspbrk): Add libc_hidden_proto. * time/strftime.c (my_strftime): Add libc_hidden_def. (strftime): Remove libc_hidden_def. * wcsmbs/wcschr.c (wcschr): Add libc_hidden_def. * wcsmbs/wcspbrk.c (wcspbrk): Likewise. * wcsmbs/wcsspn.c (wcsspn): Likewise. * wcsmbs/wcscmp.c (wcscmp): Likewise. * wcsmbs/wcrtomb.c (wcrtomb): Add libc_hidden_weak. * wcsmbs/wcscoll.c (wcscoll): Likewise. * include/rpc/rpc.h (__rpc_thread_svc_max_pollfd, __rpc_thread_svc_pollfd, __rpc_thread_svc_fdset, __rpc_thread_createerr): Add libc_hidden_proto. * sunrpc/rpc_thread.c (__rpc_thread_svc_max_pollfd, __rpc_thread_svc_pollfd, __rpc_thread_svc_fdset, __rpc_thread_createerr): Add libc_hidden_def. * include/rpc/clnt.h (clnt_sperrno, clnt_spcreateerror, clnt_perror, clnt_sperror, _rpc_dtablesize): Add libc_hidden_proto. * sunrpc/clnt_perr.c (clnt_sperrno, clnt_spcreateerror, clnt_perror, clnt_sperror): Add libc_hidden_def. * sunrpc/rpc_dtable.c (_rpc_dtablesize): Likewise. * include/rpc/des_crypt.h (des_setparity, ecb_crypt, cbc_crypt): Add libc_hidden_proto. * sunrpc/des_crypt.c (ecb_crypt, cbc_crypt): Add libc_hidden_proto. * sunrpc/des_soft.c (des_setparity): Likewise. * include/rpc/auth.h (key_encryptsession_pk, key_decryptsession_pk): Add libc_hidden_proto. * sunrpc/key_call.c (key_encryptsession_pk, key_decryptsession_pk): Add libc_hidden_def. --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ elf/rtld.c | 2 +- include/rpc/auth.h | 3 +++ include/rpc/clnt.h | 6 ++++++ include/rpc/des_crypt.h | 4 ++++ include/rpc/rpc.h | 5 +++++ include/wchar.h | 7 +++++++ sunrpc/clnt_perr.c | 4 ++++ sunrpc/des_crypt.c | 3 ++- sunrpc/des_soft.c | 1 + sunrpc/key_call.c | 2 ++ sunrpc/rpc_dtable.c | 1 + sunrpc/rpc_thread.c | 5 +++++ time/strftime.c | 2 +- wcsmbs/wcrtomb.c | 1 + wcsmbs/wcschr.c | 1 + wcsmbs/wcscmp.c | 1 + wcsmbs/wcscoll.c | 1 + wcsmbs/wcspbrk.c | 1 + wcsmbs/wcsspn.c | 1 + 20 files changed, 84 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 704830a..3f384d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2002-08-05 Jakub Jelinek + + * include/wchar.h (wcrtomb, wcscmp, wcsftime, wcsspn, wcschr, wcscoll, + wcspbrk): Add libc_hidden_proto. + * time/strftime.c (my_strftime): Add libc_hidden_def. + (strftime): Remove libc_hidden_def. + * wcsmbs/wcschr.c (wcschr): Add libc_hidden_def. + * wcsmbs/wcspbrk.c (wcspbrk): Likewise. + * wcsmbs/wcsspn.c (wcsspn): Likewise. + * wcsmbs/wcscmp.c (wcscmp): Likewise. + * wcsmbs/wcrtomb.c (wcrtomb): Add libc_hidden_weak. + * wcsmbs/wcscoll.c (wcscoll): Likewise. + + * include/rpc/rpc.h (__rpc_thread_svc_max_pollfd, + __rpc_thread_svc_pollfd, __rpc_thread_svc_fdset, + __rpc_thread_createerr): Add libc_hidden_proto. + * sunrpc/rpc_thread.c (__rpc_thread_svc_max_pollfd, + __rpc_thread_svc_pollfd, __rpc_thread_svc_fdset, + __rpc_thread_createerr): Add libc_hidden_def. + + * include/rpc/clnt.h (clnt_sperrno, clnt_spcreateerror, + clnt_perror, clnt_sperror, _rpc_dtablesize): Add libc_hidden_proto. + * sunrpc/clnt_perr.c (clnt_sperrno, clnt_spcreateerror, + clnt_perror, clnt_sperror): Add libc_hidden_def. + * sunrpc/rpc_dtable.c (_rpc_dtablesize): Likewise. + + * include/rpc/des_crypt.h (des_setparity, ecb_crypt, cbc_crypt): Add + libc_hidden_proto. + * sunrpc/des_crypt.c (ecb_crypt, cbc_crypt): Add libc_hidden_proto. + * sunrpc/des_soft.c (des_setparity): Likewise. + + * include/rpc/auth.h (key_encryptsession_pk, key_decryptsession_pk): + Add libc_hidden_proto. + * sunrpc/key_call.c (key_encryptsession_pk, key_decryptsession_pk): + Add libc_hidden_def. + 2002-08-05 Roland McGrath * sysdeps/generic/ldsodefs.h (struct rtld_global): Replace member diff --git a/elf/rtld.c b/elf/rtld.c index a035a26..f59b8a7 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1094,7 +1094,7 @@ cannot allocate TLS data structures for initial thread"); /* Store for detection of the special case by __tls_get_addr so it knows not to pass this dtv to the normal realloc. */ - _dl_initial_dtv = GET_DTV (tcbp); + GL(dl_initial_dtv) = GET_DTV (tcbp); } #endif diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 9bfde83..a32f86d 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -28,4 +28,7 @@ extern AUTH *authdes_pk_create_internal (const char *, netobj *, u_int, struct sockaddr *, des_block *) attribute_hidden; +libc_hidden_proto (key_encryptsession_pk) +libc_hidden_proto (key_decryptsession_pk) + #endif diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 1384496..1e72e22 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -26,4 +26,10 @@ extern CLIENT *clntunix_create_internal (struct sockaddr_un *__raddr, int *__sockp, u_int __sendsz, u_int __recvsz) attribute_hidden; +libc_hidden_proto (clnt_sperrno) +libc_hidden_proto (clnt_spcreateerror) +libc_hidden_proto (clnt_perror) +libc_hidden_proto (clnt_sperror) +libc_hidden_proto (_rpc_dtablesize) + #endif diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h index 00ee921..8c4a60e 100644 --- a/include/rpc/des_crypt.h +++ b/include/rpc/des_crypt.h @@ -6,4 +6,8 @@ extern int xencrypt (char *secret, char *passwd); extern int xdecrypt (char *secret, char *passwd); +libc_hidden_proto (des_setparity) +libc_hidden_proto (ecb_crypt) +libc_hidden_proto (cbc_crypt) + #endif diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h index ee75167..392a55d 100644 --- a/include/rpc/rpc.h +++ b/include/rpc/rpc.h @@ -49,6 +49,11 @@ __libc_tsd_define (extern, RPC_VARS) #define RPC_THREAD_VARIABLE(x) (__rpc_thread_variables()->x) +libc_hidden_proto (__rpc_thread_svc_max_pollfd) +libc_hidden_proto (__rpc_thread_svc_pollfd) +libc_hidden_proto (__rpc_thread_svc_fdset) +libc_hidden_proto (__rpc_thread_createerr) + #endif /* _RPC_THREAD_SAFE_ */ #endif diff --git a/include/wchar.h b/include/wchar.h index cb63ed9..0a5c948 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -19,6 +19,13 @@ libc_hidden_proto (putwc_unlocked) libc_hidden_proto (vswscanf) +libc_hidden_proto (wcrtomb) +libc_hidden_proto (wcscmp) +libc_hidden_proto (wcsftime) +libc_hidden_proto (wcsspn) +libc_hidden_proto (wcschr) +libc_hidden_proto (wcscoll) +libc_hidden_proto (wcspbrk) /* Now define the internal interfaces. */ extern int __wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c index c20853f..ad96e4a 100644 --- a/sunrpc/clnt_perr.c +++ b/sunrpc/clnt_perr.c @@ -150,6 +150,7 @@ clnt_sperror (CLIENT * rpch, const char *msg) *++str = '\0'; return (strstart); } +libc_hidden_def (clnt_sperror) void clnt_perror (CLIENT * rpch, const char *msg) @@ -161,6 +162,7 @@ clnt_perror (CLIENT * rpch, const char *msg) #endif (void) fputs (clnt_sperror (rpch, msg), stderr); } +libc_hidden_def (clnt_perror) struct rpc_errtab @@ -282,6 +284,7 @@ clnt_sperrno (enum clnt_stat stat) } return _("RPC: (unknown error code)"); } +libc_hidden_def (clnt_sperrno) void clnt_perrno (enum clnt_stat num) @@ -329,6 +332,7 @@ clnt_spcreateerror (const char *msg) *++cp = '\0'; return str; } +libc_hidden_def (clnt_spcreateerror) void clnt_pcreateerror (const char *msg) diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c index 7a4bc5d..87389b4 100644 --- a/sunrpc/des_crypt.c +++ b/sunrpc/des_crypt.c @@ -105,7 +105,7 @@ cbc_crypt (char *key, char *buf, unsigned int len, unsigned int mode, COPY8 (dp.des_ivec, ivec); return err; } - +libc_hidden_def (cbc_crypt) /* * ECB mode encryption @@ -118,3 +118,4 @@ ecb_crypt (char *key, char *buf, unsigned int len, unsigned int mode) dp.des_mode = ECB; return common_crypt (key, buf, len, mode, &dp); } +libc_hidden_def (ecb_crypt) diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c index a7940b6..521d97c 100644 --- a/sunrpc/des_soft.c +++ b/sunrpc/des_soft.c @@ -68,3 +68,4 @@ des_setparity (char *p) p++; } } +libc_hidden_def (des_setparity) diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index 93117fd..e41e3fc 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -177,6 +177,7 @@ key_encryptsession_pk (char *remotename, netobj *remotekey, *deskey = res.cryptkeyres_u.deskey; return 0; } +libc_hidden_def (key_encryptsession_pk) int key_decryptsession_pk (char *remotename, netobj *remotekey, @@ -201,6 +202,7 @@ key_decryptsession_pk (char *remotename, netobj *remotekey, *deskey = res.cryptkeyres_u.deskey; return 0; } +libc_hidden_def (key_decryptsession_pk) int key_gendes (des_block *key) diff --git a/sunrpc/rpc_dtable.c b/sunrpc/rpc_dtable.c index b21f0ae..fbbb3c1 100644 --- a/sunrpc/rpc_dtable.c +++ b/sunrpc/rpc_dtable.c @@ -48,3 +48,4 @@ _rpc_dtablesize (void) return size; } +libc_hidden_def (_rpc_dtablesize) diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c index 312ca8c..df48c31 100644 --- a/sunrpc/rpc_thread.c +++ b/sunrpc/rpc_thread.c @@ -85,6 +85,7 @@ __rpc_thread_svc_fdset (void) return &svc_fdset; return &tvp->svc_fdset_s; } +libc_hidden_def (__rpc_thread_svc_fdset) struct rpc_createerr * __rpc_thread_createerr (void) @@ -96,6 +97,7 @@ __rpc_thread_createerr (void) return &rpc_createerr; return &tvp->rpc_createerr_s; } +libc_hidden_def (__rpc_thread_createerr) struct pollfd ** __rpc_thread_svc_pollfd (void) @@ -107,6 +109,7 @@ __rpc_thread_svc_pollfd (void) return &svc_pollfd; return &tvp->svc_pollfd_s; } +libc_hidden_def (__rpc_thread_svc_pollfd) int * __rpc_thread_svc_max_pollfd (void) @@ -118,4 +121,6 @@ __rpc_thread_svc_max_pollfd (void) return &svc_max_pollfd; return &tvp->svc_max_pollfd_s; } +libc_hidden_def (__rpc_thread_svc_max_pollfd) + #endif /* _RPC_THREAD_SAFE_ */ diff --git a/time/strftime.c b/time/strftime.c index 5f156e5..5ed47f6 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -1362,7 +1362,7 @@ my_strftime (s, maxsize, format, tp ut_argument) return i; } #ifdef _LIBC -libc_hidden_def (strftime) +libc_hidden_def (my_strftime) #endif diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index 53e119b..5dba73a 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -108,3 +108,4 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) return result; } weak_alias (__wcrtomb, wcrtomb) +libc_hidden_weak (wcrtomb) diff --git a/wcsmbs/wcschr.c b/wcsmbs/wcschr.c index 844accd..15b55d4 100644 --- a/wcsmbs/wcschr.c +++ b/wcsmbs/wcschr.c @@ -32,3 +32,4 @@ wcschr (wcs, wc) return NULL; } +libc_hidden_def (wcschr) diff --git a/wcsmbs/wcscmp.c b/wcsmbs/wcscmp.c index 662cc91..8241c67 100644 --- a/wcsmbs/wcscmp.c +++ b/wcsmbs/wcscmp.c @@ -41,3 +41,4 @@ wcscmp (s1, s2) return c1 - c2; } +libc_hidden_def (wcscmp) diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c index 50f31a9..40bd584 100644 --- a/wcsmbs/wcscoll.c +++ b/wcsmbs/wcscoll.c @@ -38,4 +38,5 @@ #ifndef USE_IN_EXTENDED_LOCALE_MODEL weak_alias (__wcscoll, wcscoll) +libc_hidden_weak (wcscoll) #endif diff --git a/wcsmbs/wcspbrk.c b/wcsmbs/wcspbrk.c index 6cb4d18..9dd0955 100644 --- a/wcsmbs/wcspbrk.c +++ b/wcsmbs/wcspbrk.c @@ -34,3 +34,4 @@ wcspbrk (wcs, accept) return NULL; } +libc_hidden_def (wcspbrk) diff --git a/wcsmbs/wcsspn.c b/wcsmbs/wcsspn.c index c496cfd..83e2026 100644 --- a/wcsmbs/wcsspn.c +++ b/wcsmbs/wcsspn.c @@ -44,3 +44,4 @@ wcsspn (wcs, accept) return count; } +libc_hidden_def (wcsspn) -- cgit v1.1