[PATCH] arch: vdso: remove if-conditionals of $(c-gettimeofday-y)
From: Masahiro Yamada <masahiroy@kernel.org>
Date: 2021-07-31 06:00:58
Also in:
linux-mips, linux-riscv, linuxppc-dev, lkml
Subsystem:
arm port, arm64 port (aarch64 architecture), linux for powerpc (32-bit and 64-bit), mips, risc-v architecture, the rest · Maintainers:
Russell King, Catalin Marinas, Will Deacon, Madhavan Srinivasan, Michael Ellerman, Thomas Bogendoerfer, Paul Walmsley, Palmer Dabbelt, Albert Ou, Linus Torvalds
arm, arm64, 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 <masahiroy@kernel.org> --- arch/arm/vdso/Makefile | 4 ---- arch/arm64/kernel/vdso/Makefile | 5 +---- arch/arm64/kernel/vdso32/Makefile | 3 --- arch/mips/vdso/Makefile | 2 -- arch/powerpc/kernel/vdso32/Makefile | 14 ++++++-------- arch/powerpc/kernel/vdso64/Makefile | 14 ++++++-------- arch/riscv/kernel/vdso/Makefile | 5 +---- 7 files changed, 14 insertions(+), 33 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/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
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel