This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
[glibc] benchtests: Enable BIND_NOW if configured with --enable-bind-now
- From: Florian Weimer <fw at sourceware dot org>
- To: glibc-cvs at sourceware dot org
- Date: 25 Apr 2019 12:32:07 -0000
- Subject: [glibc] benchtests: Enable BIND_NOW if configured with --enable-bind-now
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b5ffdc48c20ae865b197b67e5a9068a528fbc198
commit b5ffdc48c20ae865b197b67e5a9068a528fbc198
Author: Florian Weimer <fweimer@redhat.com>
Date: Thu Apr 25 10:41:52 2019 +0200
benchtests: Enable BIND_NOW if configured with --enable-bind-now
Benchmarks should reflect distribution build policies, so it makes
sense to honor the BIND_NOW configuration for them.
This commit keeps using $(+link-tests), so that the benchmarks are
linked according to the --enable-hardcoded-path-in-tests configure
option.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diff:
---
ChangeLog | 7 +++++++
benchtests/Makefile | 12 ++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3b678cf..d735e1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2019-04-25 Florian Weimer <fweimer@redhat.com>
+ benchtests: Enable BIND_NOW if configured with --enable-bind-now.
+ * benchtests/Makefile [$(bind-now)] (link-bench-bind-now): Set.
+ (bench-link-targets): New variable.
+ ($(binaries-bench) â?¦): Use it. Set LDFLAGS accordingly.
+
+2019-04-25 Florian Weimer <fweimer@redhat.com>
+
Also enable BIND_NOW for programs if --enable-bind-now.
* Makeconfig [$(bind-now)] (link-extra-flags): Add -Wl,-z,now.
(+link-pie): Use $(link-extra-flags).
diff --git a/benchtests/Makefile b/benchtests/Makefile
index c9dca7e..b8ac9ea 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -236,13 +236,21 @@ bench-func: $(binaries-bench)
scripts/benchout.schema.json; \
fi
-$(timing-type) $(binaries-bench) $(binaries-benchset) \
- $(binaries-bench-malloc): %: %.o $(objpfx)json-lib.o \
+ifeq ($(bind-now),yes)
+link-bench-bind-now = -Wl,-z,now
+endif
+
+bench-link-targets = $(timing-type) $(binaries-bench) $(binaries-benchset) \
+ $(binaries-bench-malloc)
+
+$(bench-link-targets): %: %.o $(objpfx)json-lib.o \
$(link-extra-libs-tests) \
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
$(+link-tests)
+$(bench-link-targets): LDFLAGS += $(link-bench-bind-now)
+
$(objpfx)bench-%.c: %-inputs $(bench-deps)
{ if [ -n "$($*-INCLUDE)" ]; then \
cat $($*-INCLUDE); \