Skip to contentSkip to conversation

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

PATCH Applied Masahiro Yamada 2 participants 2 messages Dec 21, 2024 – Jan 18, 2025 PA-RISC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 parisc: add vdso linker script to 'targets' instead of extra-y

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").

---

 arch/parisc/kernel/vdso32/Makefile | 2 +-
 arch/parisc/kernel/vdso64/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/parisc/kernel/vdso32/Makefile +1 -1
index 2b36d25ada6e..288f8b85978f 100644
@@ -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
arch/parisc/kernel/vdso64/Makefile +1 -1
index bd87bd6a6659..bc5d9553f311 100644
@@ -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
Signature · 1 line
2.43.0
maintainer Acked-by on v1 1/1 Applied
#1 lore raw
Quoted 8 lines · 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").

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

Helge

Quoted 32 lines

---

  arch/parisc/kernel/vdso32/Makefile | 2 +-
  arch/parisc/kernel/vdso64/Makefile | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
arch/parisc/kernel/vdso32/Makefile +1 -1
index 2b36d25ada6e..288f8b85978f 100644
@@ -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
arch/parisc/kernel/vdso64/Makefile +1 -1
index bd87bd6a6659..bc5d9553f311 100644
@@ -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