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 bfc20d68817a8ebdb95b5ed4b34fc85368f6808e..768f235a084b136f1c21bb31aec5a38fdf9bef8b 100644 (file)
--- 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 37788e8c3185e17f78c8cde624f57245ba37acd4..a0c34703984e548ddd58398062c9cac7461daeff 100644 (file)
--- 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) \