All of lore.kernel.org
 help / color / mirror / Atom feed
From: Palmer Dabbelt <palmer@dabbelt.com>
To: jszhang3@mail.ustc.edu.cn
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
	aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org,
	linux-kernel@vger.kernel.org, masahiroy@kernel.org
Subject: Re: [PATCH] riscv: vdso: fix and clean-up Makefile
Date: Thu, 22 Apr 2021 20:00:19 -0700 (PDT)	[thread overview]
Message-ID: <mhng-847a8bb0-7c9a-446a-971c-ede38543cf56@palmerdabbelt-glaptop> (raw)
In-Reply-To: <20210402212908.6f9b9686@xhacker>

On Fri, 02 Apr 2021 06:29:08 PDT (-0700), jszhang3@mail.ustc.edu.cn wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> Running "make" on an already compiled kernel tree will rebuild the
> kernel even without any modifications:
>
>   CALL    linux/scripts/checksyscalls.sh
>   CALL    linux/scripts/atomic/check-atomics.sh
>   CHK     include/generated/compile.h
>   SO2S    arch/riscv/kernel/vdso/vdso-syms.S
>   AS      arch/riscv/kernel/vdso/vdso-syms.o
>   AR      arch/riscv/kernel/vdso/built-in.a
>   AR      arch/riscv/kernel/built-in.a
>   AR      arch/riscv/built-in.a
>   GEN     .version
>   CHK     include/generated/compile.h
>   UPD     include/generated/compile.h
>   CC      init/version.o
>   AR      init/built-in.a
>   LD      vmlinux.o
>
> The reason is "Any target that utilizes if_changed must be listed in
> $(targets), otherwise the command line check will fail, and the target
> will always be built" as explained by Documentation/kbuild/makefiles.rst
>
> Fix this build bug by adding vdso-syms.S to $(targets)
>
> At the same time, there are two trivial clean up modifications:
>
> - the vdso-dummy.o is not needed any more after so remove it.
>
> - vdso.lds is a generated file, so it should be prefixed with
>   $(obj)/ instead of $(src)/
>
> Fixes: c2c81bb2f691 ("RISC-V: Fix the VDSO symbol generaton for binutils-2.35+")
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
>  arch/riscv/kernel/vdso/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
> index 71a315e73cbe..7b9f505ba82f 100644
> --- a/arch/riscv/kernel/vdso/Makefile
> +++ b/arch/riscv/kernel/vdso/Makefile
> @@ -23,7 +23,7 @@ ifneq ($(c-gettimeofday-y),)
>  endif
>
>  # Build rules
> -targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-dummy.o
> +targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-syms.S
>  obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
>
>  obj-y += vdso.o vdso-syms.o
> @@ -42,7 +42,7 @@ $(obj)/vdso.o: $(obj)/vdso.so
>
>  # link rule for the .so file, .lds has to be first
>  SYSCFLAGS_vdso.so.dbg = $(c_flags)
> -$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
> +$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
>  	$(call if_changed,vdsold)
>  SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
>  	-Wl,--build-id=sha1 -Wl,--hash-style=both

Thanks, this is on for-next.

WARNING: multiple messages have this Message-ID (diff)
From: Palmer Dabbelt <palmer@dabbelt.com>
To: jszhang3@mail.ustc.edu.cn
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
	aou@eecs.berkeley.edu, linux-riscv@lists.infradead.org,
	linux-kernel@vger.kernel.org, masahiroy@kernel.org
Subject: Re: [PATCH] riscv: vdso: fix and clean-up Makefile
Date: Thu, 22 Apr 2021 20:00:19 -0700 (PDT)	[thread overview]
Message-ID: <mhng-847a8bb0-7c9a-446a-971c-ede38543cf56@palmerdabbelt-glaptop> (raw)
In-Reply-To: <20210402212908.6f9b9686@xhacker>

On Fri, 02 Apr 2021 06:29:08 PDT (-0700), jszhang3@mail.ustc.edu.cn wrote:
> From: Jisheng Zhang <jszhang@kernel.org>
>
> Running "make" on an already compiled kernel tree will rebuild the
> kernel even without any modifications:
>
>   CALL    linux/scripts/checksyscalls.sh
>   CALL    linux/scripts/atomic/check-atomics.sh
>   CHK     include/generated/compile.h
>   SO2S    arch/riscv/kernel/vdso/vdso-syms.S
>   AS      arch/riscv/kernel/vdso/vdso-syms.o
>   AR      arch/riscv/kernel/vdso/built-in.a
>   AR      arch/riscv/kernel/built-in.a
>   AR      arch/riscv/built-in.a
>   GEN     .version
>   CHK     include/generated/compile.h
>   UPD     include/generated/compile.h
>   CC      init/version.o
>   AR      init/built-in.a
>   LD      vmlinux.o
>
> The reason is "Any target that utilizes if_changed must be listed in
> $(targets), otherwise the command line check will fail, and the target
> will always be built" as explained by Documentation/kbuild/makefiles.rst
>
> Fix this build bug by adding vdso-syms.S to $(targets)
>
> At the same time, there are two trivial clean up modifications:
>
> - the vdso-dummy.o is not needed any more after so remove it.
>
> - vdso.lds is a generated file, so it should be prefixed with
>   $(obj)/ instead of $(src)/
>
> Fixes: c2c81bb2f691 ("RISC-V: Fix the VDSO symbol generaton for binutils-2.35+")
> Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
> ---
>  arch/riscv/kernel/vdso/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile
> index 71a315e73cbe..7b9f505ba82f 100644
> --- a/arch/riscv/kernel/vdso/Makefile
> +++ b/arch/riscv/kernel/vdso/Makefile
> @@ -23,7 +23,7 @@ ifneq ($(c-gettimeofday-y),)
>  endif
>
>  # Build rules
> -targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-dummy.o
> +targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds vdso-syms.S
>  obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
>
>  obj-y += vdso.o vdso-syms.o
> @@ -42,7 +42,7 @@ $(obj)/vdso.o: $(obj)/vdso.so
>
>  # link rule for the .so file, .lds has to be first
>  SYSCFLAGS_vdso.so.dbg = $(c_flags)
> -$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso) FORCE
> +$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
>  	$(call if_changed,vdsold)
>  SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
>  	-Wl,--build-id=sha1 -Wl,--hash-style=both

Thanks, this is on for-next.

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

  reply	other threads:[~2021-04-23  3:00 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-02 13:29 [PATCH] riscv: vdso: fix and clean-up Makefile Jisheng Zhang
2021-04-02 13:29 ` Jisheng Zhang
2021-04-23  3:00 ` Palmer Dabbelt [this message]
2021-04-23  3:00   ` Palmer Dabbelt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=mhng-847a8bb0-7c9a-446a-971c-ede38543cf56@palmerdabbelt-glaptop \
    --to=palmer@dabbelt.com \
    --cc=aou@eecs.berkeley.edu \
    --cc=jszhang3@mail.ustc.edu.cn \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=masahiroy@kernel.org \
    --cc=paul.walmsley@sifive.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.