GNU C Library master sources branch master updated. glibc-2.26-581-g7ece6cd

[fw 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  7ece6cd509703ee151092a50956dbd45ca1b13da (commit)
       via  d8287b36ab44aa2bc3ba59b97433bcf0ab6ae0e8 (commit)
      from  3480ddc40b8f9a9fb277fe1883e359db3db0ab17 (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=7ece6cd509703ee151092a50956dbd45ca1b13da

commit 7ece6cd509703ee151092a50956dbd45ca1b13da
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Oct 16 20:52:34 2017 +0200

    malloc: Use compat_symbol_reference in libmcheck [BZ #22050]
    
    Since glibc 2.24, __malloc_initialize_hook is a compat symbol.  As a
    result, the link editor does not export a definition of
    __malloc_initialize_hook from the main program, so that it no longer
    interposes the variable definition in libc.so.  Specifying the symbol
    version restores the exported symbol.

diff --git a/ChangeLog b/ChangeLog
index c10cb9f..f860884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2017-10-16  Florian Weimer  <fweimer@redhat.com>
 
+	[BZ #22050]
+	* malloc/mcheck-init.c (__malloc_initialize_hook): Use
+	compat_symbol_reference to access non-default version.
+
+2017-10-16  Florian Weimer  <fweimer@redhat.com>
+
 	* malloc/Makefile (others-extras): Set to mcheck-init.o.
 
 2017-10-16  Carlos O'Donell  <carlos@redhat.com>
diff --git a/malloc/mcheck-init.c b/malloc/mcheck-init.c
index 6d2492e..05bf032 100644
--- a/malloc/mcheck-init.c
+++ b/malloc/mcheck-init.c
@@ -20,6 +20,7 @@
 
 #include <malloc.h>
 #include <mcheck.h>
+#include <shlib-compat.h>
 
 static void
 turn_on_mcheck (void)
@@ -28,3 +29,5 @@ turn_on_mcheck (void)
 }
 
 void (*__malloc_initialize_hook) (void) = turn_on_mcheck;
+compat_symbol_reference (libc, __malloc_initialize_hook,
+                         __malloc_initialize_hook, GLIBC_2_0);

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

commit d8287b36ab44aa2bc3ba59b97433bcf0ab6ae0e8
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon Oct 16 20:50:04 2017 +0200

    malloc: Do not compile mcheck-init.o as libc module
    
    Otherwise, this will lead to a link failure because the reference
    to mcheck is hidden.

diff --git a/ChangeLog b/ChangeLog
index debac64..c10cb9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-10-16  Florian Weimer  <fweimer@redhat.com>
+
+	* malloc/Makefile (others-extras): Set to mcheck-init.o.
+
 2017-10-16  Carlos O'Donell  <carlos@redhat.com>
 
 	* include/shlib-compat.h (compat_symbol_reference): Update
diff --git a/malloc/Makefile b/malloc/Makefile
index 6cf78e1..7ae3d82 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -100,6 +100,7 @@ LDFLAGS-tst-mallocstate = -rdynamic
 
 # These should be removed by `make clean'.
 extra-objs = mcheck-init.o libmcheck.a
+others-extras = mcheck-init.o
 
 # Include the cleanup handler.
 aux := set-freeres thread-freeres

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

Summary of changes:
 ChangeLog            |   10 ++++++++++
 malloc/Makefile      |    1 +
 malloc/mcheck-init.c |    3 +++
 3 files changed, 14 insertions(+), 0 deletions(-)


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