6 files changed, 24 insertions, 11 deletions
diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c
index e36cd520f7..2d0535ff17 100644
--- a/stdio-common/_itoa.c
+++ b/stdio-common/_itoa.c
@@ -78,7 +78,7 @@ struct base_table_t
 
 
 /* Local variables.  */
-const struct base_table_t _itoa_base_table[] =
+const struct base_table_t _itoa_base_table[] attribute_hidden =
 {
 #if BITS_PER_MP_LIMB == 64
   /*  2 */ {SEL1(0ul) 1, 1},
@@ -158,8 +158,10 @@ const struct base_table_t _itoa_base_table[] =
 
 /* Lower-case digits.  */
 extern const char _itoa_lower_digits[];
+extern const char _itoa_lower_digits_internal[] attribute_hidden;
 /* Upper-case digits.  */
 extern const char _itoa_upper_digits[];
+extern const char _itoa_upper_digits_internal[] attribute_hidden;
 
 
 char *
@@ -169,7 +171,9 @@ _itoa (value, buflim, base, upper_case)
      unsigned int base;
      int upper_case;
 {
-  const char *digits = upper_case ? _itoa_upper_digits : _itoa_lower_digits;
+  const char *digits = (upper_case
+			? INTUSE(_itoa_upper_digits)
+			: INTUSE(_itoa_lower_digits));
   const struct base_table_t *brec = &_itoa_base_table[base - 2];
 
   switch (base)
diff --git a/stdio-common/_itoa.h b/stdio-common/_itoa.h
index 1b4b0ff6c4..42bc3400fa 100644
--- a/stdio-common/_itoa.h
+++ b/stdio-common/_itoa.h
@@ -29,12 +29,18 @@
 extern char *_itoa (unsigned long long int value, char *buflim,
 		    unsigned int base, int upper_case);
 
+extern const char _itoa_upper_digits[];
+extern const char _itoa_upper_digits_internal[] attribute_hidden;
+extern const char _itoa_lower_digits[];
+extern const char _itoa_lower_digits_internal[] attribute_hidden;
+
 static inline char * __attribute__ ((unused))
 _itoa_word (unsigned long value, char *buflim,
 	    unsigned int base, int upper_case)
 {
-  extern const char _itoa_upper_digits[], _itoa_lower_digits[];
-  const char *digits = upper_case ? _itoa_upper_digits : _itoa_lower_digits;
+  const char *digits = (upper_case
+			? INTUSE(_itoa_upper_digits)
+			: INTUSE(_itoa_lower_digits));
 
   switch (base)
     {
diff --git a/stdio-common/_itowa.c b/stdio-common/_itowa.c
index 20b474e049..b9cc341dd9 100644
--- a/stdio-common/_itowa.c
+++ b/stdio-common/_itowa.c
@@ -1,5 +1,5 @@
 /* Internal function for converting integers to ASCII.
-   Copyright (C) 1994, 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1994,1995,1996,1999,2000,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Torbjorn Granlund <tege@matematik.su.se>
    and Ulrich Drepper <drepper@gnu.org>.
@@ -77,12 +77,12 @@ struct base_table_t
 #endif
 
 /* Factor table for the different bases.  */
-extern const struct base_table_t _itoa_base_table[];
+extern const struct base_table_t _itoa_base_table[] attribute_hidden;
 
 /* Lower-case digits.  */
-extern const wchar_t _itowa_lower_digits[];
+extern const wchar_t _itowa_lower_digits[] attribute_hidden;
 /* Upper-case digits.  */
-extern const wchar_t _itowa_upper_digits[];
+extern const wchar_t _itowa_upper_digits[] attribute_hidden;
 
 
 wchar_t *
diff --git a/stdio-common/_itowa.h b/stdio-common/_itowa.h
index 0af747bb76..d3a5447304 100644
--- a/stdio-common/_itowa.h
+++ b/stdio-common/_itowa.h
@@ -35,7 +35,8 @@ __attribute__ ((unused))
 _itowa_word (unsigned long value, wchar_t *buflim,
 	     unsigned int base, int upper_case)
 {
-  extern const wchar_t _itowa_upper_digits[], _itowa_lower_digits[];
+  extern const wchar_t _itowa_upper_digits[] attribute_hidden;
+  extern const wchar_t _itowa_lower_digits[] attribute_hidden;
   const wchar_t *digits = (upper_case
 			   ? _itowa_upper_digits : _itowa_lower_digits);
   wchar_t *bp = buflim;
diff --git a/stdio-common/itoa-digits.c b/stdio-common/itoa-digits.c
index c4d252603c..cbdc09b105 100644
--- a/stdio-common/itoa-digits.c
+++ b/stdio-common/itoa-digits.c
@@ -1,5 +1,5 @@
 /* Digits.
-   Copyright (C) 1994, 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1994,1995,1996,1999,2000,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,3 +20,4 @@
 /* Lower-case digits.  */
 const char _itoa_lower_digits[36]
 	= "0123456789abcdefghijklmnopqrstuvwxyz";
+INTVARDEF(_itoa_lower_digits)
diff --git a/stdio-common/itoa-udigits.c b/stdio-common/itoa-udigits.c
index d89e439cce..0ed4dc119a 100644
--- a/stdio-common/itoa-udigits.c
+++ b/stdio-common/itoa-udigits.c
@@ -1,5 +1,5 @@
 /* Digits.
-   Copyright (C) 1994, 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1994,1995,1996,1999,2000,2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,3 +20,4 @@
 /* Upper-case digits.  */
 const char _itoa_upper_digits[36]
 	= "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+INTVARDEF(_itoa_upper_digits)