[PATCH] parisc: add vdso linker script to 'targets' instead of extra-y

[PATCH] parisc: add vdso linker script to 'targets' instead of extra-y

[Masahiro Yamada]

The vdso linker script is preprocessed on demand.
Adding it to 'targets' is enough to include the .cmd file.

This commit applies the previous change to parisc, which added the
vdso support after commit 887af6d7c99e ("arch: vdso: add vdso linker
script to 'targets' instead of extra-y").

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

 arch/parisc/kernel/vdso32/Makefile | 2 +-
 arch/parisc/kernel/vdso64/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/parisc/kernel/vdso32/Makefile b/arch/parisc/kernel/vdso32/Makefile
index 2b36d25ada6e..288f8b85978f 100644
--- a/arch/parisc/kernel/vdso32/Makefile
+++ b/arch/parisc/kernel/vdso32/Makefile
@@ -33,7 +33,7 @@ KBUILD_CFLAGS += -DBUILD_VDSO -DDISABLE_BRANCH_PROFILING
 VDSO_LIBGCC := $(shell $(CROSS32CC) -print-libgcc-file-name)
 
 obj-y += vdso32_wrapper.o
-extra-y += vdso32.lds
+targets += vdso32.lds
 CPPFLAGS_vdso32.lds += -P -C  #  -U$(ARCH)
 
 $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so FORCE
diff --git a/arch/parisc/kernel/vdso64/Makefile b/arch/parisc/kernel/vdso64/Makefile
index bd87bd6a6659..bc5d9553f311 100644
--- a/arch/parisc/kernel/vdso64/Makefile
+++ b/arch/parisc/kernel/vdso64/Makefile
@@ -32,7 +32,7 @@ KBUILD_CFLAGS += -DBUILD_VDSO -DDISABLE_BRANCH_PROFILING
 VDSO_LIBGCC := $(shell $(CC) -print-libgcc-file-name)
 
 obj-y += vdso64_wrapper.o
-extra-y += vdso64.lds
+targets += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so FORCE
-- 
2.43.0

Re: [PATCH] parisc: add vdso linker script to 'targets' instead of extra-y

[Helge Deller]

On 12/21/24 07:16, Masahiro Yamada wrote:
> The vdso linker script is preprocessed on demand.
> Adding it to 'targets' is enough to include the .cmd file.
>
> This commit applies the previous change to parisc, which added the
> vdso support after commit 887af6d7c99e ("arch: vdso: add vdso linker
> script to 'targets' instead of extra-y").
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Acked-by: Helge Deller <deller@gmx.de>

I've applied this patch to the parisc git tree.
Let me know if you take it yourself...

Helge


> ---
>
>   arch/parisc/kernel/vdso32/Makefile | 2 +-
>   arch/parisc/kernel/vdso64/Makefile | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/parisc/kernel/vdso32/Makefile b/arch/parisc/kernel/vdso32/Makefile
> index 2b36d25ada6e..288f8b85978f 100644
> --- a/arch/parisc/kernel/vdso32/Makefile
> +++ b/arch/parisc/kernel/vdso32/Makefile
> @@ -33,7 +33,7 @@ KBUILD_CFLAGS += -DBUILD_VDSO -DDISABLE_BRANCH_PROFILING
>   VDSO_LIBGCC := $(shell $(CROSS32CC) -print-libgcc-file-name)
>
>   obj-y += vdso32_wrapper.o
> -extra-y += vdso32.lds
> +targets += vdso32.lds
>   CPPFLAGS_vdso32.lds += -P -C  #  -U$(ARCH)
>
>   $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so FORCE
> diff --git a/arch/parisc/kernel/vdso64/Makefile b/arch/parisc/kernel/vdso64/Makefile
> index bd87bd6a6659..bc5d9553f311 100644
> --- a/arch/parisc/kernel/vdso64/Makefile
> +++ b/arch/parisc/kernel/vdso64/Makefile
> @@ -32,7 +32,7 @@ KBUILD_CFLAGS += -DBUILD_VDSO -DDISABLE_BRANCH_PROFILING
>   VDSO_LIBGCC := $(shell $(CC) -print-libgcc-file-name)
>
>   obj-y += vdso64_wrapper.o
> -extra-y += vdso64.lds
> +targets += vdso64.lds
>   CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
>
>   $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so FORCE