From e97ed6ddbe0d53d616d93669826db225b12c3235 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 14 Feb 2013 13:12:02 +0000 Subject: [PATCH] Remove bp-sym.h and BP_SYM uses from C code. --- ChangeLog | 87 ++++++++++++++++++++ csu/libc-start.c | 3 +- elf/dl-open.c | 3 +- math/fegetenv.c | 5 +- nptl/sysdeps/pthread/bits/libc-lockP.h | 45 +++++----- ports/ChangeLog.alpha | 6 ++ ports/ChangeLog.powerpc | 16 ++++ ports/sysdeps/alpha/memchr.c | 3 +- ports/sysdeps/powerpc/nofpu/fegetenv.c | 5 +- ports/sysdeps/powerpc/nofpu/fesetenv.c | 5 +- ports/sysdeps/powerpc/nofpu/feupdateenv.c | 5 +- ports/sysdeps/powerpc/nofpu/fgetexcptflg.c | 5 +- ports/sysdeps/powerpc/nofpu/fraiseexcpt.c | 5 +- ports/sysdeps/powerpc/nofpu/fsetexcptflg.c | 5 +- string/memchr.c | 7 +- sysdeps/i386/fpu/fegetenv.c | 5 +- sysdeps/i386/fpu/fesetenv.c | 5 +- sysdeps/i386/fpu/feupdateenv.c | 5 +- sysdeps/i386/fpu/fsetexcptflg.c | 5 +- sysdeps/posix/open64.c | 7 +- sysdeps/powerpc/fpu/fegetenv.c | 5 +- sysdeps/powerpc/fpu/fesetenv.c | 5 +- sysdeps/powerpc/fpu/feupdateenv.c | 5 +- sysdeps/powerpc/fpu/fgetexcptflg.c | 5 +- sysdeps/powerpc/fpu/fraiseexcpt.c | 5 +- sysdeps/powerpc/fpu/fsetexcptflg.c | 5 +- sysdeps/unix/sysv/linux/powerpc/libc-start.c | 15 ++-- 27 files changed, 178 insertions(+), 99 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2aabecfd72..d28d4179d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,90 @@ +2013-02-14 Joseph Myers + + [BZ #13550] + * csu/libc-start.c: Do not include . + [!LIBC_START_MAIN] (LIBC_START_MAIN): Do not use BP_SYM. + * elf/dl-open.c: Do not include . + (_dl_sysdep_start): Do not use BP_SYM in weak_extern. + * math/fegetenv.c: Do not include . + (fegetenv): Do not use BP_SYM in versioned symbols. + * nptl/sysdeps/pthread/bits/libc-lockP.h + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern]: Do not include + . + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutex_init): Do not use BP_SYM in weak_extern. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutex_destroy): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutex_lock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutex_trylock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutex_unlock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutexattr_init): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutexattr_destroy): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_mutexattr_settype): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_rwlock_init): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_rwlock_destroy): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_rwlock_rdlock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_rwlock_tryrdlock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_rwlock_wrlock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_rwlock_trywrlock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_rwlock_unlock): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_key_create): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_setspecific): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (__pthread_getspecific): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] (__pthread_once): + Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (_pthread_cleanup_push_defer): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (_pthread_cleanup_pop_restore): Likewise. + [!__NO_WEAK_PTHREAD_ALIASES && weak_extern] + (pthread_setcancelstate): Likewise. + * string/memchr.c [HAVE_BP_SYM_H || _LIBC]: Do not include + . + [!(HAVE_BP_SYM_H || _LIBC)] (BP_SYM): Remove macro definition. + (memchr): Do not use BP_SYM in weak_alias. + * sysdeps/i386/fpu/fegetenv.c: Do not include . + (fegetenv): Do not use BP_SYM in versioned symbols. + * sysdeps/i386/fpu/fesetenv.c: Do not include . + (fesetenv): Do not use BP_SYM in versioned symbols. + * sysdeps/i386/fpu/feupdateenv.c: Do not include . + (feupdateenv): Do not use BP_SYM in versioned symbols. + * sysdeps/i386/fpu/fsetexcptflg.c: Do not include . + (fesetexceptflag): Do not use BP_SYM in versioned symbols. + * sysdeps/posix/open64.c: Do not include . + (__open64): Do not use BP_SYM in weak_alias and libc_hidden_weak. + (open64): Do not use BP_SYM in weak_alias. + * sysdeps/powerpc/fpu/fegetenv.c: Do not include . + (fegetenv): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/fpu/fesetenv.c: Do not include . + (fesetenv): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/fpu/feupdateenv.c: Do not include . + (feupdateenv): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/fpu/fgetexcptflg.c: Do not include . + (fegetexceptflag): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/fpu/fraiseexcpt.c: Do not include . + (feraiseexcept): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/fpu/fsetexcptflg.c: Do not include . + (fesetexceptflag): Do not use BP_SYM in versioned symbols. + * sysdeps/unix/sysv/linux/powerpc/libc-start.c: Do not include + . + (__libc_start_main): Do not use BP_SYM. + 2013-02-14 Siddhesh Poyarekar * sysdeps/powerpc/powerpc32/power4/fpu/mpa.c (__cpy): Remove diff --git a/csu/libc-start.c b/csu/libc-start.c index 4f2a3366a6..9c4c01d9fd 100644 --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -19,7 +19,6 @@ #include #include #include -#include extern void __libc_init_first (int argc, char **argv, char **envp); #ifndef SHARED @@ -86,7 +85,7 @@ apply_irel (void) # endif #else # define STATIC -# define LIBC_START_MAIN BP_SYM (__libc_start_main) +# define LIBC_START_MAIN __libc_start_main #endif #ifdef MAIN_AUXVEC_ARG diff --git a/elf/dl-open.c b/elf/dl-open.c index 385a6c1f35..67f7e739bd 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -43,7 +42,7 @@ extern ElfW(Addr) _dl_sysdep_start (void **start_argptr, ElfW(Word) phnum, ElfW(Addr) *user_entry, ElfW(auxv_t) *auxv)); -weak_extern (BP_SYM (_dl_sysdep_start)) +weak_extern (_dl_sysdep_start) extern int __libc_multiple_libcs; /* Defined in init-first.c. */ diff --git a/math/fegetenv.c b/math/fegetenv.c index fe08edaa78..14bb801237 100644 --- a/math/fegetenv.c +++ b/math/fegetenv.c @@ -19,7 +19,6 @@ #include #include -#include int __fegetenv (fenv_t *envp) @@ -29,9 +28,9 @@ __fegetenv (fenv_t *envp) } #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fegetenv, __old_fegetenv) -compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1); +compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1); #endif libm_hidden_ver (__fegetenv, fegetenv) -versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2); +versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2); stub_warning (fegetenv) diff --git a/nptl/sysdeps/pthread/bits/libc-lockP.h b/nptl/sysdeps/pthread/bits/libc-lockP.h index 31a40aa982..2781e191ec 100644 --- a/nptl/sysdeps/pthread/bits/libc-lockP.h +++ b/nptl/sysdeps/pthread/bits/libc-lockP.h @@ -375,31 +375,30 @@ extern int __pthread_atfork (void (*__prepare) (void), single-threaded processes. */ #ifndef __NO_WEAK_PTHREAD_ALIASES # ifdef weak_extern -# include -weak_extern (BP_SYM (__pthread_mutex_init)) -weak_extern (BP_SYM (__pthread_mutex_destroy)) -weak_extern (BP_SYM (__pthread_mutex_lock)) -weak_extern (BP_SYM (__pthread_mutex_trylock)) -weak_extern (BP_SYM (__pthread_mutex_unlock)) -weak_extern (BP_SYM (__pthread_mutexattr_init)) -weak_extern (BP_SYM (__pthread_mutexattr_destroy)) -weak_extern (BP_SYM (__pthread_mutexattr_settype)) -weak_extern (BP_SYM (__pthread_rwlock_init)) -weak_extern (BP_SYM (__pthread_rwlock_destroy)) -weak_extern (BP_SYM (__pthread_rwlock_rdlock)) -weak_extern (BP_SYM (__pthread_rwlock_tryrdlock)) -weak_extern (BP_SYM (__pthread_rwlock_wrlock)) -weak_extern (BP_SYM (__pthread_rwlock_trywrlock)) -weak_extern (BP_SYM (__pthread_rwlock_unlock)) -weak_extern (BP_SYM (__pthread_key_create)) -weak_extern (BP_SYM (__pthread_setspecific)) -weak_extern (BP_SYM (__pthread_getspecific)) -weak_extern (BP_SYM (__pthread_once)) +weak_extern (__pthread_mutex_init) +weak_extern (__pthread_mutex_destroy) +weak_extern (__pthread_mutex_lock) +weak_extern (__pthread_mutex_trylock) +weak_extern (__pthread_mutex_unlock) +weak_extern (__pthread_mutexattr_init) +weak_extern (__pthread_mutexattr_destroy) +weak_extern (__pthread_mutexattr_settype) +weak_extern (__pthread_rwlock_init) +weak_extern (__pthread_rwlock_destroy) +weak_extern (__pthread_rwlock_rdlock) +weak_extern (__pthread_rwlock_tryrdlock) +weak_extern (__pthread_rwlock_wrlock) +weak_extern (__pthread_rwlock_trywrlock) +weak_extern (__pthread_rwlock_unlock) +weak_extern (__pthread_key_create) +weak_extern (__pthread_setspecific) +weak_extern (__pthread_getspecific) +weak_extern (__pthread_once) weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) -weak_extern (BP_SYM (_pthread_cleanup_push_defer)) -weak_extern (BP_SYM (_pthread_cleanup_pop_restore)) -weak_extern (BP_SYM (pthread_setcancelstate)) +weak_extern (_pthread_cleanup_push_defer) +weak_extern (_pthread_cleanup_pop_restore) +weak_extern (pthread_setcancelstate) # else # pragma weak __pthread_mutex_init # pragma weak __pthread_mutex_destroy diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha index 352a76e48d..991c36aea2 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,9 @@ +2013-02-14 Joseph Myers + + [BZ #13550] + * sysdeps/alpha/memchr.c: Do not include . + (memchr): Do not use BP_SYM in weak_alias. + 2013-02-13 Joseph Myers [BZ #13550] diff --git a/ports/ChangeLog.powerpc b/ports/ChangeLog.powerpc index 2746f37669..ecac527439 100644 --- a/ports/ChangeLog.powerpc +++ b/ports/ChangeLog.powerpc @@ -1,3 +1,19 @@ +2013-02-14 Joseph Myers + + [BZ #13550] + * sysdeps/powerpc/nofpu/fegetenv.c: Do not include . + (fegetenv): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/nofpu/fesetenv.c: Do not include . + (fesetenv): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/nofpu/feupdateenv.c: Do not include . + (feupdateenv): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/nofpu/fgetexcptflg.c: Do not include . + (fegetexceptflag): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/nofpu/fraiseexcpt.c: Do not include . + (feraiseexcept): Do not use BP_SYM in versioned symbols. + * sysdeps/powerpc/nofpu/fsetexcptflg.c: Do not include . + (fesetexceptflag): Do not use BP_SYM in versioned symbols. + 2013-01-02 Joseph Myers * All files with FSF copyright notices: Update copyright dates diff --git a/ports/sysdeps/alpha/memchr.c b/ports/sysdeps/alpha/memchr.c index 70416d5575..67f718a50e 100644 --- a/ports/sysdeps/alpha/memchr.c +++ b/ports/sysdeps/alpha/memchr.c @@ -16,7 +16,6 @@ . */ #include -#include typedef unsigned long word; @@ -170,6 +169,6 @@ __memchr (const void *s, int xc, size_t n) } #ifdef weak_alias -weak_alias (__memchr, BP_SYM (memchr)) +weak_alias (__memchr, memchr) #endif libc_hidden_builtin_def (memchr) diff --git a/ports/sysdeps/powerpc/nofpu/fegetenv.c b/ports/sysdeps/powerpc/nofpu/fegetenv.c index 75e89408df..51bcef30a1 100644 --- a/ports/sysdeps/powerpc/nofpu/fegetenv.c +++ b/ports/sysdeps/powerpc/nofpu/fegetenv.c @@ -19,7 +19,6 @@ #include "soft-fp.h" #include "soft-supp.h" -#include extern int __sim_exceptions; extern int __sim_disabled_exceptions; @@ -42,8 +41,8 @@ __fegetenv (fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fegetenv, __old_fegetenv) -compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1); +compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1); #endif libm_hidden_ver (__fegetenv, fegetenv) -versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2); +versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2); diff --git a/ports/sysdeps/powerpc/nofpu/fesetenv.c b/ports/sysdeps/powerpc/nofpu/fesetenv.c index 810e1da56e..3f35909b6d 100644 --- a/ports/sysdeps/powerpc/nofpu/fesetenv.c +++ b/ports/sysdeps/powerpc/nofpu/fesetenv.c @@ -19,7 +19,6 @@ #include "soft-fp.h" #include "soft-supp.h" -#include int __fesetenv (const fenv_t *envp) @@ -36,8 +35,8 @@ __fesetenv (const fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fesetenv, __old_fesetenv) -compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1); +compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1); #endif libm_hidden_ver (__fesetenv, fesetenv) -versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2); +versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2); diff --git a/ports/sysdeps/powerpc/nofpu/feupdateenv.c b/ports/sysdeps/powerpc/nofpu/feupdateenv.c index 94366a8d5e..163f673102 100644 --- a/ports/sysdeps/powerpc/nofpu/feupdateenv.c +++ b/ports/sysdeps/powerpc/nofpu/feupdateenv.c @@ -21,7 +21,6 @@ #include "soft-fp.h" #include "soft-supp.h" #include -#include int __feupdateenv (const fenv_t *envp) @@ -45,8 +44,8 @@ __feupdateenv (const fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__feupdateenv, __old_feupdateenv) -compat_symbol (libm, BP_SYM (__old_feupdateenv), BP_SYM (feupdateenv), GLIBC_2_1); +compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1); #endif libm_hidden_ver (__feupdateenv, feupdateenv) -versioned_symbol (libm, BP_SYM (__feupdateenv), BP_SYM (feupdateenv), GLIBC_2_2); +versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2); diff --git a/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c b/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c index e8b2a3a48c..2373fa4002 100644 --- a/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c +++ b/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c @@ -19,7 +19,6 @@ #include "soft-fp.h" #include "soft-supp.h" -#include int __fegetexceptflag (fexcept_t *flagp, int excepts) @@ -32,7 +31,7 @@ __fegetexceptflag (fexcept_t *flagp, int excepts) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fegetexceptflag, __old_fegetexceptflag) -compat_symbol (libm, BP_SYM (__old_fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_1); +compat_symbol (libm, __old_fegetexceptflag, fegetexceptflag, GLIBC_2_1); #endif -versioned_symbol (libm, BP_SYM (__fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_2); +versioned_symbol (libm, __fegetexceptflag, fegetexceptflag, GLIBC_2_2); diff --git a/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c b/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c index a0861d4a2b..cd142b60be 100644 --- a/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c +++ b/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c @@ -20,7 +20,6 @@ #include "soft-fp.h" #include "soft-supp.h" #include -#include #undef feraiseexcept int @@ -35,8 +34,8 @@ __feraiseexcept (int x) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__feraiseexcept, __old_feraiseexcept) -compat_symbol (libm, BP_SYM (__old_feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_1); +compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1); #endif libm_hidden_ver (__feraiseexcept, feraiseexcept) -versioned_symbol (libm, BP_SYM (__feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_2); +versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2); diff --git a/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c b/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c index 108df304c9..3dc368fdda 100644 --- a/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c +++ b/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c @@ -19,7 +19,6 @@ #include "soft-fp.h" #include "soft-supp.h" -#include int __fesetexceptflag(const fexcept_t *flagp, int excepts) @@ -33,7 +32,7 @@ __fesetexceptflag(const fexcept_t *flagp, int excepts) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fesetexceptflag, __old_fesetexceptflag) -compat_symbol (libm, BP_SYM (__old_fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_1); +compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1); #endif -versioned_symbol (libm, BP_SYM (__fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_2); +versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2); diff --git a/string/memchr.c b/string/memchr.c index d4c8457795..2427c4b4b6 100644 --- a/string/memchr.c +++ b/string/memchr.c @@ -47,11 +47,6 @@ #endif #include -#if HAVE_BP_SYM_H || defined _LIBC -#include -#else -# define BP_SYM(sym) sym -#endif #undef memchr #undef __memchr @@ -203,6 +198,6 @@ __memchr (s, c_in, n) return 0; } #ifdef weak_alias -weak_alias (__memchr, BP_SYM (memchr)) +weak_alias (__memchr, memchr) #endif libc_hidden_builtin_def (memchr) diff --git a/sysdeps/i386/fpu/fegetenv.c b/sysdeps/i386/fpu/fegetenv.c index df7fced10e..c650f9fe05 100644 --- a/sysdeps/i386/fpu/fegetenv.c +++ b/sysdeps/i386/fpu/fegetenv.c @@ -18,7 +18,6 @@ . */ #include -#include int __fegetenv (fenv_t *envp) @@ -36,8 +35,8 @@ __fegetenv (fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fegetenv, __old_fegetenv) -compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1); +compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1); #endif libm_hidden_ver (__fegetenv, fegetenv) -versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2); +versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2); diff --git a/sysdeps/i386/fpu/fesetenv.c b/sysdeps/i386/fpu/fesetenv.c index aee1ee0b3f..94178e13c9 100644 --- a/sysdeps/i386/fpu/fesetenv.c +++ b/sysdeps/i386/fpu/fesetenv.c @@ -19,7 +19,6 @@ #include #include -#include int @@ -80,8 +79,8 @@ __fesetenv (const fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fesetenv, __old_fesetenv) -compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1); +compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1); #endif libm_hidden_ver (__fesetenv, fesetenv) -versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2); +versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2); diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c index e3659798e7..b2a810add3 100644 --- a/sysdeps/i386/fpu/feupdateenv.c +++ b/sysdeps/i386/fpu/feupdateenv.c @@ -18,7 +18,6 @@ . */ #include -#include #include #include #include @@ -53,8 +52,8 @@ __feupdateenv (const fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__feupdateenv, __old_feupdateenv) -compat_symbol (libm, BP_SYM (__old_feupdateenv), BP_SYM (feupdateenv), GLIBC_2_1); +compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1); #endif libm_hidden_ver (__feupdateenv, feupdateenv) -versioned_symbol (libm, BP_SYM (__feupdateenv), BP_SYM (feupdateenv), GLIBC_2_2); +versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2); diff --git a/sysdeps/i386/fpu/fsetexcptflg.c b/sysdeps/i386/fpu/fsetexcptflg.c index d197aaabb5..0c328272d7 100644 --- a/sysdeps/i386/fpu/fsetexcptflg.c +++ b/sysdeps/i386/fpu/fsetexcptflg.c @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -64,7 +63,7 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fesetexceptflag, __old_fesetexceptflag) -compat_symbol (libm, BP_SYM (__old_fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_1); +compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1); #endif -versioned_symbol (libm, BP_SYM (__fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_2); +versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2); diff --git a/sysdeps/posix/open64.c b/sysdeps/posix/open64.c index 4e4480256e..e0c55b00fb 100644 --- a/sysdeps/posix/open64.c +++ b/sysdeps/posix/open64.c @@ -17,7 +17,6 @@ #include #include -#include #include /* Open FILE with access OFLAG. If OFLAG includes O_CREAT, @@ -46,6 +45,6 @@ __libc_open64 (const char *file, int oflag, ...) return result; } -weak_alias (__libc_open64, BP_SYM (__open64)) -libc_hidden_weak (BP_SYM (__open64)) -weak_alias (__libc_open64, BP_SYM (open64)) +weak_alias (__libc_open64, __open64) +libc_hidden_weak (__open64) +weak_alias (__libc_open64, open64) diff --git a/sysdeps/powerpc/fpu/fegetenv.c b/sysdeps/powerpc/fpu/fegetenv.c index ee60e6df12..a512a91a4e 100644 --- a/sysdeps/powerpc/fpu/fegetenv.c +++ b/sysdeps/powerpc/fpu/fegetenv.c @@ -17,7 +17,6 @@ . */ #include -#include int __fegetenv (fenv_t *envp) @@ -31,8 +30,8 @@ __fegetenv (fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fegetenv, __old_fegetenv) -compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1); +compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1); #endif libm_hidden_ver (__fegetenv, fegetenv) -versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2); +versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2); diff --git a/sysdeps/powerpc/fpu/fesetenv.c b/sysdeps/powerpc/fpu/fesetenv.c index 72989c476d..953af5ddc7 100644 --- a/sysdeps/powerpc/fpu/fesetenv.c +++ b/sysdeps/powerpc/fpu/fesetenv.c @@ -18,7 +18,6 @@ #include #include -#include #define _FPU_MASK_ALL (_FPU_MASK_ZM | _FPU_MASK_OM | _FPU_MASK_UM | _FPU_MASK_XM | _FPU_MASK_IM) @@ -54,8 +53,8 @@ __fesetenv (const fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fesetenv, __old_fesetenv) -compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1); +compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1); #endif libm_hidden_ver (__fesetenv, fesetenv) -versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2); +versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2); diff --git a/sysdeps/powerpc/fpu/feupdateenv.c b/sysdeps/powerpc/fpu/feupdateenv.c index 66f2826398..9faf930f36 100644 --- a/sysdeps/powerpc/fpu/feupdateenv.c +++ b/sysdeps/powerpc/fpu/feupdateenv.c @@ -19,7 +19,6 @@ #include #include -#include #define _FPU_MASK_ALL (_FPU_MASK_ZM | _FPU_MASK_OM | _FPU_MASK_UM | _FPU_MASK_XM | _FPU_MASK_IM) @@ -61,8 +60,8 @@ __feupdateenv (const fenv_t *envp) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__feupdateenv, __old_feupdateenv) -compat_symbol (libm, BP_SYM (__old_feupdateenv), BP_SYM (feupdateenv), GLIBC_2_1); +compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1); #endif libm_hidden_ver (__feupdateenv, feupdateenv) -versioned_symbol (libm, BP_SYM (__feupdateenv), BP_SYM (feupdateenv), GLIBC_2_2); +versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2); diff --git a/sysdeps/powerpc/fpu/fgetexcptflg.c b/sysdeps/powerpc/fpu/fgetexcptflg.c index 987a205472..f6327ce170 100644 --- a/sysdeps/powerpc/fpu/fgetexcptflg.c +++ b/sysdeps/powerpc/fpu/fgetexcptflg.c @@ -17,7 +17,6 @@ . */ #include -#include int __fegetexceptflag (fexcept_t *flagp, int excepts) @@ -37,7 +36,7 @@ __fegetexceptflag (fexcept_t *flagp, int excepts) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fegetexceptflag, __old_fegetexceptflag) -compat_symbol (libm, BP_SYM (__old_fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_1); +compat_symbol (libm, __old_fegetexceptflag, fegetexceptflag, GLIBC_2_1); #endif -versioned_symbol (libm, BP_SYM (__fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_2); +versioned_symbol (libm, __fegetexceptflag, fegetexceptflag, GLIBC_2_2); diff --git a/sysdeps/powerpc/fpu/fraiseexcpt.c b/sysdeps/powerpc/fpu/fraiseexcpt.c index 88d1844768..9118c1954a 100644 --- a/sysdeps/powerpc/fpu/fraiseexcpt.c +++ b/sysdeps/powerpc/fpu/fraiseexcpt.c @@ -17,7 +17,6 @@ . */ #include -#include #undef feraiseexcept int @@ -61,8 +60,8 @@ __feraiseexcept (int excepts) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__feraiseexcept, __old_feraiseexcept) -compat_symbol (libm, BP_SYM (__old_feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_1); +compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1); #endif libm_hidden_ver (__feraiseexcept, feraiseexcept) -versioned_symbol (libm, BP_SYM (__feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_2); +versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2); diff --git a/sysdeps/powerpc/fpu/fsetexcptflg.c b/sysdeps/powerpc/fpu/fsetexcptflg.c index 588fb6a0d7..c050d4022b 100644 --- a/sysdeps/powerpc/fpu/fsetexcptflg.c +++ b/sysdeps/powerpc/fpu/fsetexcptflg.c @@ -17,7 +17,6 @@ . */ #include -#include int __fesetexceptflag (const fexcept_t *flagp, int excepts) @@ -53,7 +52,7 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts) #include #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) strong_alias (__fesetexceptflag, __old_fesetexceptflag) -compat_symbol (libm, BP_SYM (__old_fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_1); +compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1); #endif -versioned_symbol (libm, BP_SYM (__fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_2); +versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c index 07d0ef8a1e..4e6e9e92f8 100644 --- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c +++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c @@ -19,7 +19,6 @@ #include #include #include -#include int __cache_line_size attribute_hidden; @@ -40,14 +39,12 @@ struct startup_info }; int -/* GKM FIXME: GCC: this should get __BP_ prefix by virtue of the - BPs in the arglist of startup_info.main and startup_info.init. */ - BP_SYM (__libc_start_main) (int argc, char **argv, - char **ev, - ElfW (auxv_t) * auxvec, - void (*rtld_fini) (void), - struct startup_info *stinfo, - char **stack_on_entry) +__libc_start_main (int argc, char **argv, + char **ev, + ElfW (auxv_t) * auxvec, + void (*rtld_fini) (void), + struct startup_info *stinfo, + char **stack_on_entry) { /* the PPC SVR4 ABI says that the top thing on the stack will be a NULL pointer, so if not we assume that we're being called