mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
ea41469b7a
On ARM, where profil_counter is not static, it is brought in by references to various standard functions, as noted in <https://sourceware.org/ml/libc-alpha/2014-11/msg00890.html>, although it is not a standard function itself. I don't know if this also causes test failures on SPARC, although I see no reason for it not to do so. This patch fixes this namespace issue. profil_counter is renamed to __profil_counter and made a weak alias on ARM and SPARC. Because of the uses in profil.c / sprofil.c it seems simplest to make the rename globally, including on the other architectures for which profil_counter was static and so the change is of no substance. The variant names profil_counter_* used in sprofil.c are also renamed to start with __ so that undesired function names do not get exported in static libc. As I noted in bug 17726, profil_counter should probably be a compat symbol on ARM and SPARC, so it wouldn't exist at all in static libc even as a weak alias. Since defining a compat symbol still requires an internal name as a target of an alias, this patch still seems reasonable as an intermediate step towards that goal: it wouldn't be possible for the function simply to be static profil_counter on ARM and SPARC with profil_counter also being the exported compat symbol name, so profil.c / sprofil.c would still need to be prepared to call the function under another name (here, __profil_counter). Tested for x86_64 (testsuite, and that stripped installed shared libraries are unchanged by the patch) and ARM (ABI and linknamespace tests - this patch reduces the number of linknamespace failures I see on ARM from 227 to 5, the residue being math.h failures for fe* functions and for j0l/j1n/jnl/y0l/y1l/ynl aliases). 2014-12-17 Joseph Myers <joseph@codesourcery.com> [BZ #17725] * sysdeps/generic/profil-counter.h (profil_counter): Rename to __profil_counter. * sysdeps/unix/sysv/linux/hppa/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/i386/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/ia64/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/sh/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/tile/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/x86_64/profil-counter.h (profil_counter): Likewise. * sysdeps/unix/sysv/linux/arm/profil-counter.h (profil_counter): Likewise. [!__profil_counter] (profil_counter): Define as weak alias of __profil_counter. * sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h (profil_counter): Rename to __profil_counter. [!__profil_counter] (profil_counter): Define as weak alias of __profil_counter. * sysdeps/unix/sysv/linux/sparc/sparc64/profil-counter.h (profil_counter): Rename to __profil_counter. [!__profil_counter] (profil_counter): Define as weak alias of __profil_counter. * sysdeps/posix/profil.c: Update comment referring to profil_counter. (__profil): Use __profil_counter instead of profil_counter. * sysdeps/posix/sprofil.c (profil_counter): Rename to __profil_counter. Use __profil_counter_ushort and __profil_counter_uint in definitions. (__sprofil): Use __profil_counter_uint and __profil_counter_ushort instead of profil_counter_uint and profil_counter_ushort. |
||
|---|---|---|
| .. | ||
| bits | ||
| sys | ||
| ____longjmp_chk.S | ||
| __ia64_longjmp.S | ||
| __longjmp.S | ||
| __sigstack_longjmp.c | ||
| __start_context.S | ||
| arch-fork.h | ||
| brk.S | ||
| bsd-_setjmp.S | ||
| bsd-setjmp.S | ||
| c++-types.data | ||
| clone2.S | ||
| clone.S | ||
| configure | ||
| configure.ac | ||
| dl-brk.S | ||
| dl-cache.h | ||
| dl-static.c | ||
| dl-sysdep.h | ||
| get_clockfreq.c | ||
| getclktck.c | ||
| getcontext.S | ||
| getpagesize.c | ||
| has_cpuclock.c | ||
| Implies | ||
| ioperm.c | ||
| kernel_stat.h | ||
| kernel-features.h | ||
| ld.abilist | ||
| ldconfig.h | ||
| ldd-rewrite.sed | ||
| ldsodefs.h | ||
| libanl.abilist | ||
| libBrokenLocale.abilist | ||
| libc.abilist | ||
| libcrypt.abilist | ||
| libdl.abilist | ||
| libm.abilist | ||
| libnsl.abilist | ||
| libpthread.abilist | ||
| libresolv.abilist | ||
| librt.abilist | ||
| libthread_db.abilist | ||
| libutil.abilist | ||
| localplt.data | ||
| lowlevellock.h | ||
| makecontext.c | ||
| Makefile | ||
| pipe.S | ||
| profil-counter.h | ||
| pt-vfork.S | ||
| readelflib.c | ||
| register-dump.h | ||
| rt-sysdep.S | ||
| setcontext.S | ||
| setjmp.S | ||
| shlib-versions | ||
| sigaction.c | ||
| sigaltstack-offsets.sym | ||
| sigcontext-offsets.sym | ||
| sigcontextinfo.h | ||
| sigpending.c | ||
| sigprocmask.c | ||
| swapcontext.c | ||
| syscall.S | ||
| syscalls.list | ||
| sysconf.c | ||
| sysdep-cancel.h | ||
| sysdep.h | ||
| sysdep.S | ||
| system.c | ||
| timer_create.c | ||
| timer_delete.c | ||
| timer_getoverr.c | ||
| timer_gettime.c | ||
| timer_settime.c | ||
| ucontext_i.h | ||
| umount.c | ||
| unwind_longjmp.c | ||
| unwind-dw2-fde.c | ||
| unwind-forcedunwind.c | ||
| Versions | ||
| vfork.S | ||
| wordexp.c | ||