aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-05 21:22:05 +0000
committerRoland McGrath <roland@gnu.org>2002-09-05 21:22:05 +0000
commit6e606fad8da37fb175205244c794c5aae58ffda1 (patch)
tree87522d73780fe906b97478910a5db5bb15ad1f5b /locale
parent51387e0b86b1ebb066206e0fdbd3dc3c0afec236 (diff)
downloadglibc-6e606fad8da37fb175205244c794c5aae58ffda1.zip
glibc-6e606fad8da37fb175205244c794c5aae58ffda1.tar.gz
glibc-6e606fad8da37fb175205244c794c5aae58ffda1.tar.bz2
* ctype/ctype-info.c: Renamed __ctype_old_* symbols to __ctype_*.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise.
Diffstat (limited to 'locale')
-rw-r--r--locale/lc-ctype.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/locale/lc-ctype.c b/locale/lc-ctype.c
index 3011f4e..ad815df 100644
--- a/locale/lc-ctype.c
+++ b/locale/lc-ctype.c
@@ -54,19 +54,22 @@ _nl_postload_ctype (void)
#include <shlib-compat.h>
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3)
- extern __const unsigned short int *__ctype_old_b; /* Characteristics. */
- extern __const __int32_t *__ctype_old_tolower; /* Case conversions. */
- extern __const __int32_t *__ctype_old_toupper; /* Case conversions. */
+ /* We must use the exported names to access these so we are sure to
+ be accessing the main executable's copy if it has COPY relocs. */
- extern const uint32_t *__ctype32_old_b;
- extern const uint32_t *__ctype32_old_toupper;
- extern const uint32_t *__ctype32_old_tolower;
+ extern __const unsigned short int *__ctype_b; /* Characteristics. */
+ extern __const __int32_t *__ctype_tolower; /* Case conversions. */
+ extern __const __int32_t *__ctype_toupper; /* Case conversions. */
- __ctype_old_b = current (uint16_t, CLASS, 128);
- __ctype_old_toupper = current (uint32_t, TOUPPER, 128);
- __ctype_old_tolower = current (uint32_t, TOLOWER, 128);
- __ctype32_old_b = current (uint32_t, CLASS32, 0);
- __ctype32_old_toupper = current (uint32_t, TOUPPER32, 0);
- __ctype32_old_tolower = current (uint32_t, TOLOWER32, 0);
+ extern const uint32_t *__ctype32_b;
+ extern const uint32_t *__ctype32_toupper;
+ extern const uint32_t *__ctype32_tolower;
+
+ __ctype_b = current (uint16_t, CLASS, 128);
+ __ctype_toupper = current (uint32_t, TOUPPER, 128);
+ __ctype_tolower = current (uint32_t, TOLOWER, 128);
+ __ctype32_b = current (uint32_t, CLASS32, 0);
+ __ctype32_toupper = current (uint32_t, TOUPPER32, 0);
+ __ctype32_tolower = current (uint32_t, TOLOWER32, 0);
#endif
}