some global data relocs gone

18 files changed, 36 insertions, 16 deletions

diff --git a/libc/inet/getaddrinfo.c b/libc/inet/getaddrinfo.c
index 48cb3a19d..0aa86f1ab 100644
--- a/libc/inet/getaddrinfo.c
+++ b/libc/inet/getaddrinfo.c
@@ -85,6 +85,7 @@ libc_hidden_proto(inet_pton)
 libc_hidden_proto(inet_ntop)
 libc_hidden_proto(strtoul)
 libc_hidden_proto(if_nametoindex)
+libc_hidden_proto(__h_errno_location)
 /* libc_hidden_proto(uname) */
 #ifdef __UCLIBC_HAS_IPV6__
 libc_hidden_proto(in6addr_loopback)
diff --git a/libc/inet/herror.c b/libc/inet/herror.c
index cfcf0e23a..063f6e93e 100644
--- a/libc/inet/herror.c
+++ b/libc/inet/herror.c
@@ -24,6 +24,7 @@
 #include <netdb.h>
 
 libc_hidden_proto(fprintf)
+libc_hidden_proto(__h_errno_location)
 
 static const char *error_msg = "Resolver error";
 static const char *const h_errlist[] = {
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index 8be057aeb..7ebaaca2d 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -199,6 +199,7 @@ libc_hidden_proto(res_query)
 libc_hidden_proto(res_querydomain)
 libc_hidden_proto(gethostent_r)
 libc_hidden_proto(fprintf)
+libc_hidden_proto(__h_errno_location)
 
 #define MAX_RECURSE 5
 #define REPLY_TIMEOUT 10
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 50e5c4cc1..349e89f39 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -77,6 +77,7 @@ libc_hidden_proto(xdr_callhdr)
 libc_hidden_proto(xdr_replymsg)
 libc_hidden_proto(xdr_opaque_auth)
 libc_hidden_proto(xdrmem_create)
+libc_hidden_proto(xdr_void)
 libc_hidden_proto(pmap_getport)
 libc_hidden_proto(_seterr_reply)
 libc_hidden_proto(connect)
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index ee4dba6d0..82f994e51 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -76,6 +76,7 @@ libc_hidden_proto(xdr_callhdr)
 libc_hidden_proto(xdr_replymsg)
 libc_hidden_proto(xdr_opaque_auth)
 libc_hidden_proto(xdrmem_create)
+libc_hidden_proto(xdr_void)
 libc_hidden_proto(getegid)
 libc_hidden_proto(geteuid)
 libc_hidden_proto(_seterr_reply)
diff --git a/libc/inet/rpc/pmap_clnt.c b/libc/inet/rpc/pmap_clnt.c
index 03a1d3321..c4bce4f3b 100644
--- a/libc/inet/rpc/pmap_clnt.c
+++ b/libc/inet/rpc/pmap_clnt.c
@@ -56,6 +56,7 @@ libc_hidden_proto(exit)
 libc_hidden_proto(clnt_perror)
 libc_hidden_proto(clntudp_bufcreate)
 libc_hidden_proto(xdr_bool)
+libc_hidden_proto(xdr_pmap)
 
 /*
  * Same as get_myaddress, but we try to use the loopback
diff --git a/libc/inet/rpc/pmap_getmaps.c b/libc/inet/rpc/pmap_getmaps.c
index 1ea3052ab..79c30d94f 100644
--- a/libc/inet/rpc/pmap_getmaps.c
+++ b/libc/inet/rpc/pmap_getmaps.c
@@ -49,6 +49,9 @@ static char sccsid[] = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
 
 libc_hidden_proto(clnt_perror)
 libc_hidden_proto(clnttcp_create)
+libc_hidden_proto(xdr_pmap)
+libc_hidden_proto(xdr_pmaplist)
+libc_hidden_proto(xdr_void)
 
 /*
  * Get a copy of the current port maps.
diff --git a/libc/inet/rpc/pmap_getport.c b/libc/inet/rpc/pmap_getport.c
index b5e82924d..fe3ed82f8 100644
--- a/libc/inet/rpc/pmap_getport.c
+++ b/libc/inet/rpc/pmap_getport.c
@@ -45,6 +45,8 @@ static char sccsid[] = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
 
 libc_hidden_proto(clntudp_bufcreate)
 libc_hidden_proto(__rpc_thread_createerr)
+libc_hidden_proto(xdr_u_short)
+libc_hidden_proto(xdr_pmap)
 
 static const struct timeval timeout =
 {5, 0};
diff --git a/libc/inet/rpc/pmap_prot.c b/libc/inet/rpc/pmap_prot.c
index 29f142ffa..0ae2c88f3 100644
--- a/libc/inet/rpc/pmap_prot.c
+++ b/libc/inet/rpc/pmap_prot.c
@@ -44,6 +44,7 @@ static char sccsid[] = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
 
 libc_hidden_proto(xdr_u_long)
 
+libc_hidden_proto(xdr_pmap)
 bool_t
 xdr_pmap (xdrs, regs)
      XDR *xdrs;
@@ -56,3 +57,4 @@ xdr_pmap (xdrs, regs)
     return xdr_u_long (xdrs, &regs->pm_port);
   return FALSE;
 }
+libc_hidden_def(xdr_pmap)
diff --git a/libc/inet/rpc/pmap_prot2.c b/libc/inet/rpc/pmap_prot2.c
index 187b19e8c..5adc4ee2e 100644
--- a/libc/inet/rpc/pmap_prot2.c
+++ b/libc/inet/rpc/pmap_prot2.c
@@ -44,6 +44,7 @@ static char sccsid[] = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
 
 libc_hidden_proto(xdr_bool)
 libc_hidden_proto(xdr_reference)
+libc_hidden_proto(xdr_pmap)
 
 /*
  * What is going on with linked lists? (!)
@@ -83,6 +84,7 @@ libc_hidden_proto(xdr_reference)
  * the net, yet is the data that the pointer points to which is interesting;
  * this sounds like a job for xdr_reference!
  */
+libc_hidden_proto(xdr_pmaplist)
 bool_t
 xdr_pmaplist (xdrs, rp)
      XDR *xdrs;
@@ -118,3 +120,4 @@ xdr_pmaplist (xdrs, rp)
       rp = freeing ? next : &((*rp)->pml_next);
     }
 }
+libc_hidden_def(xdr_pmaplist)
diff --git a/libc/inet/rpc/pmap_rmt.c b/libc/inet/rpc/pmap_rmt.c
index 1a6286ba3..97e6be4b4 100644
--- a/libc/inet/rpc/pmap_rmt.c
+++ b/libc/inet/rpc/pmap_rmt.c
@@ -70,6 +70,8 @@ libc_hidden_proto(xdr_callmsg)
 libc_hidden_proto(xdr_replymsg)
 libc_hidden_proto(xdr_reference)
 libc_hidden_proto(xdr_u_long)
+libc_hidden_proto(xdr_void)
+libc_hidden_proto(xdr_rmtcallres)
 libc_hidden_proto(inet_makeaddr)
 libc_hidden_proto(inet_netof)
 libc_hidden_proto(clntudp_create)
@@ -185,6 +187,7 @@ xdr_rmtcallres (xdrs, crp)
     }
   return FALSE;
 }
+libc_hidden_def(xdr_rmtcallres)
 
 
 /*
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index 4bdc8b3bc..a34110cee 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -101,6 +101,7 @@ libc_hidden_proto(__fgetc_unlocked)
 libc_hidden_proto(fopen)
 libc_hidden_proto(fclose)
 libc_hidden_proto(fprintf)
+libc_hidden_proto(__h_errno_location)
 
 libc_hidden_proto(rresvport)
 
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index 7657bb7f9..37637f485 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -67,6 +67,7 @@ libc_hidden_proto(svc_register)
 libc_hidden_proto(svcerr_decode)
 libc_hidden_proto(svcudp_create)
 libc_hidden_proto(pmap_unset)
+libc_hidden_proto(xdr_void)
 
 struct proglst_
   {
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index 9a7569eee..54778935c 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -88,11 +88,13 @@ xdr_free (xdrproc_t proc, char *objp)
 /*
  * XDR nothing
  */
+libc_hidden_proto(xdr_void)
 bool_t
 xdr_void (void)
 {
   return TRUE;
 }
+libc_hidden_def(xdr_void)
 
 /*
  * XDR long integers
@@ -342,6 +344,7 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
 /*
  * XDR unsigned short integers
  */
+libc_hidden_proto(xdr_u_short)
 bool_t
 xdr_u_short (XDR *xdrs, u_short *usp)
 {
@@ -366,6 +369,7 @@ xdr_u_short (XDR *xdrs, u_short *usp)
     }
   return FALSE;
 }
+libc_hidden_def(xdr_u_short)
 
 
 /*
diff --git a/libc/misc/error/error.c b/libc/misc/error/error.c
index 1c2585345..96c5dbe71 100644
--- a/libc/misc/error/error.c
+++ b/libc/misc/error/error.c
@@ -26,7 +26,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include "error.h"
+#include <error.h>
 
 libc_hidden_proto(strcmp)
 libc_hidden_proto(strerror)
diff --git a/libc/misc/internals/__h_errno_location.c b/libc/misc/internals/__h_errno_location.c
index f4f598057..a57478ca9 100644
--- a/libc/misc/internals/__h_errno_location.c
+++ b/libc/misc/internals/__h_errno_location.c
@@ -3,8 +3,9 @@
 #include <netdb.h>
 #undef h_errno
 
+libc_hidden_proto(__h_errno_location)
 int * weak_const_function __h_errno_location (void)
 {
     return &h_errno;
 }
-
+libc_hidden_def(__h_errno_location)
diff --git a/libc/misc/wctype/wctype.c b/libc/misc/wctype/wctype.c
index f9feb3822..ad52cd3e7 100644
--- a/libc/misc/wctype/wctype.c
+++ b/libc/misc/wctype/wctype.c
@@ -39,6 +39,8 @@
 #include <bits/uClibc_uwchar.h>
 
 libc_hidden_proto(strcmp)
+libc_hidden_proto(tolower)
+libc_hidden_proto(toupper)
 libc_hidden_proto(towlower)
 libc_hidden_proto(towupper)
 libc_hidden_proto(towctrans)
@@ -372,14 +374,12 @@ wint_t TOWLOWER(wint_t wc)
 #endif /* SMALL_UPLOW */
 
 #ifdef L_towlower_l
-//libc_hidden_proto(towlower_l)
 libc_hidden_def(towlower_l)
 #endif /* L_towlower_l */
 
 #endif /* __LOCALE_C_ONLY */
 
 #ifndef L_towlower_l
-//libc_hidden_proto(towlower)
 libc_hidden_def(towlower)
 #endif
 
@@ -482,14 +482,12 @@ wint_t TOWUPPER(wint_t wc)
 #endif /* SMALL_UPLOW */
 
 #ifdef L_towupper_l
-//libc_hidden_proto(towupper_l)
 libc_hidden_def(towupper_l)
 #endif /* L_towupper_l */
 
 #endif /* __LOCALE_C_ONLY */
 
 #ifndef L_towupper_l
-//libc_hidden_proto(towupper)
 libc_hidden_def(towupper)
 #endif
 
@@ -715,14 +713,12 @@ int ISWCTYPE(wint_t wc, wctype_t desc)
 #endif /* defined(L_iswctype) && defined(__UCLIBC_HAS_XLOCALE__) */
 
 #ifdef L_iswctype_l
-//libc_hidden_proto(iswctype_l)
 libc_hidden_def(iswctype_l)
 #endif /* L_iswctype_l */
 
 #endif /* __LOCALE_C_ONLY */
 
 #ifdef L_iswctype
-//libc_hidden_proto(iswctype)
 libc_hidden_def(iswctype)
 #endif /* L_iswctype */
 
@@ -890,14 +886,12 @@ wint_t TOWCTRANS(wint_t wc, wctrans_t desc)
 #endif /* defined(L_towctrans) && defined(__UCLIBC_HAS_XLOCALE__) */
 
 #ifdef L_towctrans_l
-//libc_hidden_proto(towctrans_l)
 libc_hidden_def(towctrans_l)
 #endif /* L_towctrans_l */
 
 #endif /* __LOCALE_C_ONLY */
 
 #ifndef L_towctrans_l
-//libc_hidden_proto(towctrans)
 libc_hidden_def(towctrans)
 #endif
 
diff --git a/libc/stdio/vfprintf.c b/libc/stdio/vfprintf.c
index f02eae02b..d467b8297 100644
--- a/libc/stdio/vfprintf.c
+++ b/libc/stdio/vfprintf.c
@@ -227,9 +227,9 @@ libc_hidden_proto(fputws)
 	(__PA_FLAG_CHAR|PA_FLAG_SHORT|__PA_FLAG_INT|PA_FLAG_LONG|PA_FLAG_LONG_LONG)
 
 #ifdef __UCLIBC_HAS_GLIBC_CUSTOM_PRINTF__
-extern printf_function _custom_printf_handler[MAX_USER_SPEC];
-extern printf_arginfo_function *_custom_printf_arginfo[MAX_USER_SPEC];
-extern char *_custom_printf_spec;
+extern printf_function _custom_printf_handler[MAX_USER_SPEC] attribute_hidden;
+extern printf_arginfo_function *_custom_printf_arginfo[MAX_USER_SPEC] attribute_hidden;
+extern char *_custom_printf_spec attribute_hidden;
 #endif /* __UCLIBC_HAS_GLIBC_CUSTOM_PRINTF__ */
 
 /**********************************************************************/
@@ -831,9 +831,9 @@ static int _is_equal_or_bigger_arg(int curtype, int newtype)
 /* TODO - do this differently? */
 static char _bss_custom_printf_spec[MAX_USER_SPEC]; /* 0-init'd for us.  */
 
-char *_custom_printf_spec = _bss_custom_printf_spec;
-printf_arginfo_function *_custom_printf_arginfo[MAX_USER_SPEC];
-printf_function _custom_printf_handler[MAX_USER_SPEC];
+attribute_hidden char *_custom_printf_spec = _bss_custom_printf_spec;
+attribute_hidden printf_arginfo_function *_custom_printf_arginfo[MAX_USER_SPEC];
+attribute_hidden printf_function _custom_printf_handler[MAX_USER_SPEC];
 #endif /* __UCLIBC_HAS_GLIBC_CUSTOM_PRINTF__ */
 
 int attribute_hidden _ppfs_parsespec(ppfs_t *ppfs)