Commit a76108d0 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Dave Hansen
Browse files

x86/entry/vdso: Move vdso2c to arch/x86/tools 



It is generally better to build tools in arch/x86/tools to keep host
cflags proliferation down, and to reduce makefile sequencing issues.
Move the vdso build tool vdso2c into arch/x86/tools in preparation for
refactoring the vdso makefiles.

Signed-off-by: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://patch.msgid.link/20251216212606.1325678-3-hpa@zytor.com
parent 93d73005

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ endif 




archscripts: scripts_basic

	$(Q)$(MAKE) $(build)=arch/x86/tools relocs

	$(Q)$(MAKE) $(build)=arch/x86/tools relocs vdso2c



###

# Syscall table generation

arch/x86/entry/vdso/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -38,13 +38,12 @@ VDSO_LDFLAGS_vdso.lds = -m elf_x86_64 -soname linux-vdso.so.1 \ 
$(obj)/vdso64.so.dbg: $(obj)/vdso.lds $(vobjs) FORCE

	$(call if_changed,vdso_and_check)



HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi -I$(srctree)/arch/$(SUBARCH)/include/uapi

hostprogs += vdso2c

VDSO2C = $(objtree)/arch/x86/tools/vdso2c



quiet_cmd_vdso2c = VDSO2C  $@

      cmd_vdso2c = $(obj)/vdso2c $< $(<:%.dbg=%) $@

      cmd_vdso2c = $(VDSO2C) $< $(<:%.dbg=%) $@



$(obj)/vdso%-image.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(obj)/vdso2c FORCE

$(obj)/vdso%-image.c: $(obj)/vdso%.so.dbg $(obj)/vdso%.so $(VDSO2C) FORCE

	$(call if_changed,vdso2c)



#

arch/x86/tools/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -38,9 +38,14 @@ $(obj)/insn_decoder_test.o: $(srctree)/tools/arch/x86/lib/insn.c $(srctree)/tool 


$(obj)/insn_sanity.o: $(srctree)/tools/arch/x86/lib/insn.c $(srctree)/tools/arch/x86/lib/inat.c $(srctree)/tools/arch/x86/include/asm/inat_types.h $(srctree)/tools/arch/x86/include/asm/inat.h $(srctree)/tools/arch/x86/include/asm/insn.h $(objtree)/arch/x86/lib/inat-tables.c



HOST_EXTRACFLAGS += -I$(srctree)/tools/include

hostprogs	+= relocs

HOST_EXTRACFLAGS += -I$(srctree)/tools/include -I$(srctree)/include/uapi \

		    -I$(srctree)/arch/$(SUBARCH)/include/uapi



hostprogs	+= relocs vdso2c

relocs-objs	:= relocs_32.o relocs_64.o relocs_common.o

PHONY += relocs

relocs: $(obj)/relocs



always-y	:= $(hostprogs)



PHONY += $(hostprogs)

$(hostprogs): %: $(obj)/%

	@: