Skip to content

Commit 918d8f9

Browse files
committed
sparc: vdso: simplify obj-y addition
Add objects to obj-y in a more straightforward way. Signed-off-by: Masahiro Yamada <[email protected]> Acked-by: Sam Ravnborg <[email protected]>
1 parent 53c5adf commit 918d8f9

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

arch/sparc/vdso/Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,21 @@
33
# Building vDSO images for sparc.
44
#
55

6-
VDSO64-$(CONFIG_SPARC64) := y
7-
VDSOCOMPAT-$(CONFIG_COMPAT) := y
8-
96
# files to link into the vdso
107
vobjs-y := vdso-note.o vclock_gettime.o
118

129
# files to link into kernel
1310
obj-y += vma.o
1411

1512
# vDSO images to build
16-
vdso_img-$(VDSO64-y) += 64
17-
vdso_img-$(VDSOCOMPAT-y) += 32
13+
obj-$(CONFIG_SPARC64) += vdso-image-64.o
14+
obj-$(CONFIG_COMPAT) += vdso-image-32.o
1815

1916
vobjs := $(foreach F,$(vobjs-y),$(obj)/$F)
2017

2118
$(obj)/vdso.o: $(obj)/vdso.so
2219

2320
targets += vdso.lds $(vobjs-y)
24-
25-
# Build the vDSO image C files and link them in.
26-
vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o)
27-
obj-y += $(vdso_img_objs)
2821
targets += $(foreach x, 32 64, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg)
2922

3023
CPPFLAGS_vdso.lds += -P -C

0 commit comments

Comments
 (0)