From e97ed6ddbe0d53d616d93669826db225b12c3235 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 14 Feb 2013 13:12:02 +0000 Subject: Remove bp-sym.h and BP_SYM uses from C code. --- 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 ++--- 9 files changed, 35 insertions(+), 20 deletions(-) (limited to 'ports') 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); -- cgit v1.2.3