From nobody Thu Apr 2 13:29:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1126EC07E9D for ; Sat, 24 Sep 2022 18:20:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233855AbiIXSUw (ORCPT ); Sat, 24 Sep 2022 14:20:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230181AbiIXSU1 (ORCPT ); Sat, 24 Sep 2022 14:20:27 -0400 Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6438B2ED4A; Sat, 24 Sep 2022 11:20:24 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-11.nifty.com with ESMTP id 28OIJItR005682; Sun, 25 Sep 2022 03:19:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 28OIJItR005682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664043559; bh=AHNswuJHUPX2FMhUYMyi5pOOf1P/SvFBM5veflJK/Zs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HvWECC//isvqaxq2AUBaXfeSphNVauRrnBSOKQCl5CZarEs6QiwnlCnkl4zQSnmxK xvC8vnldS3lXuSJ2A+r/CHGDwJqOR2A+JYoDwonBG6dw/dVhiVyZG80J8dL2Mb6pVx L8tMNzfpy0QthB90OcferRIcNkM00PBdFrBdX0o9lUklBqu9aJsFR0VsxYgBl/R53O nONZq6sjlJA1qYpHj/B4MIkxVqx4M5qfxIWux6y8wrJY+Al0GgvOSOmIOyJ+yQd9Pu k00DIGgrpPAhGh6OmYY3kquI2gIXu+7Qx/umszOOidsRsrkkkn3YmgBg6Y2Kr2N0Dv TddNgIJDWeFBA== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Masahiro Yamada Subject: [PATCH v3 1/7] kbuild: hard-code KBUILD_ALLDIRS in scripts/Makefile.package Date: Sun, 25 Sep 2022 03:19:09 +0900 Message-Id: <20220924181915.3251186-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220924181915.3251186-1-masahiroy@kernel.org> References: <20220924181915.3251186-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" My plan is to list subdirectories in ./Kbuild. Once it occurs, $(vmlinux-alldirs) will not contain all subdirectories. Let's hard-code the directory list until I get around to implementing a more sophisticated way for generating a source tarball. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Nick Desaulniers --- Changes in v3: - New patch Makefile | 2 -- scripts/Makefile.package | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 57cf4a5bea6d..eb4bbbc898d0 100644 --- a/Makefile +++ b/Makefile @@ -1129,8 +1129,6 @@ KBUILD_VMLINUX_OBJS +=3D $(patsubst %/,%/built-in.a, = $(drivers-y)) =20 export KBUILD_VMLINUX_OBJS KBUILD_VMLINUX_LIBS export KBUILD_LDS :=3D arch/$(SRCARCH)/kernel/vmlinux.lds -# used by scripts/Makefile.package -export KBUILD_ALLDIRS :=3D $(sort $(filter-out arch/%,$(vmlinux-alldirs)) = LICENSES arch include scripts tools) =20 vmlinux-deps :=3D $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LI= BS) =20 diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 5017f6b2da80..8bbcced67c22 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -29,7 +29,10 @@ KDEB_SOURCENAME ?=3D linux-upstream KBUILD_PKG_ROOTCMD ?=3D"fakeroot -u" export KDEB_SOURCENAME # Include only those top-level files that are needed by make, plus the GPL= copy -TAR_CONTENT :=3D $(KBUILD_ALLDIRS) .config .scmversion Makefile \ +TAR_CONTENT :=3D Documentation LICENSES arch block certs crypto drivers fs= \ + include init io_uring ipc kernel lib mm net samples scripts= \ + security sound tools usr virt \ + .config .scmversion Makefile \ Kbuild Kconfig COPYING $(wildcard localversion*) MKSPEC :=3D $(srctree)/scripts/package/mkspec =20 --=20 2.34.1 From nobody Thu Apr 2 13:29:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EAC1C32771 for ; Sat, 24 Sep 2022 18:21:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233785AbiIXSU5 (ORCPT ); Sat, 24 Sep 2022 14:20:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbiIXSU2 (ORCPT ); Sat, 24 Sep 2022 14:20:28 -0400 Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EBE42F380; Sat, 24 Sep 2022 11:20:25 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-11.nifty.com with ESMTP id 28OIJItS005682; Sun, 25 Sep 2022 03:19:19 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 28OIJItS005682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664043560; bh=6eCSbvyDGZd71EFmTW50BnBOpDQgEie3TI2OqyyCjqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FLcpNy0A9tY3rTzs1OoV+z8TlwqSD0G27zFC1UWOe9keYguq1S5pb+O2qSl0nKLeQ OWyT3axHVhTtnqbaEduSTyXj4R/WywK8Zl991AF+fWQWipEt6XsPsHkgQzVQyDJ4nd i/qEigNy+knI/3vRHh5h0cjKUSfkYSaJ3QifbA23eghxiYkmLvELrLEBfebLCiPmrk aE7rWx5wrZjHZiCswPpHY12algVGcCUkgq6WYCjcKutT5v3dqe1feXGj8AqZUA+Vy6 VWB0KAvZOrLP0SidFVnxhTL4pH9j9HJTIVzyuuEi9Pfh07yw5PXk0Rqz1B2Oi7DaZe Vc9ACnyg+MdYw== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Masahiro Yamada Subject: [PATCH v3 2/7] kbuild: list sub-directories in ./Kbuild Date: Sun, 25 Sep 2022 03:19:10 +0900 Message-Id: <20220924181915.3251186-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220924181915.3251186-1-masahiroy@kernel.org> References: <20220924181915.3251186-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use the ordinary obj-y syntax to list subdirectories. Note1: Previously, the link order of lib-y depended on CONFIG_MODULES; lib-y was linked before drivers-y when CONFIG_MODULES=3Dy, otherwise after drivers-y. This was a bug of commit 7273ad2b08f8 ("kbuild: link lib-y objects to vmlinux forcibly when CONFIG_MODULES=3Dy"), but it was not a big deal after all. Now, all objects listed in lib-y are linked last, irrespective of CONFIG_MODULES. Note2: Finally, the single target build in arch/*/lib/ works correctly. There was a bug report about this. [1] $ make ARCH=3Darm arch/arm/lib/findbit.o CALL scripts/checksyscalls.sh AS arch/arm/lib/findbit.o [1]: https://lore.kernel.org/linux-kbuild/YvUQOwL6lD4%2F5%2FU6@shell.armlin= ux.org.uk/ Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Nick Desaulniers --- Changes in v3: - Also move libs-y to fix the bug reported by: https://lore.kernel.org/linux-kbuild/20220921043946.GA1355561@roeck-us= .net/ Kbuild | 24 ++++++++++++++++ Makefile | 65 ++++++++++++++------------------------------ scripts/Makefile.lib | 2 ++ 3 files changed, 46 insertions(+), 45 deletions(-) diff --git a/Kbuild b/Kbuild index 0b9e8a16a621..8a37584d1fd6 100644 --- a/Kbuild +++ b/Kbuild @@ -72,3 +72,27 @@ $(atomic-checks): $(obj)/.checked-%: include/linux/atomi= c/% FORCE PHONY +=3D prepare prepare: $(offsets-file) missing-syscalls $(atomic-checks) @: + +# Ordinary directory descending +# ------------------------------------------------------------------------= --- + +obj-y +=3D init/ +obj-y +=3D usr/ +obj-y +=3D arch/$(SRCARCH)/ +obj-y +=3D $(ARCH_CORE) +obj-y +=3D kernel/ +obj-y +=3D certs/ +obj-y +=3D mm/ +obj-y +=3D fs/ +obj-y +=3D ipc/ +obj-y +=3D security/ +obj-y +=3D crypto/ +obj-$(CONFIG_BLOCK) +=3D block/ +obj-$(CONFIG_IO_URING) +=3D io_uring/ +obj-y +=3D $(ARCH_LIB) +obj-y +=3D drivers/ +obj-y +=3D sound/ +obj-$(CONFIG_SAMPLES) +=3D samples/ +obj-$(CONFIG_NET) +=3D net/ +obj-y +=3D virt/ +obj-y +=3D $(ARCH_DRIVERS) diff --git a/Makefile b/Makefile index eb4bbbc898d0..f793c3b1eaec 100644 --- a/Makefile +++ b/Makefile @@ -676,11 +676,8 @@ endif =20 ifeq ($(KBUILD_EXTMOD),) # Objects we will link into vmlinux / subdirs we need to visit -core-y :=3D init/ usr/ arch/$(SRCARCH)/ -drivers-y :=3D drivers/ sound/ -drivers-$(CONFIG_SAMPLES) +=3D samples/ -drivers-$(CONFIG_NET) +=3D net/ -drivers-y +=3D virt/ +core-y :=3D +drivers-y :=3D libs-y :=3D lib/ endif # KBUILD_EXTMOD =20 @@ -1099,33 +1096,24 @@ export MODORDER :=3D $(extmod_prefix)modules.order export MODULES_NSDEPS :=3D $(extmod_prefix)modules.nsdeps =20 ifeq ($(KBUILD_EXTMOD),) -core-y +=3D kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ -core-$(CONFIG_BLOCK) +=3D block/ -core-$(CONFIG_IO_URING) +=3D io_uring/ =20 -vmlinux-dirs :=3D $(patsubst %/,%,$(filter %/, \ - $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ - $(libs-y) $(libs-m))) - -vmlinux-alldirs :=3D $(sort $(vmlinux-dirs) Documentation . \ +build-dir :=3D . +clean-dirs :=3D $(sort . Documentation \ $(patsubst %/,%,$(filter %/, $(core-) \ $(drivers-) $(libs-)))) =20 -build-dirs :=3D $(vmlinux-dirs) -clean-dirs :=3D $(vmlinux-alldirs) - -subdir-modorder :=3D $(addsuffix /modules.order, $(build-dirs)) - +export ARCH_CORE :=3D $(core-y) +export ARCH_LIB :=3D $(filter %/, $(libs-y)) +export ARCH_DRIVERS :=3D $(drivers-y) $(drivers-m) # Externally visible symbols (used by link-vmlinux.sh) -KBUILD_VMLINUX_OBJS :=3D $(head-y) $(patsubst %/,%/built-in.a, $(core-y)) -KBUILD_VMLINUX_OBJS +=3D $(addsuffix built-in.a, $(filter %/, $(libs-y))) + +KBUILD_VMLINUX_OBJS :=3D $(head-y) ./built-in.a ifdef CONFIG_MODULES KBUILD_VMLINUX_OBJS +=3D $(patsubst %/, %/lib.a, $(filter %/, $(libs-y))) KBUILD_VMLINUX_LIBS :=3D $(filter-out %/, $(libs-y)) else KBUILD_VMLINUX_LIBS :=3D $(patsubst %/,%/lib.a, $(libs-y)) endif -KBUILD_VMLINUX_OBJS +=3D $(patsubst %/,%/built-in.a, $(drivers-y)) =20 export KBUILD_VMLINUX_OBJS KBUILD_VMLINUX_LIBS export KBUILD_LDS :=3D arch/$(SRCARCH)/kernel/vmlinux.lds @@ -1140,7 +1128,7 @@ ifdef CONFIG_TRIM_UNUSED_KSYMS # (this can be evaluated only once include/config/auto.conf has been inclu= ded) KBUILD_MODULES :=3D 1 =20 -autoksyms_recursive: descend modules.order +autoksyms_recursive: $(build-dir) modules.order $(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \ "$(MAKE) -f $(srctree)/Makefile autoksyms_recursive" endif @@ -1168,7 +1156,7 @@ targets :=3D vmlinux =20 # The actual objects are generated when descending, # make sure no implicit rule kicks in -$(sort $(vmlinux-deps) $(subdir-modorder)): descend ; +$(sort $(vmlinux-deps)): $(build-dir) ; =20 filechk_kernel.release =3D \ echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversi= on $(srctree))" @@ -1439,13 +1427,6 @@ endif =20 modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_prepare =20 -cmd_modules_order =3D cat $(real-prereqs) > $@ - -modules.order: $(subdir-modorder) FORCE - $(call if_changed,modules_order) - -targets +=3D modules.order - # Target to prepare building external modules modules_prepare: prepare $(Q)$(MAKE) $(build)=3Dscripts scripts/module.lds @@ -1716,9 +1697,7 @@ else # KBUILD_EXTMOD KBUILD_BUILTIN :=3D KBUILD_MODULES :=3D 1 =20 -build-dirs :=3D $(KBUILD_EXTMOD) -$(MODORDER): descend - @: +build-dir :=3D $(KBUILD_EXTMOD) =20 compile_commands.json: $(extmod_prefix)compile_commands.json PHONY +=3D compile_commands.json @@ -1756,6 +1735,9 @@ PHONY +=3D modules modules_install modules_prepare =20 ifdef CONFIG_MODULES =20 +$(MODORDER): $(build-dir) + @: + modules: modules_check $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost =20 @@ -1809,7 +1791,7 @@ single-no-ko :=3D $(filter-out $(single-ko), $(MAKECM= DGOALS)) \ =20 $(single-ko): single_modpost @: -$(single-no-ko): descend +$(single-no-ko): $(build-dir) @: =20 # Remove MODORDER when done because it is not the real one. @@ -1819,24 +1801,17 @@ single_modpost: $(single-no-ko) modules_prepare $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)rm -f $(MODORDER) =20 -single-goals :=3D $(addprefix $(extmod_prefix), $(single-no-ko)) - -# trim unrelated directories -build-dirs :=3D $(foreach d, $(build-dirs), \ - $(if $(filter $d/%, $(single-goals)), $d)) +single-goals :=3D $(addprefix $(build-dir)/, $(single-no-ko)) =20 endif =20 -# Handle descending into subdirectories listed in $(build-dirs) # Preset locale variables to speed up the build process. Limit locale # tweaks to this spot to avoid wrong language settings when running # make menuconfig etc. # Error messages still appears in the original language -PHONY +=3D descend $(build-dirs) -descend: $(build-dirs) -$(build-dirs): prepare - $(Q)$(MAKE) $(build)=3D$@ need-builtin=3D1 need-modorder=3D1 \ - $(filter $@/%, $(single-goals)) +PHONY +=3D $(build-dir) +$(build-dir): prepare + $(Q)$(MAKE) $(build)=3D$@ need-builtin=3D1 need-modorder=3D1 $(single-goa= ls) =20 clean-dirs :=3D $(addprefix _clean_, $(clean-dirs)) PHONY +=3D $(clean-dirs) clean diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 3fb6a99e78c4..140dcc3c57bd 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -89,6 +89,7 @@ always-y +=3D $(dtb-y) =20 # Add subdir path =20 +ifneq ($(obj),.) extra-y :=3D $(addprefix $(obj)/,$(extra-y)) always-y :=3D $(addprefix $(obj)/,$(always-y)) targets :=3D $(addprefix $(obj)/,$(targets)) @@ -100,6 +101,7 @@ multi-obj-m :=3D $(addprefix $(obj)/, $(multi-obj-m)) multi-dtb-y :=3D $(addprefix $(obj)/, $(multi-dtb-y)) real-dtb-y :=3D $(addprefix $(obj)/, $(real-dtb-y)) subdir-ym :=3D $(addprefix $(obj)/,$(subdir-ym)) +endif =20 # Finds the multi-part object the current object will be linked into. # If the object belongs to two or more multi-part objects, list them all. --=20 2.34.1 From nobody Thu Apr 2 13:29:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3243FC07E9D for ; Sat, 24 Sep 2022 18:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233641AbiIXSVH (ORCPT ); Sat, 24 Sep 2022 14:21:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229837AbiIXSU3 (ORCPT ); Sat, 24 Sep 2022 14:20:29 -0400 Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 367D12E6AF; Sat, 24 Sep 2022 11:20:27 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-11.nifty.com with ESMTP id 28OIJItT005682; Sun, 25 Sep 2022 03:19:20 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 28OIJItT005682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664043560; bh=1hjUHl39f3ahq5fbA8lEwFThtEMEkQko4lR9hIJILXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qnsXZhFniO7nRG7nF0uXwcErr+yccHtzXzvffQkPk0K+4dIJCi+YPFuzvlgdJ3/kV UgmtoD4kg/jUNQOVLt2f5Er9IxHMyX/7DJyxvq7HzUjyVohuWvVmtYtMW/PLTrc6bU ZGYM2k7Ac9iiGov++kR2jGoQ3tV19YNoV+3GGgHhj3i3dY1ty9/0OJ4zFqaefgcVB+ ZOyHMrd5yJIZlCv++FfQZarMWDfKM+ykiG5G5gREiJ0xQ3Zm73VvepO5soz+iFrwPT 8ihxs7bQXKgv80o1j9bTSEH9ZGVJ0AghVkxBPCq45l2yNCrer8mo5zts9SDxT198fy MLwIxjxx0hs6w== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Masahiro Yamada Subject: [PATCH v3 3/7] kbuild: move .vmlinux.objs rule to Makefile.modpost Date: Sun, 25 Sep 2022 03:19:11 +0900 Message-Id: <20220924181915.3251186-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220924181915.3251186-1-masahiroy@kernel.org> References: <20220924181915.3251186-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" .vmlinux.objs is used by modpost, so scripts/Makefile.modpost is a better place to generate it. It is used only when CONFIG_MODVERSIONS=3Dy. It should be guarded by "ifdef CONFIG_MODVERSIONS". Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Nick Desaulniers --- (no changes since v1) Makefile | 2 +- scripts/Makefile.modpost | 30 ++++++++++++++++++++++++++++-- scripts/link-vmlinux.sh | 18 ------------------ 3 files changed, 29 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index f793c3b1eaec..92413b6de451 100644 --- a/Makefile +++ b/Makefile @@ -1477,7 +1477,7 @@ endif # CONFIG_MODULES # Directories & files removed with 'make clean' CLEAN_FILES +=3D include/ksym vmlinux.symvers modules-only.symvers \ modules.builtin modules.builtin.modinfo modules.nsdeps \ - compile_commands.json .thinlto-cache + compile_commands.json .thinlto-cache .vmlinux.objs =20 # Directories & files removed with 'make mrproper' MRPROPER_FILES +=3D include/config include/generated \ diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 911606496341..04ad00917b2f 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -57,6 +57,32 @@ vmlinux.symvers: vmlinux.o =20 __modpost: vmlinux.symvers =20 +# Generate the list of in-tree objects in vmlinux +# ------------------------------------------------------------------------= --- + +# This is used to retrieve symbol versions generated by genksyms. +ifdef CONFIG_MODVERSIONS +vmlinux.symvers: .vmlinux.objs +endif + +# Ignore libgcc.a +# Some architectures do '$(CC) --print-libgcc-file-name' to borrow libgcc.a +# from the toolchain, but there is no EXPORT_SYMBOL in it. + +quiet_cmd_vmlinux_objs =3D GEN $@ + cmd_vmlinux_objs =3D \ + for f in $(real-prereqs); do \ + case $${f} in \ + *libgcc.a) ;; \ + *.a) $(AR) t $${f} ;; \ + *) echo $${f} ;; \ + esac \ + done > $@ + +targets +=3D .vmlinux.objs +.vmlinux.objs: $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) FORCE + $(call if_changed,vmlinux_objs) + else =20 ifeq ($(KBUILD_EXTMOD),) @@ -134,6 +160,8 @@ ifneq ($(KBUILD_MODPOST_NOFINAL),1) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal endif =20 +endif + PHONY +=3D FORCE FORCE: =20 @@ -141,6 +169,4 @@ existing-targets :=3D $(wildcard $(sort $(targets))) =20 -include $(foreach f,$(existing-targets),$(dir $(f)).$(notdir $(f)).cmd) =20 -endif - .PHONY: $(PHONY) diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 8d982574145a..161bca64e8aa 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -199,7 +199,6 @@ cleanup() rm -f System.map rm -f vmlinux rm -f vmlinux.map - rm -f .vmlinux.objs rm -f .vmlinux.export.c } =20 @@ -218,23 +217,6 @@ fi #link vmlinux.o ${MAKE} -f "${srctree}/scripts/Makefile.vmlinux_o" =20 -# Generate the list of in-tree objects in vmlinux -# -# This is used to retrieve symbol versions generated by genksyms. -for f in ${KBUILD_VMLINUX_OBJS} ${KBUILD_VMLINUX_LIBS}; do - case ${f} in - *libgcc.a) - # Some architectures do '$(CC) --print-libgcc-file-name' to - # borrow libgcc.a from the toolchain. - # There is no EXPORT_SYMBOL in external objects. Ignore this. - ;; - *.a) - ${AR} t ${f} ;; - *) - echo ${f} ;; - esac -done > .vmlinux.objs - # modpost vmlinux.o to check for section mismatches ${MAKE} -f "${srctree}/scripts/Makefile.modpost" MODPOST_VMLINUX=3D1 =20 --=20 2.34.1 From nobody Thu Apr 2 13:29:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44F10C07E9D for ; Sat, 24 Sep 2022 18:20:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231235AbiIXSUf (ORCPT ); Sat, 24 Sep 2022 14:20:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbiIXSU1 (ORCPT ); Sat, 24 Sep 2022 14:20:27 -0400 Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D36C2E9FA; Sat, 24 Sep 2022 11:20:24 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-11.nifty.com with ESMTP id 28OIJItU005682; Sun, 25 Sep 2022 03:19:21 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 28OIJItU005682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664043561; bh=uiG7rI5DI3x1bTZk8cALn27xRy6QbKgQoq+BLvGkH2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pvy6y1BulYgKIDuZM3hDfrrBZe8phtpI+YIfhSAjjGscVPpC9/p2FR+UCzfus/hkS 9qBsxudXZ4yw3QCe69bysx+uor2Xq8oWxE1qwo0B7bs9UoqFiEileS5glNBFnxSd8I mUjIbwmrwvJRi5w0VbePnXpBJxjQjCcu/mprxeWVcRMwxN30c25+PdTbA6SJ/1MOQT PLsEqROlM03icMC0umbuwKq2eY1PVnS6AFcjpb3L/TC0Ob7VG1uHXC3Hfcb4hlDnFE emcnNaYxJJrvsrREVB5snjrcBDrIB5nJuumwBWCg21gZT4qIT061Xgbgrv47c4mUlE odBqlqxTUvMwA== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Masahiro Yamada Subject: [PATCH v3 4/7] kbuild: move vmlinux.o rule to the top Makefile Date: Sun, 25 Sep 2022 03:19:12 +0900 Message-Id: <20220924181915.3251186-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220924181915.3251186-1-masahiroy@kernel.org> References: <20220924181915.3251186-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Move the build rules of vmlinux.o out of scripts/link-vmlinux.sh to clearly separate 1) pre-modpost, 2) modpost, 3) post-modpost stages. This will make furture refactoring possible. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Nick Desaulniers --- (no changes since v1) Makefile | 5 ++++- scripts/link-vmlinux.sh | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 92413b6de451..b5dfb54b1993 100644 --- a/Makefile +++ b/Makefile @@ -1142,6 +1142,9 @@ quiet_cmd_autoksyms_h =3D GEN $@ $(autoksyms_h): $(call cmd,autoksyms_h) =20 +vmlinux.o: autoksyms_recursive $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIB= S) FORCE + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux_o + ARCH_POSTLINK :=3D $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) =20 # Final link of vmlinux with optional arch pass after final link @@ -1149,7 +1152,7 @@ cmd_link-vmlinux =3D = \ $(CONFIG_SHELL) $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)"; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) =20 -vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE +vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE +$(call if_changed_dep,link-vmlinux) =20 targets :=3D vmlinux diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 161bca64e8aa..07486f90d5e2 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -214,9 +214,6 @@ if [ "$1" =3D "clean" ]; then exit 0 fi =20 -#link vmlinux.o -${MAKE} -f "${srctree}/scripts/Makefile.vmlinux_o" - # modpost vmlinux.o to check for section mismatches ${MAKE} -f "${srctree}/scripts/Makefile.modpost" MODPOST_VMLINUX=3D1 =20 --=20 2.34.1 From nobody Thu Apr 2 13:29:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9561C07E9D for ; Sat, 24 Sep 2022 18:21:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233549AbiIXSVD (ORCPT ); Sat, 24 Sep 2022 14:21:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230465AbiIXSU2 (ORCPT ); Sat, 24 Sep 2022 14:20:28 -0400 Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EC612F38F; Sat, 24 Sep 2022 11:20:25 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-11.nifty.com with ESMTP id 28OIJItV005682; Sun, 25 Sep 2022 03:19:21 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 28OIJItV005682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664043562; bh=QRD+w3WjhBq468W/Px6YQ7gYWafFAwP8D2XBoCy7WEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lrnZM8D7eCrniMP1AMslD9p2aKgimTThHIMYEKJ2EC4A4WAiq8/pb214goWDxYEY5 +4x46ynD68YuHDIj3KsEGfvawK40mlcFMO9lyUe6mna0Vm5see2WQ6TbLsvLPE/yaQ yCZTgx/0BT87qogz4n/dnMg5RuFNuYBVlFdB5TIh+le4l1JfZeFb8AQsy1v62lYd2A B5Tyy3jn+msNL74Ix+6zEC/tPLzMEz+A5ZhyGze/fh4SNwIapiFiwlimRkseZGGQoQ T7dRkAAnx/05XFfzDtpFFq5Iyz8iP90/WM1YLiHk1xIfCtodscoW2ZQyWtKZwKoNbq FL8uUVjyTTp7A== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Masahiro Yamada Subject: [PATCH v3 5/7] kbuild: unify two modpost invocations Date: Sun, 25 Sep 2022 03:19:13 +0900 Message-Id: <20220924181915.3251186-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220924181915.3251186-1-masahiroy@kernel.org> References: <20220924181915.3251186-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently, modpost is executed twice; first for vmlinux, second for modules. This commit merges them. Current build flow =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 1) build obj-y and obj-m objects 2) link vmlinux.o 3) modpost for vmlinux 4) link vmlinux 5) modpost for modules 6) link modules (*.ko) The build steps 1) through 6) are serialized, that is, modules are built after vmlinux. You do not get benefits of parallel builds when scripts/link-vmlinux.sh is being run. New build flow =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 1) build obj-y and obj-m objects 2) link vmlinux.o 3) modpost for vmlinux and modules 4a) link vmlinux 4b) link modules (*.ko) In the new build flow, modpost is invoked just once. vmlinux and modules are built in parallel. One exception is CONFIG_DEBUG_INFO_BTF_MODULES=3Dy, where modules depend on vmlinux. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Nick Desaulniers --- (no changes since v1) Makefile | 30 ++++++++++--- scripts/Makefile.modfinal | 2 +- scripts/Makefile.modpost | 93 ++++++++++++--------------------------- scripts/link-vmlinux.sh | 3 -- 4 files changed, 53 insertions(+), 75 deletions(-) diff --git a/Makefile b/Makefile index b5dfb54b1993..cf9d7b1d8c14 100644 --- a/Makefile +++ b/Makefile @@ -1152,7 +1152,7 @@ cmd_link-vmlinux =3D = \ $(CONFIG_SHELL) $< "$(LD)" "$(KBUILD_LDFLAGS)" "$(LDFLAGS_vmlinux)"; \ $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) =20 -vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) FORCE +vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) modpost FORCE +$(call if_changed_dep,link-vmlinux) =20 targets :=3D vmlinux @@ -1428,7 +1428,13 @@ endif # Build modules # =20 -modules: $(if $(KBUILD_BUILTIN),vmlinux) modules_prepare +# *.ko are usually independent of vmlinux, but CONFIG_DEBUG_INFOBTF_MODULES +# is an exception. +ifdef CONFIG_DEBUG_INFO_BTF_MODULES +modules: vmlinux +endif + +modules: modules_prepare =20 # Target to prepare building external modules modules_prepare: prepare @@ -1741,8 +1747,12 @@ ifdef CONFIG_MODULES $(MODORDER): $(build-dir) @: =20 -modules: modules_check - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost +# KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. +# This is solely useful to speed up test compiles. +modules: modpost +ifneq ($(KBUILD_MODPOST_NOFINAL),1) + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal +endif =20 PHONY +=3D modules_check modules_check: $(MODORDER) @@ -1773,6 +1783,11 @@ KBUILD_MODULES :=3D =20 endif # CONFIG_MODULES =20 +PHONY +=3D modpost +modpost: $(if $(single-build),, $(if $(KBUILD_BUILTIN), vmlinux.o)) \ + $(if $(KBUILD_MODULES), modules_check) + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost + # Single targets # ------------------------------------------------------------------------= --- # To build individual files in subdirectories, you can do like this: @@ -1792,16 +1807,19 @@ single-ko :=3D $(sort $(filter %.ko, $(MAKECMDGOALS= ))) single-no-ko :=3D $(filter-out $(single-ko), $(MAKECMDGOALS)) \ $(foreach x, o mod, $(patsubst %.ko, %.$x, $(single-ko))) =20 -$(single-ko): single_modpost +$(single-ko): single_modules @: $(single-no-ko): $(build-dir) @: =20 # Remove MODORDER when done because it is not the real one. PHONY +=3D single_modpost -single_modpost: $(single-no-ko) modules_prepare +single_modules: $(single-no-ko) modules_prepare $(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$m;) } > $(MODORDER) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost +ifneq ($(KBUILD_MODPOST_NOFINAL),1) + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal +endif $(Q)rm -f $(MODORDER) =20 single-goals :=3D $(addprefix $(build-dir)/, $(single-no-ko)) diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal index 35100e981f4a..a3cf9e3647c9 100644 --- a/scripts/Makefile.modfinal +++ b/scripts/Makefile.modfinal @@ -55,7 +55,7 @@ if_changed_except =3D $(if $(call newer_prereqs_except,$(= 2))$(cmd-check), \ printf '%s\n' 'cmd_$@ :=3D $(make-cmd)' > $(dot-target).cmd, @:) =20 # Re-generate module BTFs if either module's .ko or vmlinux changed -$(modules): %.ko: %.o %.mod.o scripts/module.lds $(if $(KBUILD_BUILTIN),vm= linux) FORCE +$(modules): %.ko: %.o %.mod.o scripts/module.lds $(and $(CONFIG_DEBUG_INFO= _BTF_MODULES),$(KBUILD_BUILTIN),vmlinux) FORCE +$(call if_changed_except,ld_ko_o,vmlinux) ifdef CONFIG_DEBUG_INFO_BTF_MODULES +$(if $(newer-prereqs),$(call cmd,btf_ko)) diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 04ad00917b2f..2daf760eeb25 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -32,9 +32,6 @@ # Step 4 is solely used to allow module versioning in external modules, # where the CRC of each module is retrieved from the Module.symvers file. =20 -# KBUILD_MODPOST_NOFINAL can be set to skip the final link of modules. -# This is solely useful to speed up test compiles - PHONY :=3D __modpost __modpost: =20 @@ -45,24 +42,23 @@ MODPOST =3D scripts/mod/modpost \ $(if $(CONFIG_MODVERSIONS),-m) \ $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ + $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \ + $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N)= \ -o $@ =20 -ifdef MODPOST_VMLINUX - -quiet_cmd_modpost =3D MODPOST $@ - cmd_modpost =3D $(MODPOST) $< - -vmlinux.symvers: vmlinux.o - $(call cmd,modpost) +# 'make -i -k' ignores compile errors, and builds as many modules as possi= ble. +ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),) +MODPOST +=3D -n +endif =20 -__modpost: vmlinux.symvers +ifeq ($(KBUILD_EXTMOD),) =20 # Generate the list of in-tree objects in vmlinux # ------------------------------------------------------------------------= --- =20 # This is used to retrieve symbol versions generated by genksyms. ifdef CONFIG_MODVERSIONS -vmlinux.symvers: .vmlinux.objs +vmlinux.symvers Module.symvers: .vmlinux.objs endif =20 # Ignore libgcc.a @@ -83,24 +79,12 @@ targets +=3D .vmlinux.objs .vmlinux.objs: $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) FORCE $(call if_changed,vmlinux_objs) =20 -else - -ifeq ($(KBUILD_EXTMOD),) - -input-symdump :=3D vmlinux.symvers -output-symdump :=3D modules-only.symvers - -quiet_cmd_cat =3D GEN $@ - cmd_cat =3D cat $(real-prereqs) > $@ - -ifneq ($(wildcard vmlinux.symvers),) - -__modpost: Module.symvers -Module.symvers: vmlinux.symvers modules-only.symvers FORCE - $(call if_changed,cat) - -targets +=3D Module.symvers +vmlinux.o-if-present :=3D $(wildcard vmlinux.o) +output-symdump :=3D vmlinux.symvers =20 +ifdef KBUILD_MODULES +output-symdump :=3D $(if $(vmlinux.o-if-present), Module.symvers, modules-= only.symvers) +missing-input :=3D $(filter-out $(vmlinux.o-if-present),vmlinux.o) endif =20 else @@ -112,56 +96,35 @@ src :=3D $(obj) # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS include $(or $(wildcard $(src)/Kbuild), $(src)/Makefile) =20 -# modpost option for external modules -MODPOST +=3D -e - -input-symdump :=3D Module.symvers $(KBUILD_EXTRA_SYMBOLS) +module.symvers-if-present :=3D $(wildcard Module.symvers) output-symdump :=3D $(KBUILD_EXTMOD)/Module.symvers +missing-input :=3D $(filter-out $(module.symvers-if-present), Module.symve= rs) =20 -endif - -existing-input-symdump :=3D $(wildcard $(input-symdump)) - -# modpost options for modules (both in-kernel and external) -MODPOST +=3D \ - $(addprefix -i ,$(existing-input-symdump)) \ - $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS)) \ - $(if $(CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS)$(KBUILD_NSDEPS),-N) - -# 'make -i -k' ignores compile errors, and builds as many modules as possi= ble. -ifneq ($(findstring i,$(filter-out --%,$(MAKEFLAGS))),) -MODPOST +=3D -n -endif +MODPOST +=3D -e $(addprefix -i ,$(module.symvers-if-present) $(KBUILD_EXTR= A_SYMBOLS)) =20 -# Clear VPATH to not search for *.symvers in $(srctree). Check only $(objt= ree). -VPATH :=3D -$(input-symdump): - @echo >&2 'WARNING: Symbol version dump "$@" is missing.' - @echo >&2 ' Modules may not have dependencies or modversions.' - @echo >&2 ' You may get many unresolved symbol warnings.' +endif # ($(KBUILD_EXTMOD),) =20 -# KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined s= ymbols -ifneq ($(KBUILD_MODPOST_WARN)$(filter-out $(existing-input-symdump), $(inp= ut-symdump)),) +ifneq ($(KBUILD_MODPOST_WARN)$(missing-input),) MODPOST +=3D -w endif =20 +modorder-if-needed :=3D $(if $(KBUILD_MODULES), $(MODORDER)) + # Read out modules.order to pass in modpost. # Otherwise, allmodconfig would fail with "Argument list too long". quiet_cmd_modpost =3D MODPOST $@ - cmd_modpost =3D sed 's/ko$$/o/' $< | $(MODPOST) -T - - -$(output-symdump): $(MODORDER) $(input-symdump) FORCE - $(call if_changed,modpost) + cmd_modpost =3D \ + $(if $(missing-input), \ + echo >&2 "WARNING: $(missing-input) is missing."; \ + echo >&2 " Modules may not have dependencies or modversions."; \ + echo >&2 " You may get many unresolved symbol warnings.";) \ + sed 's/ko$$/o/' $(or $(modorder-if-needed), /dev/null) | $(MODPOST) $(vml= inux.o-if-present) -T - =20 targets +=3D $(output-symdump) +$(output-symdump): $(modorder-if-needed) $(vmlinux.o-if-present) $(moudle.= symvers-if-present) FORCE + $(call if_changed,modpost) =20 __modpost: $(output-symdump) -ifneq ($(KBUILD_MODPOST_NOFINAL),1) - $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal -endif - -endif - PHONY +=3D FORCE FORCE: =20 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 07486f90d5e2..6a197d8a88ac 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -214,9 +214,6 @@ if [ "$1" =3D "clean" ]; then exit 0 fi =20 -# modpost vmlinux.o to check for section mismatches -${MAKE} -f "${srctree}/scripts/Makefile.modpost" MODPOST_VMLINUX=3D1 - info MODINFO modules.builtin.modinfo ${OBJCOPY} -j .modinfo -O binary vmlinux.o modules.builtin.modinfo info GEN modules.builtin --=20 2.34.1 From nobody Thu Apr 2 13:29:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C95DC07E9D for ; Sat, 24 Sep 2022 18:20:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233632AbiIXSUj (ORCPT ); Sat, 24 Sep 2022 14:20:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229893AbiIXSU1 (ORCPT ); Sat, 24 Sep 2022 14:20:27 -0400 Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A76C12E6AF; Sat, 24 Sep 2022 11:20:24 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-11.nifty.com with ESMTP id 28OIJItW005682; Sun, 25 Sep 2022 03:19:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 28OIJItW005682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664043562; bh=HKAe4r80iUdfhkQdCGBBk4XfKMOgWGo4/tF77KyRfWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UvP/r269N4LzL2WYePBrIBEHOwlKT31nP3RG16zTslPQi6+2NALjFpBmFe5HTQsKF 5QAaKoyjLnPyW6LMqwG9UAWNL/e/W/14X/imUCAWaWmFcASoZNyAtDpH1flVJtw4Pi JOc9ycLl2sWTknRRHORmJJDI4UO2FuWmapFH8znNDucCFvh0q9OK1XCW86Q2fTtj6o oDAEMx6pT6g3HViqXakzAyJeSeUBLlJkaGyBnjZ8mUhy+Va/YKqLcrzbH6PNYoa4wM yWs66e0XA2i4Yk/cepRMuGmg2Jx3gdSb81qB+M8UtojM89XI/nNa4X38kvU4h0JYue zkR+SYb6kxWcA== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Masahiro Yamada Subject: [PATCH v3 6/7] kbuild: use obj-y instead extra-y for objects placed at the head Date: Sun, 25 Sep 2022 03:19:14 +0900 Message-Id: <20220924181915.3251186-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220924181915.3251186-1-masahiroy@kernel.org> References: <20220924181915.3251186-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The objects placed at the head of vmlinux need special treatments: - arch/$(SRCARCH)/Makefile adds them to head-y in order to place them before other archives in the linker command line. - arch/$(SRCARCH)/kernel/Makefile adds them to extra-y instead of obj-y to avoid them going into built-in.a. This commit gets rid of the latter. Create vmlinux.a to collect all the objects that are unconditionally linked to vmlinux. The objects listed in head-y are moved to the head of vmlinux.a by using 'ar m'. With this, arch/$(SRCARCH)/kernel/Makefile can consistently use obj-y for builtin objects. There is no *.o that is directly linked to vmlinux. Drop unneeded code in scripts/clang-tools/gen_compile_commands.py. $(AR) mPi needs 'T' to workaround the llvm-ar bug. The fix was suggested by Nathan Chancellor [1]. [1]: https://lore.kernel.org/llvm/YyjjT5gQ2hGMH0ni@dev-arch.thelio-3990X/ Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Nick Desaulniers --- Changes in v3: - Fix build error for m68k - Fix the bug for llvm-ar <=3D 14 Documentation/kbuild/makefiles.rst | 18 +--------------- Makefile | 23 ++++++++++++++++----- arch/alpha/kernel/Makefile | 4 ++-- arch/arc/kernel/Makefile | 4 ++-- arch/arm/kernel/Makefile | 4 ++-- arch/arm64/kernel/Makefile | 4 ++-- arch/csky/kernel/Makefile | 4 ++-- arch/hexagon/kernel/Makefile | 3 ++- arch/ia64/kernel/Makefile | 4 ++-- arch/loongarch/kernel/Makefile | 4 ++-- arch/m68k/68000/Makefile | 2 +- arch/m68k/coldfire/Makefile | 2 +- arch/m68k/kernel/Makefile | 23 +++++++++++---------- arch/microblaze/kernel/Makefile | 4 ++-- arch/mips/kernel/Makefile | 4 ++-- arch/nios2/kernel/Makefile | 2 +- arch/openrisc/kernel/Makefile | 4 ++-- arch/parisc/kernel/Makefile | 4 ++-- arch/powerpc/kernel/Makefile | 20 +++++++++--------- arch/riscv/kernel/Makefile | 2 +- arch/s390/kernel/Makefile | 4 ++-- arch/sh/kernel/Makefile | 4 ++-- arch/sparc/kernel/Makefile | 3 +-- arch/x86/kernel/Makefile | 10 ++++----- arch/xtensa/kernel/Makefile | 4 ++-- scripts/Makefile.modpost | 5 ++--- scripts/Makefile.vmlinux_o | 6 +++--- scripts/clang-tools/gen_compile_commands.py | 19 +---------------- scripts/link-vmlinux.sh | 10 ++++----- 29 files changed, 91 insertions(+), 113 deletions(-) diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/make= files.rst index ee7e3ea1fbe1..5a6a8426cc97 100644 --- a/Documentation/kbuild/makefiles.rst +++ b/Documentation/kbuild/makefiles.rst @@ -340,19 +340,7 @@ more details, with real examples. =20 Examples are: =20 - 1) head objects - - Some objects must be placed at the head of vmlinux. They are - directly linked to vmlinux without going through built-in.a - A typical use-case is an object that contains the entry point. - - arch/$(SRCARCH)/Makefile should specify such objects as head-y. - - Discussion: - Given that we can control the section order in the linker script, - why do we need head-y? - - 2) vmlinux linker script + 1) vmlinux linker script =20 The linker script for vmlinux is located at arch/$(SRCARCH)/kernel/vmlinux.lds @@ -360,10 +348,6 @@ more details, with real examples. Example:: =20 # arch/x86/kernel/Makefile - extra-y :=3D head_$(BITS).o - extra-y +=3D head$(BITS).o - extra-y +=3D ebda.o - extra-y +=3D platform-quirks.o extra-y +=3D vmlinux.lds =20 $(extra-y) should only contain targets needed for vmlinux. diff --git a/Makefile b/Makefile index cf9d7b1d8c14..a8c19f92ac9e 100644 --- a/Makefile +++ b/Makefile @@ -645,6 +645,8 @@ else __all: modules endif =20 +targets :=3D + # Decide whether to build built-in, modular, or both. # Normally, just do built-in. =20 @@ -1107,7 +1109,7 @@ export ARCH_LIB :=3D $(filter %/, $(libs-y)) export ARCH_DRIVERS :=3D $(drivers-y) $(drivers-m) # Externally visible symbols (used by link-vmlinux.sh) =20 -KBUILD_VMLINUX_OBJS :=3D $(head-y) ./built-in.a +KBUILD_VMLINUX_OBJS :=3D ./built-in.a ifdef CONFIG_MODULES KBUILD_VMLINUX_OBJS +=3D $(patsubst %/, %/lib.a, $(filter %/, $(libs-y))) KBUILD_VMLINUX_LIBS :=3D $(filter-out %/, $(libs-y)) @@ -1115,7 +1117,7 @@ else KBUILD_VMLINUX_LIBS :=3D $(patsubst %/,%/lib.a, $(libs-y)) endif =20 -export KBUILD_VMLINUX_OBJS KBUILD_VMLINUX_LIBS +export KBUILD_VMLINUX_LIBS export KBUILD_LDS :=3D arch/$(SRCARCH)/kernel/vmlinux.lds =20 vmlinux-deps :=3D $(KBUILD_LDS) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LI= BS) @@ -1142,7 +1144,18 @@ quiet_cmd_autoksyms_h =3D GEN $@ $(autoksyms_h): $(call cmd,autoksyms_h) =20 -vmlinux.o: autoksyms_recursive $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIB= S) FORCE +# '$(AR) mPi' needs 'T' to workaround the bug of llvm-ar <=3D 14 +quiet_cmd_ar_vmlinux.a =3D AR $@ + cmd_ar_vmlinux.a =3D \ + rm -f $@; \ + $(AR) cDPrST $@ $(KBUILD_VMLINUX_OBJS); \ + $(AR) mPiT $$($(AR) t $@ | head -n1) $@ $(head-y) + +targets +=3D vmlinux.a +vmlinux.a: $(KBUILD_VMLINUX_OBJS) FORCE + $(call if_changed,ar_vmlinux.a) + +vmlinux.o: autoksyms_recursive vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux_o =20 ARCH_POSTLINK :=3D $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) @@ -1155,7 +1168,7 @@ cmd_link-vmlinux =3D = \ vmlinux: scripts/link-vmlinux.sh vmlinux.o $(KBUILD_LDS) modpost FORCE +$(call if_changed_dep,link-vmlinux) =20 -targets :=3D vmlinux +targets +=3D vmlinux =20 # The actual objects are generated when descending, # make sure no implicit rule kicks in @@ -1880,7 +1893,7 @@ quiet_cmd_gen_compile_commands =3D GEN $@ cmd_gen_compile_commands =3D $(PYTHON3) $< -a $(AR) -o $@ $(filter-o= ut $<, $(real-prereqs)) =20 $(extmod_prefix)compile_commands.json: scripts/clang-tools/gen_compile_com= mands.py \ - $(if $(KBUILD_EXTMOD),,$(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS)) \ + $(if $(KBUILD_EXTMOD),, vmlinux.a $(KBUILD_VMLINUX_LIBS)) \ $(if $(CONFIG_MODULES), $(MODORDER)) FORCE $(call if_changed,gen_compile_commands) =20 diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile index 5a74581bf0ee..5a5b0a8b7c6a 100644 --- a/arch/alpha/kernel/Makefile +++ b/arch/alpha/kernel/Makefile @@ -3,11 +3,11 @@ # Makefile for the linux kernel. # =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds asflags-y :=3D $(KBUILD_CFLAGS) ccflags-y :=3D -Wno-sign-compare =20 -obj-y :=3D entry.o traps.o process.o osf_sys.o irq.o \ +obj-y :=3D head.o entry.o traps.o process.o osf_sys.o irq.o \ irq_alpha.o signal.o setup.o ptrace.o time.o \ systbls.o err_common.o io.o bugs.o =20 diff --git a/arch/arc/kernel/Makefile b/arch/arc/kernel/Makefile index 8c4fc4b54c14..0723d888ac44 100644 --- a/arch/arc/kernel/Makefile +++ b/arch/arc/kernel/Makefile @@ -3,7 +3,7 @@ # Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.co= m) # =20 -obj-y :=3D arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o +obj-y :=3D head.o arcksyms.o setup.o irq.o reset.o ptrace.o process.o devt= ree.o obj-y +=3D signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o obj-$(CONFIG_ISA_ARCOMPACT) +=3D entry-compact.o intc-compact.o obj-$(CONFIG_ISA_ARCV2) +=3D entry-arcv2.o intc-arcv2.o @@ -31,4 +31,4 @@ else obj-y +=3D ctx_sw_asm.o endif =20 -extra-y :=3D vmlinux.lds head.o +extra-y :=3D vmlinux.lds diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 553866751e1a..8feaa3217ec5 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -89,7 +89,7 @@ obj-$(CONFIG_VDSO) +=3D vdso.o obj-$(CONFIG_EFI) +=3D efi.o obj-$(CONFIG_PARAVIRT) +=3D paravirt.o =20 -head-y :=3D head$(MMUEXT).o +obj-y +=3D head$(MMUEXT).o obj-$(CONFIG_DEBUG_LL) +=3D debug.o obj-$(CONFIG_EARLY_PRINTK) +=3D early_printk.o obj-$(CONFIG_ARM_PATCH_PHYS_VIRT) +=3D phys2virt.o @@ -109,4 +109,4 @@ obj-$(CONFIG_HAVE_ARM_SMCCC) +=3D smccc-call.o =20 obj-$(CONFIG_GENERIC_CPU_VULNERABILITIES) +=3D spectre.o =20 -extra-y :=3D $(head-y) vmlinux.lds +extra-y :=3D vmlinux.lds diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 1add7b01efa7..b619ff207a57 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -85,8 +85,8 @@ $(obj)/vdso-wrap.o: $(obj)/vdso/vdso.so $(obj)/vdso32-wrap.o: $(obj)/vdso32/vdso.so =20 obj-y +=3D probes/ -head-y :=3D head.o -extra-y +=3D $(head-y) vmlinux.lds +obj-y +=3D head.o +extra-y +=3D vmlinux.lds =20 ifeq ($(CONFIG_DEBUG_EFI),y) AFLAGS_head.o +=3D -DVMLINUX_PATH=3D"\"$(realpath $(objtree)/vmlinux)\"" diff --git a/arch/csky/kernel/Makefile b/arch/csky/kernel/Makefile index 6f14c924b20d..8a868316b912 100644 --- a/arch/csky/kernel/Makefile +++ b/arch/csky/kernel/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y +=3D entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vdso/ +obj-y +=3D head.o entry.o atomic.o signal.o traps.o irq.o time.o vdso.o vd= so/ obj-y +=3D power.o syscall.o syscall_table.o setup.o io.o obj-y +=3D process.o cpu-probe.o ptrace.o stacktrace.o obj-y +=3D probes/ diff --git a/arch/hexagon/kernel/Makefile b/arch/hexagon/kernel/Makefile index fae3dce32fde..e73cb321630e 100644 --- a/arch/hexagon/kernel/Makefile +++ b/arch/hexagon/kernel/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 +obj-y +=3D head.o obj-$(CONFIG_SMP) +=3D smp.o =20 obj-y +=3D setup.o irq_cpu.o traps.o syscalltab.o signal.o time.o diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile index 08d4a2ba0652..4a1fcb121dda 100644 --- a/arch/ia64/kernel/Makefile +++ b/arch/ia64/kernel/Makefile @@ -7,9 +7,9 @@ ifdef CONFIG_DYNAMIC_FTRACE CFLAGS_REMOVE_ftrace.o =3D -pg endif =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y :=3D entry.o efi.o efi_stub.o gate-data.o fsys.o irq.o irq_ia64.o \ +obj-y :=3D head.o entry.o efi.o efi_stub.o gate-data.o fsys.o irq.o irq_ia= 64.o \ irq_lsapic.o ivt.o pal.o patch.o process.o ptrace.o sal.o \ salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \ unwind.o mca.o mca_asm.o topology.o dma-mapping.o iosapic.o acpi.o \ diff --git a/arch/loongarch/kernel/Makefile b/arch/loongarch/kernel/Makefile index e5be17009fe8..6c33b5c45573 100644 --- a/arch/loongarch/kernel/Makefile +++ b/arch/loongarch/kernel/Makefile @@ -3,9 +3,9 @@ # Makefile for the Linux/LoongArch kernel. # =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y +=3D cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \ +obj-y +=3D head.o cpu-probe.o cacheinfo.o env.o setup.o entry.o genex.o \ traps.o irq.o idle.o process.o dma.o mem.o io.o reset.o switch.o \ elf.o syscall.o signal.o time.o topology.o inst.o ptrace.o vdso.o =20 diff --git a/arch/m68k/68000/Makefile b/arch/m68k/68000/Makefile index 674541fdf5b8..279560add577 100644 --- a/arch/m68k/68000/Makefile +++ b/arch/m68k/68000/Makefile @@ -17,4 +17,4 @@ obj-$(CONFIG_DRAGEN2) +=3D dragen2.o obj-$(CONFIG_UCSIMM) +=3D ucsimm.o obj-$(CONFIG_UCDIMM) +=3D ucsimm.o =20 -extra-y :=3D head.o +obj-y +=3D head.o diff --git a/arch/m68k/coldfire/Makefile b/arch/m68k/coldfire/Makefile index 9419a6c1f036..c56bc0dc7f2e 100644 --- a/arch/m68k/coldfire/Makefile +++ b/arch/m68k/coldfire/Makefile @@ -45,4 +45,4 @@ obj-$(CONFIG_STMARK2) +=3D stmark2.o obj-$(CONFIG_PCI) +=3D pci.o =20 obj-y +=3D gpio.o -extra-y :=3D head.o +obj-y +=3D head.o diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index c0833da6a2ca..af015447dfb4 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -3,19 +3,20 @@ # Makefile for the linux kernel. # =20 -extra-$(CONFIG_AMIGA) :=3D head.o -extra-$(CONFIG_ATARI) :=3D head.o -extra-$(CONFIG_MAC) :=3D head.o -extra-$(CONFIG_APOLLO) :=3D head.o -extra-$(CONFIG_VME) :=3D head.o -extra-$(CONFIG_HP300) :=3D head.o -extra-$(CONFIG_Q40) :=3D head.o -extra-$(CONFIG_SUN3X) :=3D head.o -extra-$(CONFIG_VIRT) :=3D head.o -extra-$(CONFIG_SUN3) :=3D sun3-head.o extra-y +=3D vmlinux.lds =20 -obj-y :=3D entry.o irq.o module.o process.o ptrace.o +obj-$(CONFIG_AMIGA) :=3D head.o +obj-$(CONFIG_ATARI) :=3D head.o +obj-$(CONFIG_MAC) :=3D head.o +obj-$(CONFIG_APOLLO) :=3D head.o +obj-$(CONFIG_VME) :=3D head.o +obj-$(CONFIG_HP300) :=3D head.o +obj-$(CONFIG_Q40) :=3D head.o +obj-$(CONFIG_SUN3X) :=3D head.o +obj-$(CONFIG_VIRT) :=3D head.o +obj-$(CONFIG_SUN3) :=3D sun3-head.o + +obj-y +=3D entry.o irq.o module.o process.o ptrace.o obj-y +=3D setup.o signal.o sys_m68k.o syscalltable.o time.o traps.o =20 obj-$(CONFIG_MMU_MOTOROLA) +=3D ints.o vectors.o diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makef= ile index 15a20eb814ce..4393bee64eaf 100644 --- a/arch/microblaze/kernel/Makefile +++ b/arch/microblaze/kernel/Makefile @@ -12,9 +12,9 @@ CFLAGS_REMOVE_ftrace.o =3D -pg CFLAGS_REMOVE_process.o =3D -pg endif =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y +=3D dma.o exceptions.o \ +obj-y +=3D head.o dma.o exceptions.o \ hw_exception_handler.o irq.o \ process.o prom.o ptrace.o \ reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index 7c96282bff2e..5d1addac5e28 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -3,9 +3,9 @@ # Makefile for the Linux/MIPS kernel. # =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y +=3D branch.o cmpxchg.o elf.o entry.o genex.o idle.o irq.o \ +obj-y +=3D head.o branch.o cmpxchg.o elf.o entry.o genex.o idle.o irq.o \ process.o prom.o ptrace.o reset.o setup.o signal.o \ syscall.o time.o topology.o traps.o unaligned.o watch.o \ vdso.o cacheinfo.o diff --git a/arch/nios2/kernel/Makefile b/arch/nios2/kernel/Makefile index 0b645e1e3158..78a913181fa1 100644 --- a/arch/nios2/kernel/Makefile +++ b/arch/nios2/kernel/Makefile @@ -3,9 +3,9 @@ # Makefile for the nios2 linux kernel. # =20 -extra-y +=3D head.o extra-y +=3D vmlinux.lds =20 +obj-y +=3D head.o obj-y +=3D cpuinfo.o obj-y +=3D entry.o obj-y +=3D insnemu.o diff --git a/arch/openrisc/kernel/Makefile b/arch/openrisc/kernel/Makefile index 2d172e79f58d..79129161f3e0 100644 --- a/arch/openrisc/kernel/Makefile +++ b/arch/openrisc/kernel/Makefile @@ -3,9 +3,9 @@ # Makefile for the linux kernel. # =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y :=3D setup.o or32_ksyms.o process.o dma.o \ +obj-y :=3D head.o setup.o or32_ksyms.o process.o dma.o \ traps.o time.o irq.o entry.o ptrace.o signal.o \ sys_call_table.o unwinder.o =20 diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile index d0bfac89a842..3d138c9cf9ce 100644 --- a/arch/parisc/kernel/Makefile +++ b/arch/parisc/kernel/Makefile @@ -3,9 +3,9 @@ # Makefile for arch/parisc/kernel # =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y :=3D cache.o pacache.o setup.o pdt.o traps.o time.o irq.o \ +obj-y :=3D head.o cache.o pacache.o setup.o pdt.o traps.o time.o irq.o \ pa7300lc.o syscall.o entry.o sys_parisc.o firmware.o \ ptrace.o hardware.o inventory.o drivers.o alternative.o \ signal.o hpmc.o real2.o parisc_ksyms.o unaligned.o \ diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 06d2d1f78f71..ad3decb9f20b 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -118,12 +118,12 @@ obj-$(CONFIG_PPC_FSL_BOOK3E) +=3D cpu_setup_fsl_booke= .o obj-$(CONFIG_PPC_DOORBELL) +=3D dbell.o obj-$(CONFIG_JUMP_LABEL) +=3D jump_label.o =20 -extra-$(CONFIG_PPC64) :=3D head_64.o -extra-$(CONFIG_PPC_BOOK3S_32) :=3D head_book3s_32.o -extra-$(CONFIG_40x) :=3D head_40x.o -extra-$(CONFIG_44x) :=3D head_44x.o -extra-$(CONFIG_FSL_BOOKE) :=3D head_fsl_booke.o -extra-$(CONFIG_PPC_8xx) :=3D head_8xx.o +obj-$(CONFIG_PPC64) +=3D head_64.o +obj-$(CONFIG_PPC_BOOK3S_32) +=3D head_book3s_32.o +obj-$(CONFIG_40x) +=3D head_40x.o +obj-$(CONFIG_44x) +=3D head_44x.o +obj-$(CONFIG_FSL_BOOKE) +=3D head_fsl_booke.o +obj-$(CONFIG_PPC_8xx) +=3D head_8xx.o extra-y +=3D vmlinux.lds =20 obj-$(CONFIG_RELOCATABLE) +=3D reloc_$(BITS).o @@ -198,10 +198,10 @@ KCOV_INSTRUMENT_paca.o :=3D n CFLAGS_setup_64.o +=3D -fno-stack-protector CFLAGS_paca.o +=3D -fno-stack-protector =20 -extra-$(CONFIG_PPC_FPU) +=3D fpu.o -extra-$(CONFIG_ALTIVEC) +=3D vector.o -extra-$(CONFIG_PPC64) +=3D entry_64.o -extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) +=3D prom_init.o +obj-$(CONFIG_PPC_FPU) +=3D fpu.o +obj-$(CONFIG_ALTIVEC) +=3D vector.o +obj-$(CONFIG_PPC64) +=3D entry_64.o +obj-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) +=3D prom_init.o =20 extra-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) +=3D prom_init_check =20 diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 33bb60a354cd..db6e4b1294ba 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -28,9 +28,9 @@ KASAN_SANITIZE_cpufeature.o :=3D n endif endif =20 -extra-y +=3D head.o extra-y +=3D vmlinux.lds =20 +obj-y +=3D head.o obj-y +=3D soc.o obj-$(CONFIG_RISCV_ALTERNATIVE) +=3D alternative.o obj-y +=3D cpu.o diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 3cbfa9fddd9a..7ce00816b8df 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -33,7 +33,7 @@ CFLAGS_stacktrace.o +=3D -fno-optimize-sibling-calls CFLAGS_dumpstack.o +=3D -fno-optimize-sibling-calls CFLAGS_unwind_bc.o +=3D -fno-optimize-sibling-calls =20 -obj-y :=3D traps.o time.o process.o earlypgm.o early.o setup.o idle.o vtim= e.o +obj-y :=3D head64.o traps.o time.o process.o earlypgm.o early.o setup.o id= le.o vtime.o obj-y +=3D processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o obj-y +=3D debug.o irq.o ipl.o dis.o diag.o vdso.o cpufeature.o obj-y +=3D sysinfo.o lgr.o os_info.o machine_kexec.o @@ -42,7 +42,7 @@ obj-y +=3D entry.o reipl.o relocate_kernel.o kdebugfs.o a= lternative.o obj-y +=3D nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o obj-y +=3D smp.o text_amode31.o stacktrace.o =20 -extra-y +=3D head64.o vmlinux.lds +extra-y +=3D vmlinux.lds =20 obj-$(CONFIG_SYSFS) +=3D nospec-sysfs.o CFLAGS_REMOVE_nospec-branch.o +=3D $(CC_FLAGS_EXPOLINE) diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile index aa0fbc9202b1..69cd9ac4b2ab 100644 --- a/arch/sh/kernel/Makefile +++ b/arch/sh/kernel/Makefile @@ -3,7 +3,7 @@ # Makefile for the Linux/SuperH kernel. # =20 -extra-y :=3D head_32.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 ifdef CONFIG_FUNCTION_TRACER # Do not profile debug and lowlevel utilities @@ -12,7 +12,7 @@ endif =20 CFLAGS_REMOVE_return_address.o =3D -pg =20 -obj-y :=3D debugtraps.o dumpstack.o \ +obj-y :=3D head_32.o debugtraps.o dumpstack.o \ idle.o io.o irq.o irq_32.o kdebugfs.o \ machvec.o nmi_debug.o process.o \ process_32.o ptrace.o ptrace_32.o \ diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index d3a0e072ebe8..b328e4a0bd57 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile @@ -7,8 +7,6 @@ asflags-y :=3D -ansi ccflags-y :=3D -Werror =20 -extra-y :=3D head_$(BITS).o - # Undefine sparc when processing vmlinux.lds - it is used # And teach CPP we are doing $(BITS) builds (for this case) CPPFLAGS_vmlinux.lds :=3D -Usparc -m$(BITS) @@ -22,6 +20,7 @@ CFLAGS_REMOVE_perf_event.o :=3D -pg CFLAGS_REMOVE_pcr.o :=3D -pg endif =20 +obj-y :=3D head_$(BITS).o obj-$(CONFIG_SPARC64) +=3D urtt_fill.o obj-$(CONFIG_SPARC32) +=3D entry.o wof.o wuf.o obj-$(CONFIG_SPARC32) +=3D etrap_32.o diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index a20a5ebfacd7..956e50ca06e0 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -3,10 +3,6 @@ # Makefile for the linux kernel. # =20 -extra-y :=3D head_$(BITS).o -extra-y +=3D head$(BITS).o -extra-y +=3D ebda.o -extra-y +=3D platform-quirks.o extra-y +=3D vmlinux.lds =20 CPPFLAGS_vmlinux.lds +=3D -U$(UTS_MACHINE) @@ -42,7 +38,11 @@ KCOV_INSTRUMENT :=3D n =20 CFLAGS_irq.o :=3D -I $(srctree)/$(src)/../include/asm/trace =20 -obj-y :=3D process_$(BITS).o signal.o +obj-y +=3D head_$(BITS).o +obj-y +=3D head$(BITS).o +obj-y +=3D ebda.o +obj-y +=3D platform-quirks.o +obj-y +=3D process_$(BITS).o signal.o obj-$(CONFIG_COMPAT) +=3D signal_compat.o obj-y +=3D traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o obj-y +=3D time.o ioport.o dumpstack.o nmi.o diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile index 897c1c741058..f28b8e3d717e 100644 --- a/arch/xtensa/kernel/Makefile +++ b/arch/xtensa/kernel/Makefile @@ -3,9 +3,9 @@ # Makefile for the Linux/Xtensa kernel. # =20 -extra-y :=3D head.o vmlinux.lds +extra-y :=3D vmlinux.lds =20 -obj-y :=3D align.o coprocessor.o entry.o irq.o platform.o process.o \ +obj-y :=3D head.o align.o coprocessor.o entry.o irq.o platform.o process.o= \ ptrace.o setup.o signal.o stacktrace.o syscall.o time.o traps.o \ vectors.o =20 diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 2daf760eeb25..ceb1d78140e7 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost @@ -70,13 +70,12 @@ quiet_cmd_vmlinux_objs =3D GEN $@ for f in $(real-prereqs); do \ case $${f} in \ *libgcc.a) ;; \ - *.a) $(AR) t $${f} ;; \ - *) echo $${f} ;; \ + *) $(AR) t $${f} ;; \ esac \ done > $@ =20 targets +=3D .vmlinux.objs -.vmlinux.objs: $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) FORCE +.vmlinux.objs: vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE $(call if_changed,vmlinux_objs) =20 vmlinux.o-if-present :=3D $(wildcard vmlinux.o) diff --git a/scripts/Makefile.vmlinux_o b/scripts/Makefile.vmlinux_o index 84019814f33f..81a4e0484457 100644 --- a/scripts/Makefile.vmlinux_o +++ b/scripts/Makefile.vmlinux_o @@ -18,7 +18,7 @@ quiet_cmd_gen_initcalls_lds =3D GEN $@ $(PERL) $(real-prereqs) > $@ =20 .tmp_initcalls.lds: $(srctree)/scripts/generate_initcall_order.pl \ - $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) FORCE + vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE $(call if_changed,gen_initcalls_lds) =20 targets :=3D .tmp_initcalls.lds @@ -55,7 +55,7 @@ quiet_cmd_ld_vmlinux.o =3D LD $@ cmd_ld_vmlinux.o =3D \ $(LD) ${KBUILD_LDFLAGS} -r -o $@ \ $(addprefix -T , $(initcalls-lds)) \ - --whole-archive $(KBUILD_VMLINUX_OBJS) --no-whole-archive \ + --whole-archive vmlinux.a --no-whole-archive \ --start-group $(KBUILD_VMLINUX_LIBS) --end-group \ $(cmd_objtool) =20 @@ -64,7 +64,7 @@ define rule_ld_vmlinux.o $(call cmd,gen_objtooldep) endef =20 -vmlinux.o: $(initcalls-lds) $(KBUILD_VMLINUX_OBJS) $(KBUILD_VMLINUX_LIBS) = FORCE +vmlinux.o: $(initcalls-lds) vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE $(call if_changed_rule,ld_vmlinux.o) =20 targets +=3D vmlinux.o diff --git a/scripts/clang-tools/gen_compile_commands.py b/scripts/clang-to= ols/gen_compile_commands.py index 47da25b3ba7d..d800b2c0af97 100755 --- a/scripts/clang-tools/gen_compile_commands.py +++ b/scripts/clang-tools/gen_compile_commands.py @@ -109,20 +109,6 @@ def to_cmdfile(path): return os.path.join(dir, '.' + base + '.cmd') =20 =20 -def cmdfiles_for_o(obj): - """Generate the iterator of .cmd files associated with the object - - Yield the .cmd file used to build the given object - - Args: - obj: The object path - - Yields: - The path to .cmd file - """ - yield to_cmdfile(obj) - - def cmdfiles_for_a(archive, ar): """Generate the iterator of .cmd files associated with the archive. =20 @@ -211,13 +197,10 @@ def main(): for path in paths: # If 'path' is a directory, handle all .cmd files under it. # Otherwise, handle .cmd files associated with the file. - # Most of built-in objects are linked via archives (built-in.a or = lib.a) - # but some objects are linked to vmlinux directly. + # built-in objects are linked via vmlinux.a # Modules are listed in modules.order. if os.path.isdir(path): cmdfiles =3D cmdfiles_in_dir(path) - elif path.endswith('.o'): - cmdfiles =3D cmdfiles_for_o(path) elif path.endswith('.a'): cmdfiles =3D cmdfiles_for_a(path, ar) elif path.endswith('modules.order'): diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 6a197d8a88ac..23ac13fd9d89 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -3,17 +3,15 @@ # # link vmlinux # -# vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_OBJS) and -# $(KBUILD_VMLINUX_LIBS). Most are built-in.a files from top-level directo= ries -# in the kernel tree, others are specified in arch/$(ARCH)/Makefile. +# vmlinux is linked from the objects in vmlinux.a and $(KBUILD_VMLINUX_LIB= S). +# vmlinux.a contains objects that are linked unconditionally. # $(KBUILD_VMLINUX_LIBS) are archives which are linked conditionally # (not within --whole-archive), and do not require symbol indexes added. # # vmlinux # ^ # | -# +--< $(KBUILD_VMLINUX_OBJS) -# | +--< init/built-in.a drivers/built-in.a mm/built-in.a + more +# +--< vmlinux.a # | # +--< $(KBUILD_VMLINUX_LIBS) # | +--< lib/lib.a + more @@ -67,7 +65,7 @@ vmlinux_link() objs=3Dvmlinux.o libs=3D else - objs=3D"${KBUILD_VMLINUX_OBJS}" + objs=3Dvmlinux.a libs=3D"${KBUILD_VMLINUX_LIBS}" fi =20 --=20 2.34.1 From nobody Thu Apr 2 13:29:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B129C6FA8E for ; Sat, 24 Sep 2022 18:20:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232153AbiIXSU3 (ORCPT ); Sat, 24 Sep 2022 14:20:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbiIXSU0 (ORCPT ); Sat, 24 Sep 2022 14:20:26 -0400 Received: from conuserg-11.nifty.com (conuserg-11.nifty.com [210.131.2.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 056892C137; Sat, 24 Sep 2022 11:20:23 -0700 (PDT) Received: from zoe.. (133-32-182-133.west.xps.vectant.ne.jp [133.32.182.133]) (authenticated) by conuserg-11.nifty.com with ESMTP id 28OIJItX005682; Sun, 25 Sep 2022 03:19:22 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 28OIJItX005682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1664043563; bh=Pp1rAToM6KWIBUy2FQNjAb8JuFEf88j2eL7x0oZux4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EUr4b3PD+IlcBILDnfKQtBYJoKjXmCjK8RLS3vgEo0ywlKiiii0/MKBzb1Fm8SSyd KlMCaina6S2FibyZz7JbZNii0TldYSsWNScmUDJ36Q8PaeG8YyXHrR6OAOPy0USoAT 1HdQ4admo2Jn8LTsw7DIVDEKQVcpZvx4M9pWmntK8uHxHf9laY6M59lQIRnOt+csxu JoMmvpFhUuzup2O6EldIdjpiTFM1glIdiMR2bIy1nhaB49Dlfuvbj1tDY8XbBt2YjT uyiQZACbE46HaGxM4kBqG1U8PRLhsefi80oJumWiKmkNRe5TeGhuL7lwOZhFxi9nUk Nic7nfU9A6XaA== X-Nifty-SrcIP: [133.32.182.133] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Nick Desaulniers , Nathan Chancellor , Masahiro Yamada Subject: [PATCH v3 7/7] kbuild: remove head-y syntax Date: Sun, 25 Sep 2022 03:19:15 +0900 Message-Id: <20220924181915.3251186-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220924181915.3251186-1-masahiroy@kernel.org> References: <20220924181915.3251186-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Kbuild puts the objects listed in head-y at the head of vmlinux. Conventionally, we do this for head*.S, which contains the kernel entry point. A counter approach is to control the section order by the linker script. Actually, the code marked as __HEAD goes into the ".head.text" section, which is placed before the normal ".text" section. I do not know if both of them are needed. From the build system perspective, head-y is not mandatory. If you can achieve the proper code placement by the linker script only, it would be cleaner. I collected the current head-y objects into head-object-list.txt. It is a whitelist. My hope is it will be reduced in the long run. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier Tested-by: Nick Desaulniers --- (no changes since v1) Documentation/kbuild/makefiles.rst | 9 ++--- Makefile | 4 +-- arch/alpha/Makefile | 2 -- arch/arc/Makefile | 2 -- arch/arm/Makefile | 3 -- arch/arm64/Makefile | 3 -- arch/csky/Makefile | 2 -- arch/hexagon/Makefile | 2 -- arch/ia64/Makefile | 1 - arch/loongarch/Makefile | 2 -- arch/m68k/Makefile | 9 ----- arch/microblaze/Makefile | 1 - arch/mips/Makefile | 2 -- arch/nios2/Makefile | 1 - arch/openrisc/Makefile | 2 -- arch/parisc/Makefile | 2 -- arch/powerpc/Makefile | 12 ------- arch/riscv/Makefile | 2 -- arch/s390/Makefile | 2 -- arch/sh/Makefile | 2 -- arch/sparc/Makefile | 2 -- arch/x86/Makefile | 5 --- arch/xtensa/Makefile | 2 -- scripts/head-object-list.txt | 53 ++++++++++++++++++++++++++++++ 24 files changed, 60 insertions(+), 67 deletions(-) create mode 100644 scripts/head-object-list.txt diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/make= files.rst index 5a6a8426cc97..60134ddf3db1 100644 --- a/Documentation/kbuild/makefiles.rst +++ b/Documentation/kbuild/makefiles.rst @@ -1070,8 +1070,7 @@ When kbuild executes, the following steps are followe= d (roughly): - The values of the above variables are expanded in arch/$(SRCARCH)/Mak= efile. 5) All object files are then linked and the resulting file vmlinux is located at the root of the obj tree. - The very first objects linked are listed in head-y, assigned by - arch/$(SRCARCH)/Makefile. + The very first objects linked are listed in scripts/head-object-list.tx= t. 6) Finally, the architecture-specific part does any required post processi= ng and builds the final bootimage. - This includes building boot records @@ -1219,6 +1218,9 @@ When kbuild executes, the following steps are followe= d (roughly): All object files for vmlinux. They are linked to vmlinux in the same order as listed in KBUILD_VMLINUX_OBJS. =20 + The objects listed in scripts/head-object-list.txt are exceptions; + they are placed before the other objects. + KBUILD_VMLINUX_LIBS =20 All .a "lib" files for vmlinux. KBUILD_VMLINUX_OBJS and @@ -1262,8 +1264,7 @@ When kbuild executes, the following steps are followe= d (roughly): machinery is all architecture-independent. =20 =20 - head-y, core-y, libs-y, drivers-y - $(head-y) lists objects to be linked first in vmlinux. + core-y, libs-y, drivers-y =20 $(libs-y) lists directories where a lib.a archive can be located. =20 diff --git a/Makefile b/Makefile index a8c19f92ac9e..ab986e4c5189 100644 --- a/Makefile +++ b/Makefile @@ -1149,10 +1149,10 @@ quiet_cmd_ar_vmlinux.a =3D AR $@ cmd_ar_vmlinux.a =3D \ rm -f $@; \ $(AR) cDPrST $@ $(KBUILD_VMLINUX_OBJS); \ - $(AR) mPiT $$($(AR) t $@ | head -n1) $@ $(head-y) + $(AR) mPiT $$($(AR) t $@ | head -n1) $@ $$($(AR) t $@ | grep -F --file=3D= $(srctree)/scripts/head-object-list.txt) =20 targets +=3D vmlinux.a -vmlinux.a: $(KBUILD_VMLINUX_OBJS) FORCE +vmlinux.a: $(KBUILD_VMLINUX_OBJS) scripts/head-object-list.txt FORCE $(call if_changed,ar_vmlinux.a) =20 vmlinux.o: autoksyms_recursive vmlinux.a $(KBUILD_VMLINUX_LIBS) FORCE diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile index 881cb913e23a..45158024085e 100644 --- a/arch/alpha/Makefile +++ b/arch/alpha/Makefile @@ -36,8 +36,6 @@ cflags-y +=3D $(cpuflags-y) # BWX is most important, but we don't really want any emulation ever. KBUILD_CFLAGS +=3D $(cflags-y) -Wa,-mev6 =20 -head-y :=3D arch/alpha/kernel/head.o - libs-y +=3D arch/alpha/lib/ =20 # export what is needed by arch/alpha/boot/Makefile diff --git a/arch/arc/Makefile b/arch/arc/Makefile index efc54f3e35e0..329400a1c355 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -82,8 +82,6 @@ KBUILD_CFLAGS +=3D $(cflags-y) KBUILD_AFLAGS +=3D $(KBUILD_CFLAGS) KBUILD_LDFLAGS +=3D $(ldflags-y) =20 -head-y :=3D arch/arc/kernel/head.o - # w/o this dtb won't embed into kernel binary core-y +=3D arch/arc/boot/dts/ =20 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 56f655deebb1..29d15c9a433e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -134,9 +134,6 @@ KBUILD_AFLAGS +=3D$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y)= $(tune-y) -include asm/uni =20 CHECKFLAGS +=3D -D__arm__ =20 -#Default value -head-y :=3D arch/arm/kernel/head$(MMUEXT).o - # Text offset. This list is sorted numerically by address in order to # provide a means to avoid/resolve conflicts in multi-arch kernels. # Note: the 32kB below this value is reserved for use by the kernel diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 6d9d4a58b898..6e03f15bb041 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -133,9 +133,6 @@ ifeq ($(CONFIG_DYNAMIC_FTRACE_WITH_REGS),y) CC_FLAGS_FTRACE :=3D -fpatchable-function-entry=3D2 endif =20 -# Default value -head-y :=3D arch/arm64/kernel/head.o - ifeq ($(CONFIG_KASAN_SW_TAGS), y) KASAN_SHADOW_SCALE_SHIFT :=3D 4 else ifeq ($(CONFIG_KASAN_GENERIC), y) diff --git a/arch/csky/Makefile b/arch/csky/Makefile index 4e1d619fd5c6..0e4237e55758 100644 --- a/arch/csky/Makefile +++ b/arch/csky/Makefile @@ -59,8 +59,6 @@ LDFLAGS +=3D -EL =20 KBUILD_AFLAGS +=3D $(KBUILD_CFLAGS) =20 -head-y :=3D arch/csky/kernel/head.o - core-y +=3D arch/csky/$(CSKYABI)/ =20 libs-y +=3D arch/csky/lib/ \ diff --git a/arch/hexagon/Makefile b/arch/hexagon/Makefile index 44312bc147d8..92d005958dfb 100644 --- a/arch/hexagon/Makefile +++ b/arch/hexagon/Makefile @@ -32,5 +32,3 @@ KBUILD_LDFLAGS +=3D $(ldflags-y) TIR_NAME :=3D r19 KBUILD_CFLAGS +=3D -ffixed-$(TIR_NAME) -DTHREADINFO_REG=3D$(TIR_NAME) -D__= linux__ KBUILD_AFLAGS +=3D -DTHREADINFO_REG=3D$(TIR_NAME) - -head-y :=3D arch/hexagon/kernel/head.o diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index e55c2f138656..56c4bb276b6e 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -44,7 +44,6 @@ quiet_cmd_objcopy =3D OBJCOPY $@ cmd_objcopy =3D $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ =20 KBUILD_CFLAGS +=3D $(cflags-y) -head-y :=3D arch/ia64/kernel/head.o =20 libs-y +=3D arch/ia64/lib/ =20 diff --git a/arch/loongarch/Makefile b/arch/loongarch/Makefile index ec3de6191276..131fc210c2bf 100644 --- a/arch/loongarch/Makefile +++ b/arch/loongarch/Makefile @@ -72,8 +72,6 @@ CHECKFLAGS +=3D $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x = c /dev/null | \ sed -e "s/^\#define /-D'/" -e "s/ /'=3D'/" -e "s/$$/'/" -e 's/\$$/&&/g') endif =20 -head-y :=3D arch/loongarch/kernel/head.o - libs-y +=3D arch/loongarch/lib/ =20 ifeq ($(KBUILD_EXTMOD),) diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile index e358605b70ba..43e39040d3ac 100644 --- a/arch/m68k/Makefile +++ b/arch/m68k/Makefile @@ -86,15 +86,6 @@ ifdef CONFIG_KGDB KBUILD_CFLAGS :=3D $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g endif =20 -# -# Select the assembler head startup code. Order is important. The default -# head code is first, processor specific selections can override it after. -# -head-y :=3D arch/m68k/kernel/head.o -head-$(CONFIG_SUN3) :=3D arch/m68k/kernel/sun3-head.o -head-$(CONFIG_M68000) :=3D arch/m68k/68000/head.o -head-$(CONFIG_COLDFIRE) :=3D arch/m68k/coldfire/head.o - libs-y +=3D arch/m68k/lib/ =20 =20 diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile index 1826d9ce4459..3f8a86c4336a 100644 --- a/arch/microblaze/Makefile +++ b/arch/microblaze/Makefile @@ -48,7 +48,6 @@ CPUFLAGS-1 +=3D $(call cc-option,-mcpu=3Dv$(CPU_VER)) # r31 holds current when in kernel mode KBUILD_CFLAGS +=3D -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2) =20 -head-y :=3D arch/microblaze/kernel/head.o libs-y +=3D arch/microblaze/lib/ =20 boot :=3D arch/microblaze/boot diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 4d2a3e73fc45..b296e33f8e33 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -324,8 +324,6 @@ endif =20 OBJCOPYFLAGS +=3D --remove-section=3D.reginfo =20 -head-y :=3D arch/mips/kernel/head.o - libs-y +=3D arch/mips/lib/ libs-$(CONFIG_MIPS_FP_SUPPORT) +=3D arch/mips/math-emu/ =20 diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile index 3f34e6831863..f1ff4ce0f1a2 100644 --- a/arch/nios2/Makefile +++ b/arch/nios2/Makefile @@ -37,7 +37,6 @@ KBUILD_CFLAGS +=3D -DUTS_SYSNAME=3D\"$(UTS_SYSNAME)\" KBUILD_CFLAGS +=3D -fno-builtin KBUILD_CFLAGS +=3D -G 0 =20 -head-y :=3D arch/nios2/kernel/head.o libs-y +=3D arch/nios2/lib/ $(LIBGCC) =20 INSTALL_PATH ?=3D /tftpboot diff --git a/arch/openrisc/Makefile b/arch/openrisc/Makefile index b446510173cd..68249521db5a 100644 --- a/arch/openrisc/Makefile +++ b/arch/openrisc/Makefile @@ -55,8 +55,6 @@ ifeq ($(CONFIG_OPENRISC_HAVE_INST_SEXT),y) KBUILD_CFLAGS +=3D $(call cc-option,-msext) endif =20 -head-y :=3D arch/openrisc/kernel/head.o - libs-y +=3D $(LIBGCC) =20 PHONY +=3D vmlinux.bin diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index e38d993d87f2..a2d8600521f9 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -113,8 +113,6 @@ cflags-$(CONFIG_PA7100LC) +=3D -march=3D1.1 -mschedule= =3D7100LC cflags-$(CONFIG_PA7300LC) +=3D -march=3D1.1 -mschedule=3D7300 cflags-$(CONFIG_PA8X00) +=3D -march=3D2.0 -mschedule=3D8000 =20 -head-y :=3D arch/parisc/kernel/head.o=20 - KBUILD_CFLAGS +=3D $(cflags-y) LIBGCC :=3D $(shell $(CC) -print-libgcc-file-name) export LIBGCC diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 02742facf895..89c27827a11f 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -226,18 +226,6 @@ KBUILD_CFLAGS +=3D $(cpu-as-y) KBUILD_AFLAGS +=3D $(aflags-y) KBUILD_CFLAGS +=3D $(cflags-y) =20 -head-$(CONFIG_PPC64) :=3D arch/powerpc/kernel/head_64.o -head-$(CONFIG_PPC_BOOK3S_32) :=3D arch/powerpc/kernel/head_book3s_32.o -head-$(CONFIG_PPC_8xx) :=3D arch/powerpc/kernel/head_8xx.o -head-$(CONFIG_40x) :=3D arch/powerpc/kernel/head_40x.o -head-$(CONFIG_44x) :=3D arch/powerpc/kernel/head_44x.o -head-$(CONFIG_FSL_BOOKE) :=3D arch/powerpc/kernel/head_fsl_booke.o - -head-$(CONFIG_PPC64) +=3D arch/powerpc/kernel/entry_64.o -head-$(CONFIG_PPC_FPU) +=3D arch/powerpc/kernel/fpu.o -head-$(CONFIG_ALTIVEC) +=3D arch/powerpc/kernel/vector.o -head-$(CONFIG_PPC_OF_BOOT_TRAMPOLINE) +=3D arch/powerpc/kernel/prom_init.o - # Default to zImage, override when needed all: zImage =20 diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 3fa8ef336822..e013df8e7b8b 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -110,8 +110,6 @@ else KBUILD_IMAGE :=3D $(boot)/Image.gz endif =20 -head-y :=3D arch/riscv/kernel/head.o - libs-y +=3D arch/riscv/lib/ libs-$(CONFIG_EFI_STUB) +=3D $(objtree)/drivers/firmware/efi/libstub/lib.a =20 diff --git a/arch/s390/Makefile b/arch/s390/Makefile index 4cb5d17e7ead..de6d8b2ea4d8 100644 --- a/arch/s390/Makefile +++ b/arch/s390/Makefile @@ -119,8 +119,6 @@ export KBUILD_CFLAGS_DECOMPRESSOR =20 OBJCOPYFLAGS :=3D -O binary =20 -head-y :=3D arch/s390/kernel/head64.o - libs-y +=3D arch/s390/lib/ drivers-y +=3D drivers/s390/ =20 diff --git a/arch/sh/Makefile b/arch/sh/Makefile index b39412bf91fb..5c8776482530 100644 --- a/arch/sh/Makefile +++ b/arch/sh/Makefile @@ -114,8 +114,6 @@ endif =20 export ld-bfd =20 -head-y :=3D arch/sh/kernel/head_32.o - # Mach groups machdir-$(CONFIG_SOLUTION_ENGINE) +=3D mach-se machdir-$(CONFIG_SH_HP6XX) +=3D mach-hp6xx diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index fe58a410b4ce..a4ea5b05f288 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile @@ -56,8 +56,6 @@ endif =20 endif =20 -head-y :=3D arch/sparc/kernel/head_$(BITS).o - libs-y +=3D arch/sparc/prom/ libs-y +=3D arch/sparc/lib/ =20 diff --git a/arch/x86/Makefile b/arch/x86/Makefile index bafbd905e6e7..9afd323c6916 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -234,11 +234,6 @@ archheaders: ### # Kernel objects =20 -head-y :=3D arch/x86/kernel/head_$(BITS).o -head-y +=3D arch/x86/kernel/head$(BITS).o -head-y +=3D arch/x86/kernel/ebda.o -head-y +=3D arch/x86/kernel/platform-quirks.o - libs-y +=3D arch/x86/lib/ =20 # drivers-y are linked after core-y diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 5097caa7bf0c..bfd8e433ed62 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -55,8 +55,6 @@ KBUILD_CPPFLAGS +=3D $(patsubst %,-I$(srctree)/%include,$= (vardirs) $(plfdirs)) =20 KBUILD_DEFCONFIG :=3D iss_defconfig =20 -head-y :=3D arch/xtensa/kernel/head.o - libs-y +=3D arch/xtensa/lib/ =20 boot :=3D arch/xtensa/boot diff --git a/scripts/head-object-list.txt b/scripts/head-object-list.txt new file mode 100644 index 000000000000..dd2ba2eda636 --- /dev/null +++ b/scripts/head-object-list.txt @@ -0,0 +1,53 @@ +# Head objects +# +# The objects listed here are placed at the head of vmlinux. A typical use= -case +# is an object that contains the entry point. This is kept for compatibili= ty +# with head-y, which Kbuild used to support. +# +# A counter approach is to control the section placement by the linker scr= ipt. +# The code marked as __HEAD goes into the ".head.text" section, which is p= laced +# before the normal ".text" section. +# +# If you can achieve the correct code ordering by linker script, please de= lete +# the entry from this file. +# +arch/alpha/kernel/head.o +arch/arc/kernel/head.o +arch/arm/kernel/head-nommu.o +arch/arm/kernel/head.o +arch/arm64/kernel/head.o +arch/csky/kernel/head.o +arch/hexagon/kernel/head.o +arch/ia64/kernel/head.o +arch/loongarch/kernel/head.o +arch/m68k/68000/head.o +arch/m68k/coldfire/head.o +arch/m68k/kernel/head.o +arch/m68k/kernel/sun3-head.o +arch/microblaze/kernel/head.o +arch/mips/kernel/head.o +arch/nios2/kernel/head.o +arch/openrisc/kernel/head.o +arch/parisc/kernel/head.o +arch/powerpc/kernel/head_40x.o +arch/powerpc/kernel/head_44x.o +arch/powerpc/kernel/head_64.o +arch/powerpc/kernel/head_8xx.o +arch/powerpc/kernel/head_book3s_32.o +arch/powerpc/kernel/head_fsl_booke.o +arch/powerpc/kernel/entry_64.o +arch/powerpc/kernel/fpu.o +arch/powerpc/kernel/vector.o +arch/powerpc/kernel/prom_init.o +arch/riscv/kernel/head.o +arch/s390/kernel/head64.o +arch/sh/kernel/head_32.o +arch/sparc/kernel/head_32.o +arch/sparc/kernel/head_64.o +arch/x86/kernel/head_32.o +arch/x86/kernel/head_64.o +arch/x86/kernel/head32.o +arch/x86/kernel/head64.o +arch/x86/kernel/ebda.o +arch/x86/kernel/platform-quirks.o +arch/xtensa/kernel/head.o --=20 2.34.1