aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--benchtests/Makefile9
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bfc20d6881..768f235a08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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]
* assert/assert.h (assert): Use static_cast (bool) for C++.
Use the ternary operator in the warning branch for GNU C.
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 37788e8c31..a0c3470398 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) \