Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 28 Sep 2022 21:37:43 +0200
From:   Nicolas Schier <nicolas@fjasle.eu>
To:     Masahiro Yamada <masahiroy@kernel.org>
Cc:     linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-arch@vger.kernel.org,
        Nick Desaulniers <ndesaulniers@google.com>,
        Nathan Chancellor <nathan@kernel.org>
Subject: Re: [PATCH v3 4/7] kbuild: move vmlinux.o rule to the top Makefile
Message-ID: <YzSih2IQkgpWj59C@bergen.fjasle.eu>
References: <20220924181915.3251186-1-masahiroy@kernel.org>
 <20220924181915.3251186-5-masahiroy@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="OKXlH7/1ZlkiNRGL"
Content-Disposition: inline
In-Reply-To: <20220924181915.3251186-5-masahiroy@kernel.org>
Jabber-ID: nicolas@jabber.no
Precedence: bulk


--OKXlH7/1ZlkiNRGL
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, 25 Sep 2022 03:19:12 +0900 Masahiro Yamada wrote:
> 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.

s/furture/future/

>=20
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>=20
> (no changes since v1)
>=20
>  Makefile                | 5 ++++-
>  scripts/link-vmlinux.sh | 3 ---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>=20
> 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_L=
IBS) FORCE
> +	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux_o
> +
>  ARCH_POSTLINK :=3D $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postli=
nk)
> =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) FOR=
CE
> +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

Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

--OKXlH7/1ZlkiNRGL
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEh0E3p4c3JKeBvsLGB1IKcBYmEmkFAmM0ooYACgkQB1IKcBYm
EmmuNw//UaXnTs0KyNhHnKMvn+HXdz2ofuw7GZ/wF0Zwg3Dm5THz4G6rX/zEQ8/S
IqxWW2IBefVuf4N58v/mkBHfaoLSmHmA/pwd/2oB6bJ4sDX3HECgqfruhwL8Zlqn
P1ygfhtMRjEam3HeIUs0J+s5JHbqJ0a3jH2QVOLSNRnKKDU+YUoHcqNgcOS1A93m
zA6LIsxSIhcRnaSYM+i0o54Tij5HQcY2BQJFpJ1O8f7Hs1LQbOXPNGCcP+ISi2r7
J8+d7yMWxy8RwicXSJvBnpPfRRhljd+uBNjQ/imqs7JkImy3RbxVhkjgh9eMNfQo
ArJhnUjSFgic54sO9I29jAxym1m/jqBC2uqm7FM/SjVjGbLW8VeuUvtiEJAqBxhX
/aH+68s16SBDDo6TBgfCCoMEmC2VbeLtAYOE2b/n1zv/xd1TXOYPDJm0JHlzLavk
q1MsHzO022+PpHPqtRbSCQwxXdp3Z/jZBQgLQMXdGHSyhEsgqFAbVdYL6jqxKEZU
cYAjGkCYCwM/dqZRH538Wbio/X3NyB4PtJShIuX06Z+15Julk2rqN+4u+JxoB1Oo
XDYxoWQ9971muUtFuIWjxZL5JKk1GsHFEjkIe4iXr9gla8cE5WAf5etQmravBLdT
e13nsXvts2BR5VLggo9zK29oJ6brzIt1k8ppptwWybZaHAbQ8K0=
=ci1M
-----END PGP SIGNATURE-----

--OKXlH7/1ZlkiNRGL--