From patchwork Sat Jul 31 06:00:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 12412285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BF45C4338F for ; Sat, 31 Jul 2021 06:01:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 375E86069E for ; Sat, 31 Jul 2021 06:01:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 375E86069E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=MylU0+H+iXbyVw4CFClLSZhhzwiC55dBbtec79OYRxc=; b=O7WygYKm7l3xos DadjNLheNQ5AiifNoXncEwKec4mSzB1qfPQNCu75nJZZurbmPwe2dT4TpuuCal6q45tNKb88DlOkX hKXJntYaIoTCh7e5sggH+XfRYjcj/5O6dIILddM45AaT1NQAdYwOuXGJnD0JtXzhlRW53QvsCZnCz mPXNO0248ch4BwwZNO34+jy1QMqt04MbDOtlJUnflxZpZk77FEhtv3NOV0hrjeLGbZNtN+um/14fE ClHB9bzm5G+S0T8G6GJqzY+B2B5UbMaNieripULpR9yBNbMInGQvAhMiZu53AM/j6/t3ZxNSGJBAW DDEJdDdbRXTr1QvFNriA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m9i44-00B2EM-9n; Sat, 31 Jul 2021 06:01:40 +0000 Received: from conuserg-07.nifty.com ([210.131.2.74]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m9i3r-00B2D0-2q; Sat, 31 Jul 2021 06:01:29 +0000 Received: from localhost.localdomain ([133.106.57.58]) (authenticated) by conuserg-07.nifty.com with ESMTP id 16V60MNT006940; Sat, 31 Jul 2021 15:00:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 16V60MNT006940 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1627711224; bh=E1KYte6EKYvuOXcazzHUuX4uprDRxjj1nwZUGGg69y0=; h=From:To:Cc:Subject:Date:From; b=Ks+HHPyiQsB4OoMywyC5471MbAfkkwSCZmNeD3PTw1B3lkQ77LuPVzltS9vjmtHEv gj73bxnaUqARREufMNwMwgIeatkcHNp+6iL5DFpOkOZ05S0IRw2JTwUe+pgLfMC2L1 cEcFnXt4M31ltZPd8C9XlBCW/oU5ZzLVPIHyRUkUYUMicyzf043T8Yh6JSVAuLdhBk cp901SEFrI1NoseIv+DFPesUZambG8FswAOb3cMqcFgucI8L/apFEImtob/q4dTCVw GXnsE6nm0/tOCQrT/4SXRTAGep0guoXmym5jgKo0iB+B3ILb8JHYquSWBPqdhTHxxV F030NsS4YZ7mQ== X-Nifty-SrcIP: [133.106.57.58] From: Masahiro Yamada To: Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , linux-kernel@vger.kernel.org Cc: Masahiro Yamada , Will Deacon , Thomas Bogendoerfer , Palmer Dabbelt , Michael Ellerman , Catalin Marinas , Benjamin Herrenschmidt , Guo Ren , linux-mips@vger.kernel.org, Paul Mackerras , linux-csky@vger.kernel.org, linux-riscv@lists.infradead.org, Albert Ou , linuxppc-dev@lists.ozlabs.org, Russell King , linux-arm-kernel@lists.infradead.org, Paul Walmsley Subject: [PATCH v2] arch: vdso: remove if-conditionals of $(c-gettimeofday-y) Date: Sat, 31 Jul 2021 15:00:20 +0900 Message-Id: <20210731060020.12913-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210730_230127_403592_346B3704 X-CRM114-Status: UNSURE ( 9.12 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org arm, arm64, csky, mips, powerpc always select GENERIC_GETTIMEOFDAY, hence $(gettimeofday-y) never becomes empty. riscv conditionally selects GENERIC_GETTIMEOFDAY when MMU=y && 64BIT=y, but arch/riscv/kernel/vdso/vgettimeofday.o is built only under that condition. So, you can always define CFLAGS_vgettimeofday.o Remove all the meaningless conditionals. Signed-off-by: Masahiro Yamada Acked-by: Michael Ellerman (powerpc) Acked-by: Catalin Marinas Acked-by: Thomas Bogendoerfer --- Changes in v2: - Fix csky as well arch/arm/vdso/Makefile | 4 ---- arch/arm64/kernel/vdso/Makefile | 5 +---- arch/arm64/kernel/vdso32/Makefile | 3 --- arch/csky/kernel/vdso/Makefile | 4 +--- arch/mips/vdso/Makefile | 2 -- arch/powerpc/kernel/vdso32/Makefile | 14 ++++++-------- arch/powerpc/kernel/vdso64/Makefile | 14 ++++++-------- arch/riscv/kernel/vdso/Makefile | 5 +---- 8 files changed, 15 insertions(+), 36 deletions(-) diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile index 7c9e395b77f7..d996b57ca19d 100644 --- a/arch/arm/vdso/Makefile +++ b/arch/arm/vdso/Makefile @@ -29,11 +29,7 @@ CFLAGS_REMOVE_vdso.o = -pg # Force -O2 to avoid libgcc dependencies CFLAGS_REMOVE_vgettimeofday.o = -pg -Os $(GCC_PLUGINS_CFLAGS) -ifeq ($(c-gettimeofday-y),) -CFLAGS_vgettimeofday.o = -O2 -else CFLAGS_vgettimeofday.o = -O2 -include $(c-gettimeofday-y) -endif # Disable gcov profiling for VDSO code GCOV_PROFILE := n diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile index 945e6bb326e3..5545c28e0e6e 100644 --- a/arch/arm64/kernel/vdso/Makefile +++ b/arch/arm64/kernel/vdso/Makefile @@ -37,10 +37,7 @@ OBJECT_FILES_NON_STANDARD := y KCOV_INSTRUMENT := n CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny -fasynchronous-unwind-tables - -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) -endif +CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) # Disable gcov profiling for VDSO code GCOV_PROFILE := n diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 3dba0c4f8f42..330111046afc 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -133,10 +133,7 @@ hostprogs := $(munge) c-obj-vdso := note.o c-obj-vdso-gettimeofday := vgettimeofday.o - -ifneq ($(c-gettimeofday-y),) VDSO_CFLAGS_gettimeofday_o += -include $(c-gettimeofday-y) -endif VDSO_CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -Os diff --git a/arch/csky/kernel/vdso/Makefile b/arch/csky/kernel/vdso/Makefile index 0b6909f10667..432adf2c78c2 100644 --- a/arch/csky/kernel/vdso/Makefile +++ b/arch/csky/kernel/vdso/Makefile @@ -12,9 +12,7 @@ vdso-syms += vgettimeofday # Files to link into the vdso obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) -endif +CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) ccflags-y := -fno-stack-protector -DBUILD_VDSO32 diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 1b2ea34c3d3b..c409d551972a 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -36,7 +36,6 @@ cflags-vdso := $(ccflags-vdso) \ aflags-vdso := $(ccflags-vdso) \ -D__ASSEMBLY__ -Wa,-gdwarf-2 -ifneq ($(c-gettimeofday-y),) CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y) # config-n32-o32-env.c prepares the environment to build a 32bit vDSO @@ -44,7 +43,6 @@ CFLAGS_vgettimeofday.o = -include $(c-gettimeofday-y) # Note: Needs to be included before than the generic library. CFLAGS_vgettimeofday-o32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -include $(c-gettimeofday-y) CFLAGS_vgettimeofday-n32.o = -include $(srctree)/$(src)/config-n32-o32-env.c -include $(c-gettimeofday-y) -endif CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile index 7d9a6fee0e3d..2386abc6fa58 100644 --- a/arch/powerpc/kernel/vdso32/Makefile +++ b/arch/powerpc/kernel/vdso32/Makefile @@ -7,14 +7,12 @@ include $(srctree)/lib/vdso/Makefile obj-vdso32 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o getcpu.o -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) - CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) - CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) - CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING - CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables - CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -endif +CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) +CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) +CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) +CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING +CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables +CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) # Build rules diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile index 2813e3f98db6..cdf748ebdcde 100644 --- a/arch/powerpc/kernel/vdso64/Makefile +++ b/arch/powerpc/kernel/vdso64/Makefile @@ -6,14 +6,12 @@ include $(srctree)/lib/vdso/Makefile obj-vdso64 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o getcpu.o -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) - CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) - CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) - CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING - CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables - CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) -endif +CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y) +CFLAGS_vgettimeofday.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) +CFLAGS_vgettimeofday.o += $(call cc-option, -fno-stack-protector) +CFLAGS_vgettimeofday.o += -DDISABLE_BRANCH_PROFILING +CFLAGS_vgettimeofday.o += -ffreestanding -fasynchronous-unwind-tables +CFLAGS_REMOVE_vgettimeofday.o = $(CC_FLAGS_FTRACE) # Build rules diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile index 24d936c147cd..7653767a6100 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile @@ -17,10 +17,7 @@ vdso-syms += flush_icache obj-vdso = $(patsubst %, %.o, $(vdso-syms)) note.o ccflags-y := -fno-stack-protector - -ifneq ($(c-gettimeofday-y),) - CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) -endif +CFLAGS_vgettimeofday.o += -fPIC -include $(c-gettimeofday-y) # Build rules targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-syms.S