qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Otherwise, this will lead to link failures due to hidden symbol
references.
This commit is contained in:
Florian Weimer 2017-08-21 19:28:54 +02:00
parent b5889d25e9
commit 4504783c0f
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2017-08-21 Florian Weimer <fweimer@redhat.com>
[BZ #21972] [BZ #21972]

9
benchtests/Makefile
View File

@ -93,6 +93,11 @@ $(objpfx)bench-malloc-thread: $(shared-thread-library)
# affect their performance. # affect their performance.
.NOTPARALLEL: .NOTPARALLEL:
bench-extra-objs = json-lib.o
extra-objs += $(bench-extra-objs)
others-extras = $(bench-extra-objs)
include ../Rules include ../Rules
binaries-bench := $(addprefix $(objpfx)bench-,$(bench)) binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
@ -125,10 +130,6 @@ cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
lib := nonlib lib := nonlib
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) 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 bench-deps := bench-skeleton.c bench-timing.h Makefile
run-bench = $(test-wrapper-env) \ run-bench = $(test-wrapper-env) \