1 --- glibc-2.3.1-cygnus/ctype/ctype-info.c 28 Sep 2002 20:36:35 -0000 1.1.1.9
2 +++ glibc-2.3.1-redhat/ctype/ctype-info.c 29 Sep 2002 11:38:50 -0000 1.4
3 @@ -48,18 +48,32 @@ extern const char _nl_C_LC_CTYPE_class_a
5 #define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
7 +// const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
8 +// const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
9 +// const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128);
10 +// const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
11 +// const __uint32_t *__ctype32_tolower = b (__uint32_t, tolower, 128);
12 +// const __uint32_t *__ctype32_toupper = b (__uint32_t, toupper, 128);
14 +// compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
15 +// compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
16 +// compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
17 +// compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
18 +// compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
19 +// compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
23 +/* Temporarily exported until all .a libraries are recompiled. */
25 +#define b(t,x,o) (((const t *) _nl_C_LC_CTYPE_##x) + o)
26 +extern const char _nl_C_LC_CTYPE_class[] attribute_hidden;
27 +extern const char _nl_C_LC_CTYPE_class32[] attribute_hidden;
28 +extern const char _nl_C_LC_CTYPE_toupper[] attribute_hidden;
29 +extern const char _nl_C_LC_CTYPE_tolower[] attribute_hidden;
30 const unsigned short int *__ctype_b = b (unsigned short int, class, 128);
31 const __uint32_t *__ctype32_b = b (__uint32_t, class32, 0);
32 const __int32_t *__ctype_tolower = b (__int32_t, tolower, 128);
33 const __int32_t *__ctype_toupper = b (__int32_t, toupper, 128);
34 const __uint32_t *__ctype32_tolower = b (__uint32_t, tolower, 128);
35 const __uint32_t *__ctype32_toupper = b (__uint32_t, toupper, 128);
37 -compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
38 -compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
39 -compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
40 -compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
41 -compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
42 -compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
45 --- glibc-2.3.1-cygnus/locale/lc-ctype.c 28 Sep 2002 20:37:14 -0000 1.1.1.8
46 +++ glibc-2.3.1-redhat/locale/lc-ctype.c 29 Sep 2002 11:38:51 -0000 1.5
47 @@ -75,18 +75,32 @@ _nl_postload_ctype (void)
48 We need those relocations so that a versioned definition with a COPY
49 reloc in an executable will override the libc.so definition. */
51 -compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
52 -compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
53 -compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
54 -compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
55 -compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
56 -compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
57 +// compat_symbol (libc, __ctype_b, __ctype_b, GLIBC_2_0);
58 +// compat_symbol (libc, __ctype_tolower, __ctype_tolower, GLIBC_2_0);
59 +// compat_symbol (libc, __ctype_toupper, __ctype_toupper, GLIBC_2_0);
60 +// compat_symbol (libc, __ctype32_b, __ctype32_b, GLIBC_2_0);
61 +// compat_symbol (libc, __ctype32_tolower, __ctype32_tolower, GLIBC_2_2);
62 +// compat_symbol (libc, __ctype32_toupper, __ctype32_toupper, GLIBC_2_2);
64 +// __ctype_b = current (uint16_t, CLASS, 128);
65 +// __ctype_toupper = current (uint32_t, TOUPPER, 128);
66 +// __ctype_tolower = current (uint32_t, TOLOWER, 128);
67 +// __ctype32_b = current (uint32_t, CLASS32, 0);
68 +// __ctype32_toupper = current (uint32_t, TOUPPER32, 0);
69 +// __ctype32_tolower = current (uint32_t, TOLOWER32, 0);
73 + extern __const unsigned short int *__ctype_b; /* Characteristics. */
74 + extern __const __int32_t *__ctype_tolower; /* Case conversions. */
75 + extern __const __int32_t *__ctype_toupper; /* Case conversions. */
76 + extern const uint32_t *__ctype32_b;
77 + extern const uint32_t *__ctype32_toupper;
78 + extern const uint32_t *__ctype32_tolower;
79 __ctype_b = current (uint16_t, CLASS, 128);
80 __ctype_toupper = current (uint32_t, TOUPPER, 128);
81 __ctype_tolower = current (uint32_t, TOLOWER, 128);
82 __ctype32_b = current (uint32_t, CLASS32, 0);
83 __ctype32_toupper = current (uint32_t, TOUPPER32, 0);
84 __ctype32_tolower = current (uint32_t, TOLOWER32, 0);