From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 16 Oct 2017 18:50:04 +0000 (+0200)
Subject: malloc: Do not compile mcheck-init.o as libc module
X-Git-Tag: glibc-2.27~679
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8287b36ab44aa2bc3ba59b97433bcf0ab6ae0e8;p=thirdparty%2Fglibc.git

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 debac64d25a..c10cb9fd22e 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 6cf78e1177f..7ae3d825b99 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