GNU C Library master sources branch master updated. glibc-2.20-152-gab97ee8

[jsm28 at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  ab97ee8f1bf70b24b417e8f690ce50563d508243 (commit)
      from  c5684fdb2badfda3bd6e973e5f933272e39e9590 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ab97ee8f1bf70b24b417e8f690ce50563d508243

commit ab97ee8f1bf70b24b417e8f690ce50563d508243
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Nov 5 01:02:47 2014 +0000

    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.

diff --git a/ChangeLog b/ChangeLog
index 21cf47f..bcd5d67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
 2014-11-04  Joseph Myers  <joseph@codesourcery.com>
 
 	[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.
+
+	[BZ #14132]
 	* elf/dl-init.c (_dl_init): Don't use INTDEF.
 	* sysdeps/aarch64/dl-machine.h (RTLD_START): Use _dl_init instead
 	of _dl_init_internal.
diff --git a/elf/dl-profile.c b/elf/dl-profile.c
index 2fca7fd..4f83497 100644
--- a/elf/dl-profile.c
+++ b/elf/dl-profile.c
@@ -598,4 +598,4 @@ _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc)
  done:
   ;
 }
-INTDEF(_dl_mcount)
+rtld_hidden_def (_dl_mcount)
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index 11eba4a..ee02d5a 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)
     {
diff --git a/elf/rtld.c b/elf/rtld.c
index 537fc43..b07ff43 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -170,7 +170,7 @@ struct rtld_global_ro _rtld_global_ro attribute_relro =
     ._dl_debug_printf = _dl_debug_printf,
     ._dl_catch_error = _dl_catch_error,
     ._dl_signal_error = _dl_signal_error,
-    ._dl_mcount = _dl_mcount_internal,
+    ._dl_mcount = _dl_mcount,
     ._dl_lookup_symbol_x = _dl_lookup_symbol_x,
     ._dl_check_caller = _dl_check_caller,
     ._dl_open = _dl_open,
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index d1c8e2c..f339ee3 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -885,8 +885,7 @@ extern void _dl_start_profile (void) internal_function attribute_hidden;
 
 /* The actual functions used to keep book on the calls.  */
 extern void _dl_mcount (ElfW(Addr) frompc, ElfW(Addr) selfpc);
-extern void _dl_mcount_internal (ElfW(Addr) frompc, ElfW(Addr) selfpc)
-     attribute_hidden;
+rtld_hidden_proto (_dl_mcount)
 
 /* This function is simply a wrapper around the _dl_mcount function
    which does not require a FROMPC parameter since this is the

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |   10 ++++++++++
 elf/dl-profile.c           |    2 +-
 elf/dl-runtime.c           |    2 +-
 elf/rtld.c                 |    2 +-
 sysdeps/generic/ldsodefs.h |    3 +--
 5 files changed, 14 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources