summary refs log tree commit diff
path: root/elf/dl-runtime.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-05 01:02:47 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-05 01:02:47 +0000
commitab97ee8f1bf70b24b417e8f690ce50563d508243 (patch)
tree0f561f1e7a0b27b06bc2443f3f60de4f73a77855 /elf/dl-runtime.c
parentc5684fdb2badfda3bd6e973e5f933272e39e9590 (diff)
downloadglibc-ab97ee8f1bf70b24b417e8f690ce50563d508243.tar.gz
glibc-ab97ee8f1bf70b24b417e8f690ce50563d508243.tar.xz
glibc-ab97ee8f1bf70b24b417e8f690ce50563d508243.zip
Don't use INTDEF/INTUSE with _dl_mcount (bug 14132).
Continuing the removal of the obsolete INTDEF / INTUSE mechanism, this
patch replaces its use for _dl_mcount with use of rtld_hidden_def /
rtld_hidden_proto.

Tested for x86_64 that installed stripped shared libraries are
unchanged by the patch.

	[BZ #14132]
	* elf/dl-profile.c (_dl_mcount): Use rtld_hidden_def instead of
	INTDEF.
	* sysdeps/generic/ldsodefs.h (_dl_mcount_internal): Remove
	declaration.
	(_dl_mcount): Use rtld_hidden_proto.
	* elf/dl-runtime.c (_dl_profile_fixup): Don't use INTUSE with
	_dl_mcount.
	* elf/rtld.c (_rtld_global_ro): Likewise.
Diffstat (limited to 'elf/dl-runtime.c')
-rw-r--r--elf/dl-runtime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 11eba4a832..ee02d5a0e4 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -158,7 +158,7 @@ _dl_profile_fixup (
 		   struct link_map *l, ElfW(Word) reloc_arg,
 		   ElfW(Addr) retaddr, void *regs, long int *framesizep)
 {
-  void (*mcount_fct) (ElfW(Addr), ElfW(Addr)) = INTUSE(_dl_mcount);
+  void (*mcount_fct) (ElfW(Addr), ElfW(Addr)) = _dl_mcount;
 
   if (l->l_reloc_result == NULL)
     {