Unverified Commit 2d0ec4a9 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Nathan Chancellor
Browse files

kbuild: userprogs: avoid duplication of flags inherited from kernel 



The duplication makes maintenance harder. Changes need to be done in two
places and the lines will grow overly long.

Use an intermediary variable instead.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: default avatarNicolas Schier <n.schier@avm.de>
Acked-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20250813-kbuild-userprogs-bits-v1-1-2d9f7f411083@linutronix.de


Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
parent 27758d8c

Makefile

+3 −2
Original line number Diff line number Diff line
@@ -1135,8 +1135,9 @@ LDFLAGS_vmlinux += --emit-relocs --discard-none 
endif



# Align the bit size of userspace programs with the kernel

KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))

USERFLAGS_FROM_KERNEL := -m32 -m64 --target=%

KBUILD_USERCFLAGS  += $(filter $(USERFLAGS_FROM_KERNEL), $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter $(USERFLAGS_FROM_KERNEL), $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))



# userspace programs are linked via the compiler, use the correct linker

ifdef CONFIG_CC_IS_CLANG