From: Arjun Shankar <arjun@redhat.com>
Date: Tue, 26 Jan 2021 17:14:19 +0000 (+0100)
Subject: benchtests: Do not build bench-timing-type with MODULE_NAME=libc
X-Git-Tag: upstream/2.34~1023
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3725ee39dbd4d7c17fc276b3ea4248cc16e4b522;p=platform%2Fupstream%2Fglibc.git

benchtests: Do not build bench-timing-type with MODULE_NAME=libc

Since commit 2682695e5c7a, `make bench-build' with `--enable-static-pie'
fails due to bench-timing-type being incorrectly built with MODULE_NAME
set to `libc'.  This commit sets MODULE_NAME to nonlib, thus fixing the
build failure.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
---

diff --git a/benchtests/Makefile b/benchtests/Makefile
index 4cd99de..12bd25a 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -156,13 +156,6 @@ ifdef DETAILED
 DETAILED_OPT := -d
 endif
 
-# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed
-# for all these modules.
-cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
-		 $(binaries-bench-malloc:=.c)
-lib := nonlib
-include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
-
 bench-deps := bench-skeleton.c bench-timing.h Makefile
 
 run-bench = $(test-wrapper-env) \
@@ -171,6 +164,13 @@ run-bench = $(test-wrapper-env) \
 
 timing-type := $(objpfx)bench-timing-type
 
+# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed
+# for all these modules.
+cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
+		 $(binaries-bench-malloc:=.c) $(timing-type:=.c)
+lib := nonlib
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
+
 bench-clean:
 	rm -f $(binaries-bench) $(addsuffix .o,$(binaries-bench))
 	rm -f $(binaries-benchset) $(addsuffix .o,$(binaries-benchset))