From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <hjl@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1039)
 id 68C0E3858400; Fri, 25 Feb 2022 18:36:04 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 68C0E3858400
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: H.J. Lu <hjl@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] benchtests: Generate .d dependency files [BZ #28922]
X-Act-Checkin: glibc
X-Git-Author: H.J. Lu <hjl.tools@gmail.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: cf92721befb557cecc82a862d3ac8cb6b47d4635
X-Git-Newrev: c12c2a41b0bf626f50265e67d3393e1607c9cc77
Message-Id: <20220225183604.68C0E3858400@sourceware.org>
Date: Fri, 25 Feb 2022 18:36:04 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Feb 2022 18:36:04 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c12c2a41b0bf626f50265e67d3393e1607c9cc77

commit c12c2a41b0bf626f50265e67d3393e1607c9cc77
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Feb 24 14:10:35 2022 -0800

    benchtests: Generate .d dependency files [BZ #28922]
    
    1. Add all .o files to extra-objs.
    2. Include ../Rules after extra-objs has been set.
    Reviewed-by: Carlos O'Donell <carlos@redhat.com>

Diff:
---
 benchtests/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/benchtests/Makefile b/benchtests/Makefile
index 9b8df3b3f5..d513b29903 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -296,11 +296,12 @@ bench-extra-objs = json-lib.o
 extra-objs += $(bench-extra-objs)
 others-extras = $(bench-extra-objs)
 
-include ../Rules
-
 binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
+extra-objs += $(addsuffix .o,$(addprefix bench-,$(bench)))
 binaries-benchset := $(addprefix $(objpfx)bench-,$(benchset))
+extra-objs += $(addsuffix .o,$(addprefix bench-,$(benchset)))
 binaries-bench-malloc := $(addprefix $(objpfx)bench-,$(bench-malloc))
+extra-objs += $(addsuffix .o,$(addprefix bench-,$(bench-malloc)))
 
 # The default duration: 1 seconds.
 ifndef BENCH_DURATION
@@ -334,6 +335,9 @@ run-bench = $(test-wrapper-env) \
 	    $($*-ENV) $(test-via-rtld-prefix) $${run}
 
 timing-type := $(objpfx)bench-timing-type
+extra-objs += bench-timing-type.o
+
+include ../Rules
 
 # This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed
 # for all these modules.