diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-08-21 19:28:54 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-08-21 19:28:54 +0200 |
| commit | 4504783c0f65b7074204c6126c6255ed89d6594e (patch) | |
| tree | 4dff346e2d1b27ddbacded0b3f2b07e405855bd5 | |
| parent | b5889d25e9bf944a89fdd7bcabf3b6c6f6bb6f7c (diff) | |
| download | glibc-4504783c0f65b7074204c6126c6255ed89d6594e.tar.gz glibc-4504783c0f65b7074204c6126c6255ed89d6594e.tar.xz glibc-4504783c0f65b7074204c6126c6255ed89d6594e.zip | |
benchtests: Do not compile benchmark objects as libc modules [BZ #21864]
Otherwise, this will lead to link failures due to hidden symbol references.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | benchtests/Makefile | 9 |
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) \ |