From patchwork Tue Jan 26 15:33:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 41820 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7350C3851C31; Tue, 26 Jan 2021 15:33:48 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from aloka.lostca.se (aloka.lostca.se [178.63.46.202]) by sourceware.org (Postfix) with ESMTPS id ECB6D385DC1A for ; Tue, 26 Jan 2021 15:33:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org ECB6D385DC1A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lostca.se Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arjun.is@lostca.se Received: from aloka.lostca.se (aloka [127.0.0.1]) by aloka.lostca.se (Postfix) with ESMTP id EFD7413586 for ; Tue, 26 Jan 2021 15:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=lostca.se; h=date:from:to :subject:message-id:mime-version:content-type; s=howrah; bh=rm3G BilapIL2K4kaCGFiDS90/xw=; b=nvv03hSluFIZY3yJz8YqUjuWZs1hxcjuBNdB sQv5/F6vIgM6e8Jtlftk57HnvXQwZ4fttkIIOjoc80Xj1jYSovLl9Hm2IbZXEns0 YN28ijq8f1AWX8VfshB+IDT0lTsXqxZDH29hZzT3xR4E5LfWCOoR89QnysmIDEPb 6I/xMTQ= Received: from localhost (unknown [IPv6:2a01:4f8:120:624c::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: spectre) by aloka.lostca.se (Postfix) with ESMTPSA id 9087113585 for ; Tue, 26 Jan 2021 15:33:41 +0000 (UTC) Date: Tue, 26 Jan 2021 15:33:41 +0000 From: Arjun Shankar To: libc-alpha@sourceware.org Subject: [PATCH] benchtests: Do not build bench-timing-type with MODULE_NAME=libc Message-ID: <20210126153340.GA8125@aloka.lostca.se> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From: Arjun Shankar 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 --- benchtests/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/benchtests/Makefile b/benchtests/Makefile index 4cd99deb33..12bd25a57c 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))