Skip to contentSkip to conversation

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

PATCH In review Masahiro Yamada 3 participants 4 messages Aug 31, 2020 – Sep 7, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arch: vdso: 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.

---

 arch/arm64/kernel/vdso/Makefile     | 2 +-
 arch/arm64/kernel/vdso32/Makefile   | 2 +-
 arch/nds32/kernel/vdso/Makefile     | 2 +-
 arch/powerpc/kernel/vdso32/Makefile | 2 +-
 arch/powerpc/kernel/vdso64/Makefile | 2 +-
 arch/s390/kernel/vdso64/Makefile    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/kernel/vdso/Makefile +1 -1
index 45d5cfe46429..7cd8aafbe96e 100644
@@ -54,7 +54,7 @@ endif
 GCOV_PROFILE := n
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency (incbin is bad)
arch/arm64/kernel/vdso32/Makefile +1 -1
index d6adb4677c25..572475b7b7ed 100644
@@ -155,7 +155,7 @@ asm-obj-vdso := $(addprefix $(obj)/, $(asm-obj-vdso))
 obj-vdso := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso)
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency (vdso.s includes vdso.so through incbin)
arch/nds32/kernel/vdso/Makefile +1 -1
index 7c3c1ccb196e..55df25ef0057 100644
@@ -20,7 +20,7 @@ GCOV_PROFILE := n
 
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency
arch/powerpc/kernel/vdso32/Makefile +1 -1
index 87ab1152d5ce..fd5072a4c73c 100644
@@ -29,7 +29,7 @@ ccflags-y := -shared -fno-common -fno-builtin -nostdlib \
 asflags-y := -D__VDSO32__ -s
 
 obj-y += vdso32_wrapper.o
-extra-y += vdso32.lds
+targets += vdso32.lds
 CPPFLAGS_vdso32.lds += -P -C -Upowerpc
 
 # Force dependency (incbin is bad)
arch/powerpc/kernel/vdso64/Makefile +1 -1
index 38c317f25141..c737b3ea3207 100644
@@ -17,7 +17,7 @@ ccflags-y := -shared -fno-common -fno-builtin -nostdlib \
 asflags-y := -D__VDSO64__ -s
 
 obj-y += vdso64_wrapper.o
-extra-y += vdso64.lds
+targets += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 # Force dependency (incbin is bad)
arch/s390/kernel/vdso64/Makefile +1 -1
index 4a66a1cb919b..d0d406cfffa9 100644
@@ -25,7 +25,7 @@ $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)
 $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
 
 obj-y += vdso64_wrapper.o
-extra-y += vdso64.lds
+targets += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 # Disable gcov profiling, ubsan and kasan for VDSO code
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#2 lore raw
In reply to Masahiro Yamada

Masahiro Yamada <[email protected]> 於 2020年9月1日 週二 上午2:23寫道:

Quoted 85 lines

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

---

 arch/arm64/kernel/vdso/Makefile     | 2 +-
 arch/arm64/kernel/vdso32/Makefile   | 2 +-
 arch/nds32/kernel/vdso/Makefile     | 2 +-
 arch/powerpc/kernel/vdso32/Makefile | 2 +-
 arch/powerpc/kernel/vdso64/Makefile | 2 +-
 arch/s390/kernel/vdso64/Makefile    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/kernel/vdso/Makefile +1 -1
index 45d5cfe46429..7cd8aafbe96e 100644
@@ -54,7 +54,7 @@ endif
 GCOV_PROFILE := n
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency (incbin is bad)
arch/arm64/kernel/vdso32/Makefile +1 -1
index d6adb4677c25..572475b7b7ed 100644
@@ -155,7 +155,7 @@ asm-obj-vdso := $(addprefix $(obj)/, $(asm-obj-vdso))
 obj-vdso := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso)
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency (vdso.s includes vdso.so through incbin)
arch/nds32/kernel/vdso/Makefile +1 -1
index 7c3c1ccb196e..55df25ef0057 100644
@@ -20,7 +20,7 @@ GCOV_PROFILE := n
 
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency
arch/powerpc/kernel/vdso32/Makefile +1 -1
index 87ab1152d5ce..fd5072a4c73c 100644
@@ -29,7 +29,7 @@ ccflags-y := -shared -fno-common -fno-builtin -nostdlib \
 asflags-y := -D__VDSO32__ -s
 
 obj-y += vdso32_wrapper.o
-extra-y += vdso32.lds
+targets += vdso32.lds
 CPPFLAGS_vdso32.lds += -P -C -Upowerpc
 
 # Force dependency (incbin is bad)
arch/powerpc/kernel/vdso64/Makefile +1 -1
index 38c317f25141..c737b3ea3207 100644
@@ -17,7 +17,7 @@ ccflags-y := -shared -fno-common -fno-builtin -nostdlib \
 asflags-y := -D__VDSO64__ -s
 
 obj-y += vdso64_wrapper.o
-extra-y += vdso64.lds
+targets += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 # Force dependency (incbin is bad)
arch/s390/kernel/vdso64/Makefile +0 -0
index 4a66a1cb919b..d0d406cfffa9 100644

arch/s390/kernel/vdso64/Makefile $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64) · line 31

Quoted 8 lines
arch/s390/kernel/vdso64/Makefile +1 -1
@@ -25,7 +25,7 @@ $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)
 $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
 
 obj-y += vdso64_wrapper.o
-extra-y += vdso64.lds
+targets += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 # Disable gcov profiling, ubsan and kasan for VDSO code

For nds32:

#3 lore raw
In reply to Masahiro Yamada
Quoted 6 lines · Masahiro Yamada

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

---

Applied to linux-kbuild.

Quoted 89 lines
 arch/arm64/kernel/vdso/Makefile     | 2 +-
 arch/arm64/kernel/vdso32/Makefile   | 2 +-
 arch/nds32/kernel/vdso/Makefile     | 2 +-
 arch/powerpc/kernel/vdso32/Makefile | 2 +-
 arch/powerpc/kernel/vdso64/Makefile | 2 +-
 arch/s390/kernel/vdso64/Makefile    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
arch/arm64/kernel/vdso/Makefile +1 -1
index 45d5cfe46429..7cd8aafbe96e 100644
@@ -54,7 +54,7 @@ endif
 GCOV_PROFILE := n
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency (incbin is bad)
arch/arm64/kernel/vdso32/Makefile +1 -1
index d6adb4677c25..572475b7b7ed 100644
@@ -155,7 +155,7 @@ asm-obj-vdso := $(addprefix $(obj)/, $(asm-obj-vdso))
 obj-vdso := $(c-obj-vdso) $(c-obj-vdso-gettimeofday) $(asm-obj-vdso)
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency (vdso.s includes vdso.so through incbin)
arch/nds32/kernel/vdso/Makefile +1 -1
index 7c3c1ccb196e..55df25ef0057 100644
@@ -20,7 +20,7 @@ GCOV_PROFILE := n
 
 
 obj-y += vdso.o
-extra-y += vdso.lds
+targets += vdso.lds
 CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
 
 # Force dependency
arch/powerpc/kernel/vdso32/Makefile +1 -1
index 87ab1152d5ce..fd5072a4c73c 100644
@@ -29,7 +29,7 @@ ccflags-y := -shared -fno-common -fno-builtin -nostdlib \
 asflags-y := -D__VDSO32__ -s
 
 obj-y += vdso32_wrapper.o
-extra-y += vdso32.lds
+targets += vdso32.lds
 CPPFLAGS_vdso32.lds += -P -C -Upowerpc
 
 # Force dependency (incbin is bad)
arch/powerpc/kernel/vdso64/Makefile +1 -1
index 38c317f25141..c737b3ea3207 100644
@@ -17,7 +17,7 @@ ccflags-y := -shared -fno-common -fno-builtin -nostdlib \
 asflags-y := -D__VDSO64__ -s
 
 obj-y += vdso64_wrapper.o
-extra-y += vdso64.lds
+targets += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 # Force dependency (incbin is bad)
arch/s390/kernel/vdso64/Makefile +1 -2
index 4a66a1cb919b..d0d406cfffa9 100644
@@ -25,7 +25,7 @@ $(targets:%=$(obj)/%.dbg): KBUILD_CFLAGS = $(KBUILD_CFLAGS_64)
 $(targets:%=$(obj)/%.dbg): KBUILD_AFLAGS = $(KBUILD_AFLAGS_64)
 
 obj-y += vdso64_wrapper.o
-extra-y += vdso64.lds
+targets += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 # Disable gcov profiling, ubsan and kasan for VDSO code
--

2.25.1

Signature · 2 lines
Best Regards
Masahiro Yamada