Blame SOURCES/glibc-rh1505492-bounded-11.patch

25845f
commit e97ed6ddbe0d53d616d93669826db225b12c3235
25845f
Author: Joseph Myers <joseph@codesourcery.com>
25845f
Date:   Thu Feb 14 13:12:02 2013 +0000
25845f
25845f
    Remove bp-sym.h and BP_SYM uses from C code.
25845f
25845f
diff --git a/csu/libc-start.c b/csu/libc-start.c
25845f
index 63757062c730c81a..b0e62da6f6ea0708 100644
25845f
--- a/csu/libc-start.c
25845f
+++ b/csu/libc-start.c
25845f
@@ -19,7 +19,6 @@
25845f
 #include <stdio.h>
25845f
 #include <unistd.h>
25845f
 #include <ldsodefs.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 extern void __libc_init_first (int argc, char **argv, char **envp);
25845f
 #ifndef SHARED
25845f
@@ -92,7 +91,7 @@ apply_irel (void)
25845f
 # endif
25845f
 #else
25845f
 # define STATIC
25845f
-# define LIBC_START_MAIN BP_SYM (__libc_start_main)
25845f
+# define LIBC_START_MAIN __libc_start_main
25845f
 #endif
25845f
 
25845f
 #ifdef MAIN_AUXVEC_ARG
25845f
diff --git a/elf/dl-open.c b/elf/dl-open.c
25845f
index d48c963f779f44d8..41caade36d35d015 100644
25845f
--- a/elf/dl-open.c
25845f
+++ b/elf/dl-open.c
25845f
@@ -28,7 +28,6 @@
25845f
 #include <sys/param.h>
25845f
 #include <bits/libc-lock.h>
25845f
 #include <ldsodefs.h>
25845f
-#include <bp-sym.h>
25845f
 #include <caller.h>
25845f
 #include <sysdep-cancel.h>
25845f
 #include <tls.h>
25845f
@@ -43,7 +42,7 @@ extern ElfW(Addr) _dl_sysdep_start (void **start_argptr,
25845f
 						     ElfW(Word) phnum,
25845f
 						     ElfW(Addr) *user_entry,
25845f
 						     ElfW(auxv_t) *auxv));
25845f
-weak_extern (BP_SYM (_dl_sysdep_start))
25845f
+weak_extern (_dl_sysdep_start)
25845f
 
25845f
 extern int __libc_multiple_libcs;	/* Defined in init-first.c.  */
25845f
 
25845f
diff --git a/math/fegetenv.c b/math/fegetenv.c
25845f
index f8fbdffdb35a913c..0741407f125172a3 100644
25845f
--- a/math/fegetenv.c
25845f
+++ b/math/fegetenv.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include <fenv.h>
25845f
 #include <shlib-compat.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fegetenv (fenv_t *envp)
25845f
@@ -29,9 +28,9 @@ __fegetenv (fenv_t *envp)
25845f
 }
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fegetenv, __old_fegetenv)
25845f
-compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1);
25845f
 #endif
25845f
 libm_hidden_ver (__fegetenv, fegetenv)
25845f
-versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
25845f
 
25845f
 stub_warning (fegetenv)
25845f
diff --git a/nptl/sysdeps/pthread/bits/libc-lockP.h b/nptl/sysdeps/pthread/bits/libc-lockP.h
25845f
index 7a1107207a1e0ffb..962a292308f92267 100644
25845f
--- a/nptl/sysdeps/pthread/bits/libc-lockP.h
25845f
+++ b/nptl/sysdeps/pthread/bits/libc-lockP.h
25845f
@@ -375,31 +375,30 @@ extern int __pthread_atfork (void (*__prepare) (void),
25845f
    single-threaded processes.  */
25845f
 #ifndef __NO_WEAK_PTHREAD_ALIASES
25845f
 # ifdef weak_extern
25845f
-#  include <bp-sym.h>
25845f
-weak_extern (BP_SYM (__pthread_mutex_init))
25845f
-weak_extern (BP_SYM (__pthread_mutex_destroy))
25845f
-weak_extern (BP_SYM (__pthread_mutex_lock))
25845f
-weak_extern (BP_SYM (__pthread_mutex_trylock))
25845f
-weak_extern (BP_SYM (__pthread_mutex_unlock))
25845f
-weak_extern (BP_SYM (__pthread_mutexattr_init))
25845f
-weak_extern (BP_SYM (__pthread_mutexattr_destroy))
25845f
-weak_extern (BP_SYM (__pthread_mutexattr_settype))
25845f
-weak_extern (BP_SYM (__pthread_rwlock_init))
25845f
-weak_extern (BP_SYM (__pthread_rwlock_destroy))
25845f
-weak_extern (BP_SYM (__pthread_rwlock_rdlock))
25845f
-weak_extern (BP_SYM (__pthread_rwlock_tryrdlock))
25845f
-weak_extern (BP_SYM (__pthread_rwlock_wrlock))
25845f
-weak_extern (BP_SYM (__pthread_rwlock_trywrlock))
25845f
-weak_extern (BP_SYM (__pthread_rwlock_unlock))
25845f
-weak_extern (BP_SYM (__pthread_key_create))
25845f
-weak_extern (BP_SYM (__pthread_setspecific))
25845f
-weak_extern (BP_SYM (__pthread_getspecific))
25845f
-weak_extern (BP_SYM (__pthread_once))
25845f
+weak_extern (__pthread_mutex_init)
25845f
+weak_extern (__pthread_mutex_destroy)
25845f
+weak_extern (__pthread_mutex_lock)
25845f
+weak_extern (__pthread_mutex_trylock)
25845f
+weak_extern (__pthread_mutex_unlock)
25845f
+weak_extern (__pthread_mutexattr_init)
25845f
+weak_extern (__pthread_mutexattr_destroy)
25845f
+weak_extern (__pthread_mutexattr_settype)
25845f
+weak_extern (__pthread_rwlock_init)
25845f
+weak_extern (__pthread_rwlock_destroy)
25845f
+weak_extern (__pthread_rwlock_rdlock)
25845f
+weak_extern (__pthread_rwlock_tryrdlock)
25845f
+weak_extern (__pthread_rwlock_wrlock)
25845f
+weak_extern (__pthread_rwlock_trywrlock)
25845f
+weak_extern (__pthread_rwlock_unlock)
25845f
+weak_extern (__pthread_key_create)
25845f
+weak_extern (__pthread_setspecific)
25845f
+weak_extern (__pthread_getspecific)
25845f
+weak_extern (__pthread_once)
25845f
 weak_extern (__pthread_initialize)
25845f
 weak_extern (__pthread_atfork)
25845f
-weak_extern (BP_SYM (_pthread_cleanup_push_defer))
25845f
-weak_extern (BP_SYM (_pthread_cleanup_pop_restore))
25845f
-weak_extern (BP_SYM (pthread_setcancelstate))
25845f
+weak_extern (_pthread_cleanup_push_defer)
25845f
+weak_extern (_pthread_cleanup_pop_restore)
25845f
+weak_extern (pthread_setcancelstate)
25845f
 # else
25845f
 #  pragma weak __pthread_mutex_init
25845f
 #  pragma weak __pthread_mutex_destroy
25845f
diff --git a/ports/sysdeps/alpha/memchr.c b/ports/sysdeps/alpha/memchr.c
25845f
index b19d8200c60ffd71..86785756fc680d03 100644
25845f
--- a/ports/sysdeps/alpha/memchr.c
25845f
+++ b/ports/sysdeps/alpha/memchr.c
25845f
@@ -16,7 +16,6 @@
25845f
    <http://www.gnu.org/licenses/>.  */
25845f
 
25845f
 #include <string.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 typedef unsigned long word;
25845f
 
25845f
@@ -170,6 +169,6 @@ __memchr (const void *s, int xc, size_t n)
25845f
 }
25845f
 
25845f
 #ifdef weak_alias
25845f
-weak_alias (__memchr, BP_SYM (memchr))
25845f
+weak_alias (__memchr, memchr)
25845f
 #endif
25845f
 libc_hidden_builtin_def (memchr)
25845f
diff --git a/ports/sysdeps/powerpc/nofpu/fegetenv.c b/ports/sysdeps/powerpc/nofpu/fegetenv.c
25845f
index dd88fb3490c92309..95c7475a7d138e75 100644
25845f
--- a/ports/sysdeps/powerpc/nofpu/fegetenv.c
25845f
+++ b/ports/sysdeps/powerpc/nofpu/fegetenv.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include "soft-fp.h"
25845f
 #include "soft-supp.h"
25845f
-#include <bp-sym.h>
25845f
 
25845f
 extern int __sim_exceptions;
25845f
 extern int __sim_disabled_exceptions;
25845f
@@ -42,8 +41,8 @@ __fegetenv (fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fegetenv, __old_fegetenv)
25845f
-compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__fegetenv, fegetenv)
25845f
-versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
25845f
diff --git a/ports/sysdeps/powerpc/nofpu/fesetenv.c b/ports/sysdeps/powerpc/nofpu/fesetenv.c
25845f
index dc49017c0dc68454..2e3946106460eea5 100644
25845f
--- a/ports/sysdeps/powerpc/nofpu/fesetenv.c
25845f
+++ b/ports/sysdeps/powerpc/nofpu/fesetenv.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include "soft-fp.h"
25845f
 #include "soft-supp.h"
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fesetenv (const fenv_t *envp)
25845f
@@ -36,8 +35,8 @@ __fesetenv (const fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fesetenv, __old_fesetenv)
25845f
-compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__fesetenv, fesetenv)
25845f
-versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
25845f
diff --git a/ports/sysdeps/powerpc/nofpu/feupdateenv.c b/ports/sysdeps/powerpc/nofpu/feupdateenv.c
25845f
index f5153d366968d11c..20f552135a5cca26 100644
25845f
--- a/ports/sysdeps/powerpc/nofpu/feupdateenv.c
25845f
+++ b/ports/sysdeps/powerpc/nofpu/feupdateenv.c
25845f
@@ -21,7 +21,6 @@
25845f
 #include "soft-fp.h"
25845f
 #include "soft-supp.h"
25845f
 #include <signal.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __feupdateenv (const fenv_t *envp)
25845f
@@ -45,8 +44,8 @@ __feupdateenv (const fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__feupdateenv, __old_feupdateenv)
25845f
-compat_symbol (libm, BP_SYM (__old_feupdateenv), BP_SYM (feupdateenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__feupdateenv, feupdateenv)
25845f
-versioned_symbol (libm, BP_SYM (__feupdateenv), BP_SYM (feupdateenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
25845f
diff --git a/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c b/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c
25845f
index 6b00ee0dcd4ca037..e0582d61aee6eed6 100644
25845f
--- a/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c
25845f
+++ b/ports/sysdeps/powerpc/nofpu/fgetexcptflg.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include "soft-fp.h"
25845f
 #include "soft-supp.h"
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fegetexceptflag (fexcept_t *flagp, int excepts)
25845f
@@ -32,7 +31,7 @@ __fegetexceptflag (fexcept_t *flagp, int excepts)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fegetexceptflag, __old_fegetexceptflag)
25845f
-compat_symbol (libm, BP_SYM (__old_fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fegetexceptflag, fegetexceptflag, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
-versioned_symbol (libm, BP_SYM (__fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fegetexceptflag, fegetexceptflag, GLIBC_2_2);
25845f
diff --git a/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c b/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c
25845f
index dcfbcc48b2cd54c3..e1dde26ef964cb81 100644
25845f
--- a/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c
25845f
+++ b/ports/sysdeps/powerpc/nofpu/fraiseexcpt.c
25845f
@@ -20,7 +20,6 @@
25845f
 #include "soft-fp.h"
25845f
 #include "soft-supp.h"
25845f
 #include <signal.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 #undef feraiseexcept
25845f
 int
25845f
@@ -35,8 +34,8 @@ __feraiseexcept (int x)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__feraiseexcept, __old_feraiseexcept)
25845f
-compat_symbol (libm, BP_SYM (__old_feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__feraiseexcept, feraiseexcept)
25845f
-versioned_symbol (libm, BP_SYM (__feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_2);
25845f
+versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
25845f
diff --git a/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c b/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c
25845f
index f98da1a6177d81da..53215f49141ac5a2 100644
25845f
--- a/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c
25845f
+++ b/ports/sysdeps/powerpc/nofpu/fsetexcptflg.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include "soft-fp.h"
25845f
 #include "soft-supp.h"
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fesetexceptflag(const fexcept_t *flagp, int excepts)
25845f
@@ -33,7 +32,7 @@ __fesetexceptflag(const fexcept_t *flagp, int excepts)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fesetexceptflag, __old_fesetexceptflag)
25845f
-compat_symbol (libm, BP_SYM (__old_fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
-versioned_symbol (libm, BP_SYM (__fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2);
25845f
diff --git a/string/memchr.c b/string/memchr.c
25845f
index 822c0a4d49a0e538..1684bfa56885e883 100644
25845f
--- a/string/memchr.c
25845f
+++ b/string/memchr.c
25845f
@@ -47,11 +47,6 @@
25845f
 #endif
25845f
 
25845f
 #include <sys/types.h>
25845f
-#if HAVE_BP_SYM_H || defined _LIBC
25845f
-#include <bp-sym.h>
25845f
-#else
25845f
-# define BP_SYM(sym) sym
25845f
-#endif
25845f
 
25845f
 #undef memchr
25845f
 #undef __memchr
25845f
@@ -207,6 +202,6 @@ MEMCHR (s, c_in, n)
25845f
   return 0;
25845f
 }
25845f
 #ifdef weak_alias
25845f
-weak_alias (__memchr, BP_SYM (memchr))
25845f
+weak_alias (__memchr, memchr)
25845f
 #endif
25845f
 libc_hidden_builtin_def (memchr)
25845f
diff --git a/sysdeps/i386/fpu/fegetenv.c b/sysdeps/i386/fpu/fegetenv.c
25845f
index 7cdb90e04464fc77..a4cc5d1f0ed1c796 100644
25845f
--- a/sysdeps/i386/fpu/fegetenv.c
25845f
+++ b/sysdeps/i386/fpu/fegetenv.c
25845f
@@ -18,7 +18,6 @@
25845f
    <http://www.gnu.org/licenses/>.  */
25845f
 
25845f
 #include <fenv.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fegetenv (fenv_t *envp)
25845f
@@ -36,8 +35,8 @@ __fegetenv (fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fegetenv, __old_fegetenv)
25845f
-compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__fegetenv, fegetenv)
25845f
-versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
25845f
diff --git a/sysdeps/i386/fpu/fesetenv.c b/sysdeps/i386/fpu/fesetenv.c
25845f
index e2f9eb8178c39ed8..ee92d5c36d1e5cde 100644
25845f
--- a/sysdeps/i386/fpu/fesetenv.c
25845f
+++ b/sysdeps/i386/fpu/fesetenv.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include <fenv.h>
25845f
 #include <assert.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 
25845f
 int
25845f
@@ -80,8 +79,8 @@ __fesetenv (const fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fesetenv, __old_fesetenv)
25845f
-compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__fesetenv, fesetenv)
25845f
-versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
25845f
diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
25845f
index 6e2ce35b531cd348..86a43f024372987f 100644
25845f
--- a/sysdeps/i386/fpu/feupdateenv.c
25845f
+++ b/sysdeps/i386/fpu/feupdateenv.c
25845f
@@ -18,7 +18,6 @@
25845f
    <http://www.gnu.org/licenses/>.  */
25845f
 
25845f
 #include <fenv.h>
25845f
-#include <bp-sym.h>
25845f
 #include <unistd.h>
25845f
 #include <dl-procinfo.h>
25845f
 #include <ldsodefs.h>
25845f
@@ -53,8 +52,8 @@ __feupdateenv (const fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__feupdateenv, __old_feupdateenv)
25845f
-compat_symbol (libm, BP_SYM (__old_feupdateenv), BP_SYM (feupdateenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__feupdateenv, feupdateenv)
25845f
-versioned_symbol (libm, BP_SYM (__feupdateenv), BP_SYM (feupdateenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
25845f
diff --git a/sysdeps/i386/fpu/fsetexcptflg.c b/sysdeps/i386/fpu/fsetexcptflg.c
25845f
index 2daec71d112839c3..8751f10b23b1c690 100644
25845f
--- a/sysdeps/i386/fpu/fsetexcptflg.c
25845f
+++ b/sysdeps/i386/fpu/fsetexcptflg.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include <fenv.h>
25845f
 #include <math.h>
25845f
-#include <bp-sym.h>
25845f
 #include <unistd.h>
25845f
 #include <ldsodefs.h>
25845f
 #include <dl-procinfo.h>
25845f
@@ -64,7 +63,7 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fesetexceptflag, __old_fesetexceptflag)
25845f
-compat_symbol (libm, BP_SYM (__old_fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
-versioned_symbol (libm, BP_SYM (__fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2);
25845f
diff --git a/sysdeps/posix/open64.c b/sysdeps/posix/open64.c
25845f
index 1aa0a57007792f36..8392e17773739a5f 100644
25845f
--- a/sysdeps/posix/open64.c
25845f
+++ b/sysdeps/posix/open64.c
25845f
@@ -17,7 +17,6 @@
25845f
 
25845f
 #include <fcntl.h>
25845f
 #include <stdarg.h>
25845f
-#include <bp-sym.h>
25845f
 #include <sysdep-cancel.h>
25845f
 
25845f
 /* Open FILE with access OFLAG.  If O_CREAT or O_TMPFILE is in OFLAG,
25845f
@@ -46,6 +45,6 @@ __libc_open64 (const char *file, int oflag, ...)
25845f
 
25845f
   return result;
25845f
 }
25845f
-weak_alias (__libc_open64, BP_SYM (__open64))
25845f
-libc_hidden_weak (BP_SYM (__open64))
25845f
-weak_alias (__libc_open64, BP_SYM (open64))
25845f
+weak_alias (__libc_open64, __open64)
25845f
+libc_hidden_weak (__open64)
25845f
+weak_alias (__libc_open64, open64)
25845f
diff --git a/sysdeps/powerpc/fpu/fegetenv.c b/sysdeps/powerpc/fpu/fegetenv.c
25845f
index 77a8b2aa7a51d99a..d4fc41c5ae2702e6 100644
25845f
--- a/sysdeps/powerpc/fpu/fegetenv.c
25845f
+++ b/sysdeps/powerpc/fpu/fegetenv.c
25845f
@@ -17,7 +17,6 @@
25845f
    <http://www.gnu.org/licenses/>.  */
25845f
 
25845f
 #include <fenv_libc.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fegetenv (fenv_t *envp)
25845f
@@ -31,8 +30,8 @@ __fegetenv (fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fegetenv, __old_fegetenv)
25845f
-compat_symbol (libm, BP_SYM (__old_fegetenv), BP_SYM (fegetenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__fegetenv, fegetenv)
25845f
-versioned_symbol (libm, BP_SYM (__fegetenv), BP_SYM (fegetenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2);
25845f
diff --git a/sysdeps/powerpc/fpu/fesetenv.c b/sysdeps/powerpc/fpu/fesetenv.c
25845f
index e73da91101ed691e..63f653e827cbe4e5 100644
25845f
--- a/sysdeps/powerpc/fpu/fesetenv.c
25845f
+++ b/sysdeps/powerpc/fpu/fesetenv.c
25845f
@@ -19,7 +19,6 @@
25845f
 
25845f
 #include <fenv_libc.h>
25845f
 #include <fpu_control.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 #define _FPU_MASK_ALL (_FPU_MASK_ZM | _FPU_MASK_OM | _FPU_MASK_UM | _FPU_MASK_XM | _FPU_MASK_IM)
25845f
 
25845f
@@ -55,8 +54,8 @@ __fesetenv (const fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fesetenv, __old_fesetenv)
25845f
-compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__fesetenv, fesetenv)
25845f
-versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
25845f
diff --git a/sysdeps/powerpc/fpu/feupdateenv.c b/sysdeps/powerpc/fpu/feupdateenv.c
25845f
index d24da9435294cd47..8a3491293c871a08 100644
25845f
--- a/sysdeps/powerpc/fpu/feupdateenv.c
25845f
+++ b/sysdeps/powerpc/fpu/feupdateenv.c
25845f
@@ -20,7 +20,6 @@
25845f
 
25845f
 #include <fenv_libc.h>
25845f
 #include <fpu_control.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 #define _FPU_MASK_ALL (_FPU_MASK_ZM | _FPU_MASK_OM | _FPU_MASK_UM | _FPU_MASK_XM | _FPU_MASK_IM)
25845f
 
25845f
@@ -62,8 +61,8 @@ __feupdateenv (const fenv_t *envp)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__feupdateenv, __old_feupdateenv)
25845f
-compat_symbol (libm, BP_SYM (__old_feupdateenv), BP_SYM (feupdateenv), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__feupdateenv, feupdateenv)
25845f
-versioned_symbol (libm, BP_SYM (__feupdateenv), BP_SYM (feupdateenv), GLIBC_2_2);
25845f
+versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
25845f
diff --git a/sysdeps/powerpc/fpu/fgetexcptflg.c b/sysdeps/powerpc/fpu/fgetexcptflg.c
25845f
index 3f9887a024387a21..9c59fc050feb97ba 100644
25845f
--- a/sysdeps/powerpc/fpu/fgetexcptflg.c
25845f
+++ b/sysdeps/powerpc/fpu/fgetexcptflg.c
25845f
@@ -17,7 +17,6 @@
25845f
    <http://www.gnu.org/licenses/>.  */
25845f
 
25845f
 #include <fenv_libc.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fegetexceptflag (fexcept_t *flagp, int excepts)
25845f
@@ -37,7 +36,7 @@ __fegetexceptflag (fexcept_t *flagp, int excepts)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fegetexceptflag, __old_fegetexceptflag)
25845f
-compat_symbol (libm, BP_SYM (__old_fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fegetexceptflag, fegetexceptflag, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
-versioned_symbol (libm, BP_SYM (__fegetexceptflag), BP_SYM (fegetexceptflag), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fegetexceptflag, fegetexceptflag, GLIBC_2_2);
25845f
diff --git a/sysdeps/powerpc/fpu/fraiseexcpt.c b/sysdeps/powerpc/fpu/fraiseexcpt.c
25845f
index 86a89e744ed4e5d8..900d01186051a2fd 100644
25845f
--- a/sysdeps/powerpc/fpu/fraiseexcpt.c
25845f
+++ b/sysdeps/powerpc/fpu/fraiseexcpt.c
25845f
@@ -17,7 +17,6 @@
25845f
    <http://www.gnu.org/licenses/>.  */
25845f
 
25845f
 #include <fenv_libc.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 #undef feraiseexcept
25845f
 int
25845f
@@ -61,8 +60,8 @@ __feraiseexcept (int excepts)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__feraiseexcept, __old_feraiseexcept)
25845f
-compat_symbol (libm, BP_SYM (__old_feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
 libm_hidden_ver (__feraiseexcept, feraiseexcept)
25845f
-versioned_symbol (libm, BP_SYM (__feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_2);
25845f
+versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
25845f
diff --git a/sysdeps/powerpc/fpu/fsetexcptflg.c b/sysdeps/powerpc/fpu/fsetexcptflg.c
25845f
index 1140c8eb70489086..aadec2e8df1d5975 100644
25845f
--- a/sysdeps/powerpc/fpu/fsetexcptflg.c
25845f
+++ b/sysdeps/powerpc/fpu/fsetexcptflg.c
25845f
@@ -17,7 +17,6 @@
25845f
    <http://www.gnu.org/licenses/>.  */
25845f
 
25845f
 #include <fenv_libc.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 int
25845f
 __fesetexceptflag (const fexcept_t *flagp, int excepts)
25845f
@@ -53,7 +52,7 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts)
25845f
 #include <shlib-compat.h>
25845f
 #if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2)
25845f
 strong_alias (__fesetexceptflag, __old_fesetexceptflag)
25845f
-compat_symbol (libm, BP_SYM (__old_fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_1);
25845f
+compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1);
25845f
 #endif
25845f
 
25845f
-versioned_symbol (libm, BP_SYM (__fesetexceptflag), BP_SYM (fesetexceptflag), GLIBC_2_2);
25845f
+versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2);
25845f
diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
25845f
index 078d6c7ca99c7203..7cdabe9085ef6118 100644
25845f
--- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c
25845f
+++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
25845f
@@ -20,7 +20,6 @@
25845f
 #include <unistd.h>
25845f
 #include <ldsodefs.h>
25845f
 #include <sysdep.h>
25845f
-#include <bp-sym.h>
25845f
 
25845f
 
25845f
 int __cache_line_size attribute_hidden;
25845f
@@ -41,14 +40,12 @@ struct startup_info
25845f
   };
25845f
 
25845f
 int
25845f
-/* GKM FIXME: GCC: this should get __BP_ prefix by virtue of the
25845f
-   BPs in the arglist of startup_info.main and startup_info.init. */
25845f
-  BP_SYM (__libc_start_main) (int argc, char **argv,
25845f
-			      char **ev,
25845f
-			      ElfW (auxv_t) * auxvec,
25845f
-			      void (*rtld_fini) (void),
25845f
-			      struct startup_info *stinfo,
25845f
-			      char **stack_on_entry)
25845f
+__libc_start_main (int argc, char **argv,
25845f
+		   char **ev,
25845f
+		   ElfW (auxv_t) * auxvec,
25845f
+		   void (*rtld_fini) (void),
25845f
+		   struct startup_info *stinfo,
25845f
+		   char **stack_on_entry)
25845f
 {
25845f
   /* the PPC SVR4 ABI says that the top thing on the stack will
25845f
      be a NULL pointer, so if not we assume that we're being called