diff options
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | sysdeps/generic/glob.c | 4 | ||||
| -rw-r--r-- | sysdeps/gnu/glob64.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/glob.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/glob64.c | 2 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/glob.c | 2 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/strtol.c | 2 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/strtol_l.c | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/strtoul.c | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/strtoul_l.c | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstol.c | 4 | ||||
| -rw-r--r-- | sysdeps/wordsize-64/wcstoul.c | 1 |
12 files changed, 42 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index f1cd538f41..64272308d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2002-08-04 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/generic/glob.c (glob, globfree): Only use libc_hidden_def + if glob resp. globfree are not macros. + * sysdeps/gnu/glob64.c (globfree64): Add libc_hidden_def. + * sysdeps/unix/sysv/linux/alpha/glob.c (glob, globfree, globfree64): + Add libc_hidden_ver. + * sysdeps/unix/sysv/linux/i386/glob64.c (globfree64): Add + libc_hidden_def. + * sysdeps/wordsize-64/glob.c (globfree64): Use libc_hidden_ver + instead of libc_hidden_weak. + * sysdeps/wordsize-64/strtol.c (__strtoll_internal): Use + libc_hidden_ver instead of libc_hidden_def. + * sysdeps/wordsize-64/wcstol.c (__wcstoll_internal): Use + libc_hidden_ver instead of libc_hidden_def. + (wcstoll, wcstoq): Remove libc_hidden_weak. + * sysdeps/wordsize-64/strtol_l.c (____strtoll_l_internal): Add + libc_hidden_ver. + * sysdeps/wordsize-64/strtoul.c (__strtoull_internal): Add + libc_hidden_ver. + * sysdeps/wordsize-64/strtoul_l.c (____strtoull_l_internal): Add + libc_hidden_ver. + * sysdeps/wordsize-64/wcstoul.c (__wcstoull_internal): Add + libc_hidden_ver. + 2002-08-04 Ulrich Drepper <drepper@redhat.com> * stdio-common/psignal.c: Declare _sys_siglist_internal. Use USEINT diff --git a/sysdeps/generic/glob.c b/sysdeps/generic/glob.c index aca6e898a1..ce9c3d806f 100644 --- a/sysdeps/generic/glob.c +++ b/sysdeps/generic/glob.c @@ -1064,7 +1064,7 @@ glob (pattern, flags, errfunc, pglob) return 0; } -#ifdef _LIBC +#if defined _LIBC && !defined glob libc_hidden_def (glob) #endif @@ -1085,7 +1085,7 @@ globfree (pglob) free ((__ptr_t) pglob->gl_pathv); } } -#ifdef _LIBC +#if defined _LIBC && !defined globfree libc_hidden_def (globfree) #endif diff --git a/sysdeps/gnu/glob64.c b/sysdeps/gnu/glob64.c index 1862603f67..cb0161cd31 100644 --- a/sysdeps/gnu/glob64.c +++ b/sysdeps/gnu/glob64.c @@ -20,3 +20,5 @@ #define COMPILE_GLOB64 1 #include <sysdeps/generic/glob.c> + +libc_hidden_def (globfree64) diff --git a/sysdeps/unix/sysv/linux/alpha/glob.c b/sysdeps/unix/sysv/linux/alpha/glob.c index 9a52ae87e9..a51020d51f 100644 --- a/sysdeps/unix/sysv/linux/alpha/glob.c +++ b/sysdeps/unix/sysv/linux/alpha/glob.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 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 @@ -44,6 +44,9 @@ extern void __new_globfree (glob_t *__pglob); versioned_symbol (libc, __new_glob, glob, GLIBC_2_1); versioned_symbol (libc, __new_globfree, globfree, GLIBC_2_1); +libc_hidden_ver (__new_glob, glob) +libc_hidden_ver (__new_globfree, globfree) weak_alias (__new_glob, glob64) weak_alias (__new_globfree, globfree64) +libc_hidden_ver (__new_globfree, globfree64) diff --git a/sysdeps/unix/sysv/linux/i386/glob64.c b/sysdeps/unix/sysv/linux/i386/glob64.c index 5d2349d26b..3d2eb4bfe5 100644 --- a/sysdeps/unix/sysv/linux/i386/glob64.c +++ b/sysdeps/unix/sysv/linux/i386/glob64.c @@ -23,6 +23,8 @@ #include "shlib-compat.h" +libc_hidden_def (globfree64) + versioned_symbol (libc, __glob64, glob64, GLIBC_2_2); #if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2) diff --git a/sysdeps/wordsize-64/glob.c b/sysdeps/wordsize-64/glob.c index ad4d7a4a77..7ee2eb2727 100644 --- a/sysdeps/wordsize-64/glob.c +++ b/sysdeps/wordsize-64/glob.c @@ -5,4 +5,4 @@ #undef globfree64 weak_alias (glob, glob64) weak_alias (globfree, globfree64) -libc_hidden_weak (globfree64) +libc_hidden_ver (globfree, globfree64) diff --git a/sysdeps/wordsize-64/strtol.c b/sysdeps/wordsize-64/strtol.c index e6370150a4..ec07ea7261 100644 --- a/sysdeps/wordsize-64/strtol.c +++ b/sysdeps/wordsize-64/strtol.c @@ -9,6 +9,6 @@ #undef strtoll #undef strtoq strong_alias (__strtol_internal, __strtoll_internal) -libc_hidden_def (__strtoll_internal) +libc_hidden_ver (__strtol_internal, __strtoll_internal) weak_alias (strtol, strtoll) weak_alias (strtol, strtoq) diff --git a/sysdeps/wordsize-64/strtol_l.c b/sysdeps/wordsize-64/strtol_l.c index a3f519f46c..1ca48b9183 100644 --- a/sysdeps/wordsize-64/strtol_l.c +++ b/sysdeps/wordsize-64/strtol_l.c @@ -7,4 +7,5 @@ #undef ____strtoll_l_internal #undef __strtoll_l strong_alias (____strtol_l_internal, ____strtoll_l_internal) +libc_hidden_ver (____strtol_l_internal, ____strtoll_l_internal) weak_alias (__strtol_l, __strtoll_l) diff --git a/sysdeps/wordsize-64/strtoul.c b/sysdeps/wordsize-64/strtoul.c index 0e82c4c95f..ac3ca71116 100644 --- a/sysdeps/wordsize-64/strtoul.c +++ b/sysdeps/wordsize-64/strtoul.c @@ -9,5 +9,6 @@ #undef strtoull #undef strtouq strong_alias (__strtoul_internal, __strtoull_internal) +libc_hidden_ver (__strtoul_internal, __strtoull_internal) weak_alias (strtoul, strtoull) weak_alias (strtoul, strtouq) diff --git a/sysdeps/wordsize-64/strtoul_l.c b/sysdeps/wordsize-64/strtoul_l.c index a5908298a4..356a8df98f 100644 --- a/sysdeps/wordsize-64/strtoul_l.c +++ b/sysdeps/wordsize-64/strtoul_l.c @@ -7,4 +7,5 @@ #undef ____strtoull_l_internal #undef __strtoull_l strong_alias (____strtoul_l_internal, ____strtoull_l_internal) +libc_hidden_ver (____strtoul_l_internal, ____strtoull_l_internal) weak_alias (__strtoul_l, __strtoull_l) diff --git a/sysdeps/wordsize-64/wcstol.c b/sysdeps/wordsize-64/wcstol.c index 0aaa5f6ca9..96870cbd3c 100644 --- a/sysdeps/wordsize-64/wcstol.c +++ b/sysdeps/wordsize-64/wcstol.c @@ -9,8 +9,6 @@ #undef wcstoll #undef wcstoq strong_alias (__wcstol_internal, __wcstoll_internal) -libc_hidden_def (__wcstoll_internal) +libc_hidden_ver (__wcstol_internal, __wcstoll_internal) weak_alias (wcstol, wcstoll) -libc_hidden_weak (wcstoll) weak_alias (wcstol, wcstoq) -libc_hidden_weak (wcstoq) diff --git a/sysdeps/wordsize-64/wcstoul.c b/sysdeps/wordsize-64/wcstoul.c index a6c5fd9f52..b6f5d9ac07 100644 --- a/sysdeps/wordsize-64/wcstoul.c +++ b/sysdeps/wordsize-64/wcstoul.c @@ -9,5 +9,6 @@ #undef wcstoull #undef wcstouq strong_alias (__wcstoul_internal, __wcstoull_internal) +libc_hidden_ver (__wcstoul_internal, __wcstoull_internal) weak_alias (wcstoul, wcstoull) weak_alias (wcstoul, wcstouq) |