Skip to content

Commit 8cf7765

Browse files
masahir0ydavem330
authored andcommitted
sparc: vdso: clean-up vdso Makefile
arch/sparc/vdso/Makefile is a replica of arch/x86/entry/vdso/Makefile. Clean-up the Makefile in the same way as I did for x86: - Remove unnecessary export - Put the generated linker script to $(obj)/ instead of $(src)/ - Simplify cmd_vdso2c The corresponding x86 commits are: - 61615fa ("x86/build/vdso: Remove unnecessary export in Makefile") - 1742ed2 ("x86/build/vdso: Put generated linker scripts to $(obj)/") - c5fcdbf ("x86/build/vdso: Simplify 'cmd_vdso2c'") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 16e2a9d commit 8cf7765

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

arch/sparc/vdso/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,21 @@ obj-y += $(vdso_img_objs)
3131
targets += $(vdso_img_cfiles)
3232
targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
3333

34-
export CPPFLAGS_vdso.lds += -P -C
34+
CPPFLAGS_vdso.lds += -P -C
3535

3636
VDSO_LDFLAGS_vdso.lds = -m64 -Wl,-soname=linux-vdso.so.1 \
3737
-Wl,--no-undefined \
3838
-Wl,-z,max-page-size=8192 -Wl,-z,common-page-size=8192 \
3939
$(DISABLE_LTO)
4040

41-
$(obj)/vdso64.so.dbg: $(src)/vdso.lds $(vobjs) FORCE
41+
$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE
4242
$(call if_changed,vdso)
4343

4444
HOST_EXTRACFLAGS += -I$(srctree)/tools/include
4545
hostprogs-y += vdso2c
4646

4747
quiet_cmd_vdso2c = VDSO2C $@
48-
define cmd_vdso2c
49-
$(obj)/vdso2c $< $(<:%.dbg=%) $@
50-
endef
48+
cmd_vdso2c = $(obj)/vdso2c $< $(<:%.dbg=%) $@
5149

5250
$(obj)/vdso-image-%.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE
5351
$(call if_changed,vdso2c)

0 commit comments

Comments
 (0)