From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 21 Aug 2017 17:28:54 +0000 (+0200)
Subject: benchtests: Do not compile benchmark objects as libc modules [BZ #21864]
X-Git-Tag: glibc-2.27~1109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4504783c0f65b7074204c6126c6255ed89d6594e;p=thirdparty%2Fglibc.git

benchtests: Do not compile benchmark objects as libc modules [BZ #21864]

Otherwise, this will lead to link failures due to hidden symbol
references.
---

diff --git a/ChangeLog b/ChangeLog
index bfc20d68817..768f235a084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-21  Florian Weimer  <fweimer@redhat.com>
+
+	[BZ #21864]
+	Do not compile benchmark helper objects with -DMODULE_NAME=libc.
+	* benchtests/Makefile (others-extras): Set to $(bench-extra-objs).
+	Move before inclusion of ../Rules.
+
 2017-08-21  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #21972]
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 37788e8c318..a0c34703984 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -93,6 +93,11 @@ $(objpfx)bench-malloc-thread: $(shared-thread-library)
 # affect their performance.
 .NOTPARALLEL:
 
+bench-extra-objs = json-lib.o
+
+extra-objs += $(bench-extra-objs)
+others-extras = $(bench-extra-objs)
+
 include ../Rules
 
 binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
@@ -125,10 +130,6 @@ cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
 lib := nonlib
 include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
-bench-extra-objs = json-lib.o
-
-extra-objs += $(bench-extra-objs)
-
 bench-deps := bench-skeleton.c bench-timing.h Makefile
 
 run-bench = $(test-wrapper-env) \