[PATCH] kbuild: get lib-y objects back to static library

From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	Masahiro Yamada <masahiroy@kernel.org>,
	Nathan Chancellor <nathan@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	Nicolas Schier <nicolas@fjasle.eu>
Subject: [PATCH] kbuild: get lib-y objects back to static library
Date: Wed, 23 Aug 2023 21:08:16 +0900	[thread overview]
Message-ID: <20230823120816.824352-1-masahiroy@kernel.org> (raw)

Revert the following two commits:

 - 7273ad2b08f8 ("kbuild: link lib-y objects to vmlinux forcibly when CONFIG_MODULES=y")
 - 7f2084fa55e6 ("[kbuild] handle exports in lib-y objects reliably")

Now, lib-y is back to static library again, and the link order is
consistent w/wo CONFIG_MODULES.

Since commit ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by
modpost"), .vmlinux.export.c contains references to exported symbols.
If a symbol in a lib-y object is exported, that object is always linked
even without any explicit user in vmlinux.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Makefile b/Makefile
index 87a9eef3fb4b..71e9c65d9eae 100644
--- a/Makefile
+++ b/Makefile
@@ -1113,12 +1113,7 @@ export ARCH_DRIVERS	:= $(drivers-y) $(drivers-m)
 # Externally visible symbols (used by link-vmlinux.sh)
 
 KBUILD_VMLINUX_OBJS := ./built-in.a
-ifdef CONFIG_MODULES
-KBUILD_VMLINUX_OBJS += $(patsubst %/, %/lib.a, $(filter %/, $(libs-y)))
-KBUILD_VMLINUX_LIBS := $(filter-out %/, $(libs-y))
-else
 KBUILD_VMLINUX_LIBS := $(patsubst %/,%/lib.a, $(libs-y))
-endif
 
 export KBUILD_VMLINUX_LIBS
 export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds
-- 
2.39.2

