Skip to contentSkip to conversation

sparc: vdso: clean up build artifacts in arch/sparc/vdso/

PATCH In review Masahiro Yamada 2 participants 5 messages Dec 3, 2023 – Dec 10, 2023

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

PATCH 1/3 sparc: vdso: clean up build artifacts in arch/sparc/vdso/

Currently, vdso-image-*.c, vdso*.so, vdso*.so.dbg are not cleaned because 'make clean' does not include include/config/auto.conf, resulting in $(vdso_img-y) being empty.

Add the build artifacts to 'targets' unconditionally.

---

 arch/sparc/vdso/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/sparc/vdso/Makefile +1 -4
index d08c3a0443f3..eb52d0666ffc 100644
@@ -24,11 +24,8 @@ targets += vdso.lds $(vobjs-y)
 
 # Build the vDSO image C files and link them in.
 vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o)
-vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c)
-vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg)
 obj-y += $(vdso_img_objs)
-targets += $(vdso_img_cfiles)
-targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
+targets += $(foreach x, 32 64, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg)
 
 CPPFLAGS_vdso.lds += -P -C
 
Signature · 1 line
2.40.1
#1 lore raw

PATCH 2/3 sparc: vdso: simplify obj-y addition

Add objects to obj-y in a more straightforward way.

---

 arch/sparc/vdso/Makefile | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
arch/sparc/vdso/Makefile +2 -9
index eb52d0666ffc..03a32b6156ee 100644
@@ -3,9 +3,6 @@
 # Building vDSO images for sparc.
 #
 
-VDSO64-$(CONFIG_SPARC64)	:= y
-VDSOCOMPAT-$(CONFIG_COMPAT)	:= y
-
 # files to link into the vdso
 vobjs-y := vdso-note.o vclock_gettime.o
 
@@ -13,18 +10,14 @@ vobjs-y := vdso-note.o vclock_gettime.o
 obj-y				+= vma.o
 
 # vDSO images to build
-vdso_img-$(VDSO64-y)		+= 64
-vdso_img-$(VDSOCOMPAT-y)	+= 32
+obj-$(CONFIG_SPARC64)		+= vdso-image-64.o
+obj-$(CONFIG_COMPAT)		+= vdso-image-32.o
 
 vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
 
 $(obj)/vdso.o: $(obj)/vdso.so
 
 targets += vdso.lds $(vobjs-y)
-
-# Build the vDSO image C files and link them in.
-vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o)
-obj-y += $(vdso_img_objs)
 targets += $(foreach x, 32 64, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg)
 
 CPPFLAGS_vdso.lds += -P -C
Signature · 1 line
2.40.1
#2 lore raw

PATCH 3/3 sparc: vdso: use $(addprefix ) instead of $(foreach )

In reply to Masahiro Yamada

$(addprefix ) is slightly shorter and more intuitive.

---

 arch/sparc/vdso/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sparc/vdso/Makefile +1 -1
index 03a32b6156ee..7f5eedf1f5e0 100644
@@ -13,7 +13,7 @@ obj-y				+= vma.o
 obj-$(CONFIG_SPARC64)		+= vdso-image-64.o
 obj-$(CONFIG_COMPAT)		+= vdso-image-32.o
 
-vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
+vobjs := $(addprefix $(obj)/, $(vobjs-y))
 
 $(obj)/vdso.o: $(obj)/vdso.so
 
Signature · 1 line
2.40.1
Acked-by on v1 1/3
#3 lore raw
In reply to Masahiro Yamada

Hi Masahiro.

Quoted 7 lines · Masahiro Yamada

Currently, vdso-image-*.c, vdso*.so, vdso*.so.dbg are not cleaned because 'make clean' does not include include/config/auto.conf, resulting in $(vdso_img-y) being empty.

Add the build artifacts to 'targets' unconditionally.

Nice small fix/clean-ups.

This and the following two patches are:

Quoted 25 lines

---

 arch/sparc/vdso/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
arch/sparc/vdso/Makefile +1 -4
index d08c3a0443f3..eb52d0666ffc 100644
@@ -24,11 +24,8 @@ targets += vdso.lds $(vobjs-y)
 
 # Build the vDSO image C files and link them in.
 vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o)
-vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c)
-vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg)
 obj-y += $(vdso_img_objs)
-targets += $(vdso_img_cfiles)
-targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
+targets += $(foreach x, 32 64, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg)
 
 CPPFLAGS_vdso.lds += -P -C
 
Signature · 1 line
2.40.1
#4 lore raw
Quoted 8 lines · Sam Ravnborg

Hi Masahiro.

Quoted 4 lines · Masahiro Yamada

Currently, vdso-image-*.c, vdso*.so, vdso*.so.dbg are not cleaned because 'make clean' does not include include/config/auto.conf, resulting in $(vdso_img-y) being empty.

Quoted 11 lines
Quoted 3 lines

Add the build artifacts to 'targets' unconditionally.

Nice small fix/clean-ups.

This and the following two patches are:

Quoted 2 lines

---

Series, applied to linux-kbuild.

Signature · 2 lines
Best Regards
Masahiro Yamada