arch: syscalls: add missing FORCE and fix 'targets' to make if_changed work

The rules in these Makefiles cannot detect the command line change
because the prerequisite 'FORCE' is missing.

Adding 'FORCE' will result in the headers being rebuilt every time
because the 'targets' additions are also wrong; the file paths in
'targets' must be relative to the current Makefile.

Fix all of them so the if_changed rules work correctly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Masahiro Yamada
2021-02-15 09:48:22 +09:00
parent 585d32f9b0
commit 865fa29f7d
11 changed files with 91 additions and 80 deletions

View File

@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_abi_$(basetarget))' \ '$(systbl_abi_$(basetarget))' \
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
$(kapi)/syscall_table.h: $(syscall) $(systbl) $(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h uapisyshdr-y += unistd_32.h
kapisyshdr-y += syscall_table.h kapisyshdr-y += syscall_table.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -22,19 +22,20 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
syshdr_offset_unistd_64 := __NR_Linux syshdr_offset_unistd_64 := __NR_Linux
$(uapi)/unistd_64.h: $(syscall) $(syshdr) $(uapi)/unistd_64.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
systbl_offset_syscall_table := 1024 systbl_offset_syscall_table := 1024
$(kapi)/syscall_table.h: $(syscall) $(systbl) $(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_64.h uapisyshdr-y += unistd_64.h
kapisyshdr-y += syscall_table.h kapisyshdr-y += syscall_table.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_abi_$(basetarget))' \ '$(systbl_abi_$(basetarget))' \
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
$(kapi)/syscall_table.h: $(syscall) $(systbl) $(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h uapisyshdr-y += unistd_32.h
kapisyshdr-y += syscall_table.h kapisyshdr-y += syscall_table.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_abi_$(basetarget))' \ '$(systbl_abi_$(basetarget))' \
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
$(kapi)/syscall_table.h: $(syscall) $(systbl) $(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h uapisyshdr-y += unistd_32.h
kapisyshdr-y += syscall_table.h kapisyshdr-y += syscall_table.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -31,50 +31,50 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
syshdr_offset_unistd_n32 := __NR_Linux syshdr_offset_unistd_n32 := __NR_Linux
$(uapi)/unistd_n32.h: $(syscalln32) $(syshdr) $(uapi)/unistd_n32.h: $(syscalln32) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_offset_unistd_n64 := __NR_Linux syshdr_offset_unistd_n64 := __NR_Linux
$(uapi)/unistd_n64.h: $(syscalln64) $(syshdr) $(uapi)/unistd_n64.h: $(syscalln64) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_offset_unistd_o32 := __NR_Linux syshdr_offset_unistd_o32 := __NR_Linux
$(uapi)/unistd_o32.h: $(syscallo32) $(syshdr) $(uapi)/unistd_o32.h: $(syscallo32) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
sysnr_pfx_unistd_nr_n32 := N32 sysnr_pfx_unistd_nr_n32 := N32
sysnr_offset_unistd_nr_n32 := 6000 sysnr_offset_unistd_nr_n32 := 6000
$(uapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) $(uapi)/unistd_nr_n32.h: $(syscalln32) $(sysnr) FORCE
$(call if_changed,sysnr) $(call if_changed,sysnr)
sysnr_pfx_unistd_nr_n64 := 64 sysnr_pfx_unistd_nr_n64 := 64
sysnr_offset_unistd_nr_n64 := 5000 sysnr_offset_unistd_nr_n64 := 5000
$(uapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) $(uapi)/unistd_nr_n64.h: $(syscalln64) $(sysnr) FORCE
$(call if_changed,sysnr) $(call if_changed,sysnr)
sysnr_pfx_unistd_nr_o32 := O32 sysnr_pfx_unistd_nr_o32 := O32
sysnr_offset_unistd_nr_o32 := 4000 sysnr_offset_unistd_nr_o32 := 4000
$(uapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) $(uapi)/unistd_nr_o32.h: $(syscallo32) $(sysnr) FORCE
$(call if_changed,sysnr) $(call if_changed,sysnr)
systbl_abi_syscall_table_32_o32 := 32_o32 systbl_abi_syscall_table_32_o32 := 32_o32
systbl_offset_syscall_table_32_o32 := 4000 systbl_offset_syscall_table_32_o32 := 4000
$(kapi)/syscall_table_32_o32.h: $(syscallo32) $(systbl) $(kapi)/syscall_table_32_o32.h: $(syscallo32) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abi_syscall_table_64_n32 := 64_n32 systbl_abi_syscall_table_64_n32 := 64_n32
systbl_offset_syscall_table_64_n32 := 6000 systbl_offset_syscall_table_64_n32 := 6000
$(kapi)/syscall_table_64_n32.h: $(syscalln32) $(systbl) $(kapi)/syscall_table_64_n32.h: $(syscalln32) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abi_syscall_table_64_n64 := 64_n64 systbl_abi_syscall_table_64_n64 := 64_n64
systbl_offset_syscall_table_64_n64 := 5000 systbl_offset_syscall_table_64_n64 := 5000
$(kapi)/syscall_table_64_n64.h: $(syscalln64) $(systbl) $(kapi)/syscall_table_64_n64.h: $(syscalln64) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abi_syscall_table_64_o32 := 64_o32 systbl_abi_syscall_table_64_o32 := 64_o32
systbl_offset_syscall_table_64_o32 := 4000 systbl_offset_syscall_table_64_o32 := 4000
$(kapi)/syscall_table_64_o32.h: $(syscallo32) $(systbl) $(kapi)/syscall_table_64_o32.h: $(syscallo32) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_n32.h \ uapisyshdr-y += unistd_n32.h \
@@ -88,9 +88,10 @@ kapisyshdr-y += syscall_table_32_o32.h \
syscall_table_64_n64.h \ syscall_table_64_n64.h \
syscall_table_64_o32.h syscall_table_64_o32.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -22,24 +22,24 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
syshdr_abis_unistd_32 := common,32 syshdr_abis_unistd_32 := common,32
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_abis_unistd_64 := common,64 syshdr_abis_unistd_64 := common,64
$(uapi)/unistd_64.h: $(syscall) $(syshdr) $(uapi)/unistd_64.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
systbl_abis_syscall_table_32 := common,32 systbl_abis_syscall_table_32 := common,32
$(kapi)/syscall_table_32.h: $(syscall) $(systbl) $(kapi)/syscall_table_32.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abis_syscall_table_64 := common,64 systbl_abis_syscall_table_64 := common,64
$(kapi)/syscall_table_64.h: $(syscall) $(systbl) $(kapi)/syscall_table_64.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abis_syscall_table_c32 := common,32 systbl_abis_syscall_table_c32 := common,32
systbl_abi_syscall_table_c32 := c32 systbl_abi_syscall_table_c32 := c32
$(kapi)/syscall_table_c32.h: $(syscall) $(systbl) $(kapi)/syscall_table_c32.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h unistd_64.h uapisyshdr-y += unistd_32.h unistd_64.h
@@ -47,9 +47,10 @@ kapisyshdr-y += syscall_table_32.h \
syscall_table_64.h \ syscall_table_64.h \
syscall_table_c32.h syscall_table_c32.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -22,31 +22,31 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
syshdr_abis_unistd_32 := common,nospu,32 syshdr_abis_unistd_32 := common,nospu,32
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_abis_unistd_64 := common,nospu,64 syshdr_abis_unistd_64 := common,nospu,64
$(uapi)/unistd_64.h: $(syscall) $(syshdr) $(uapi)/unistd_64.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
systbl_abis_syscall_table_32 := common,nospu,32 systbl_abis_syscall_table_32 := common,nospu,32
systbl_abi_syscall_table_32 := 32 systbl_abi_syscall_table_32 := 32
$(kapi)/syscall_table_32.h: $(syscall) $(systbl) $(kapi)/syscall_table_32.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abis_syscall_table_64 := common,nospu,64 systbl_abis_syscall_table_64 := common,nospu,64
systbl_abi_syscall_table_64 := 64 systbl_abi_syscall_table_64 := 64
$(kapi)/syscall_table_64.h: $(syscall) $(systbl) $(kapi)/syscall_table_64.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abis_syscall_table_c32 := common,nospu,32 systbl_abis_syscall_table_c32 := common,nospu,32
systbl_abi_syscall_table_c32 := c32 systbl_abi_syscall_table_c32 := c32
$(kapi)/syscall_table_c32.h: $(syscall) $(systbl) $(kapi)/syscall_table_c32.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abis_syscall_table_spu := common,spu systbl_abis_syscall_table_spu := common,spu
systbl_abi_syscall_table_spu := spu systbl_abi_syscall_table_spu := spu
$(kapi)/syscall_table_spu.h: $(syscall) $(systbl) $(kapi)/syscall_table_spu.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h unistd_64.h uapisyshdr-y += unistd_32.h unistd_64.h
@@ -55,9 +55,10 @@ kapisyshdr-y += syscall_table_32.h \
syscall_table_c32.h \ syscall_table_c32.h \
syscall_table_spu.h syscall_table_spu.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_abi_$(basetarget))' \ '$(systbl_abi_$(basetarget))' \
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
$(kapi)/syscall_table.h: $(syscall) $(systbl) $(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h uapisyshdr-y += unistd_32.h
kapisyshdr-y += syscall_table.h kapisyshdr-y += syscall_table.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -22,24 +22,24 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
syshdr_abis_unistd_32 := common,32 syshdr_abis_unistd_32 := common,32
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_abis_unistd_64 := common,64 syshdr_abis_unistd_64 := common,64
$(uapi)/unistd_64.h: $(syscall) $(syshdr) $(uapi)/unistd_64.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
systbl_abis_syscall_table_32 := common,32 systbl_abis_syscall_table_32 := common,32
$(kapi)/syscall_table_32.h: $(syscall) $(systbl) $(kapi)/syscall_table_32.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abis_syscall_table_64 := common,64 systbl_abis_syscall_table_64 := common,64
$(kapi)/syscall_table_64.h: $(syscall) $(systbl) $(kapi)/syscall_table_64.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
systbl_abis_syscall_table_c32 := common,32 systbl_abis_syscall_table_c32 := common,32
systbl_abi_syscall_table_c32 := c32 systbl_abi_syscall_table_c32 := c32
$(kapi)/syscall_table_c32.h: $(syscall) $(systbl) $(kapi)/syscall_table_c32.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h unistd_64.h uapisyshdr-y += unistd_32.h unistd_64.h
@@ -47,9 +47,10 @@ kapisyshdr-y += syscall_table_32.h \
syscall_table_64.h \ syscall_table_64.h \
syscall_table_c32.h syscall_table_c32.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @:

View File

@@ -21,37 +21,37 @@ quiet_cmd_systbl = SYSTBL $@
cmd_systbl = $(CONFIG_SHELL) '$(systbl)' $< $@ cmd_systbl = $(CONFIG_SHELL) '$(systbl)' $< $@
quiet_cmd_hypercalls = HYPERCALLS $@ quiet_cmd_hypercalls = HYPERCALLS $@
cmd_hypercalls = $(CONFIG_SHELL) '$<' $@ $(filter-out $<,$^) cmd_hypercalls = $(CONFIG_SHELL) '$<' $@ $(filter-out $<, $(real-prereqs))
syshdr_abi_unistd_32 := i386 syshdr_abi_unistd_32 := i386
$(uapi)/unistd_32.h: $(syscall32) $(syshdr) $(uapi)/unistd_32.h: $(syscall32) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_abi_unistd_32_ia32 := i386 syshdr_abi_unistd_32_ia32 := i386
syshdr_pfx_unistd_32_ia32 := ia32_ syshdr_pfx_unistd_32_ia32 := ia32_
$(out)/unistd_32_ia32.h: $(syscall32) $(syshdr) $(out)/unistd_32_ia32.h: $(syscall32) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_abi_unistd_x32 := common,x32 syshdr_abi_unistd_x32 := common,x32
syshdr_offset_unistd_x32 := __X32_SYSCALL_BIT syshdr_offset_unistd_x32 := __X32_SYSCALL_BIT
$(uapi)/unistd_x32.h: $(syscall64) $(syshdr) $(uapi)/unistd_x32.h: $(syscall64) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_abi_unistd_64 := common,64 syshdr_abi_unistd_64 := common,64
$(uapi)/unistd_64.h: $(syscall64) $(syshdr) $(uapi)/unistd_64.h: $(syscall64) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
syshdr_abi_unistd_64_x32 := x32 syshdr_abi_unistd_64_x32 := x32
syshdr_pfx_unistd_64_x32 := x32_ syshdr_pfx_unistd_64_x32 := x32_
$(out)/unistd_64_x32.h: $(syscall64) $(syshdr) $(out)/unistd_64_x32.h: $(syscall64) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
$(out)/syscalls_32.h: $(syscall32) $(systbl) $(out)/syscalls_32.h: $(syscall32) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
$(out)/syscalls_64.h: $(syscall64) $(systbl) $(out)/syscalls_64.h: $(syscall64) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
$(out)/xen-hypercalls.h: $(srctree)/scripts/xen-hypercalls.sh $(out)/xen-hypercalls.h: $(srctree)/scripts/xen-hypercalls.sh FORCE
$(call if_changed,hypercalls) $(call if_changed,hypercalls)
$(out)/xen-hypercalls.h: $(srctree)/include/xen/interface/xen*.h $(out)/xen-hypercalls.h: $(srctree)/include/xen/interface/xen*.h
@@ -62,9 +62,10 @@ syshdr-$(CONFIG_X86_64) += unistd_32_ia32.h unistd_64_x32.h
syshdr-$(CONFIG_X86_64) += syscalls_64.h syshdr-$(CONFIG_X86_64) += syscalls_64.h
syshdr-$(CONFIG_XEN) += xen-hypercalls.h syshdr-$(CONFIG_XEN) += xen-hypercalls.h
targets += $(uapisyshdr-y) $(syshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
syshdr-y := $(addprefix $(out)/, $(syshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(syshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(syshdr-y)
all: $(addprefix $(out)/,$(syshdr-y))
@: @:

View File

@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@
'$(systbl_abi_$(basetarget))' \ '$(systbl_abi_$(basetarget))' \
'$(systbl_offset_$(basetarget))' '$(systbl_offset_$(basetarget))'
$(uapi)/unistd_32.h: $(syscall) $(syshdr) $(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE
$(call if_changed,syshdr) $(call if_changed,syshdr)
$(kapi)/syscall_table.h: $(syscall) $(systbl) $(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE
$(call if_changed,systbl) $(call if_changed,systbl)
uapisyshdr-y += unistd_32.h uapisyshdr-y += unistd_32.h
kapisyshdr-y += syscall_table.h kapisyshdr-y += syscall_table.h
targets += $(uapisyshdr-y) $(kapisyshdr-y) uapisyshdr-y := $(addprefix $(uapi)/, $(uapisyshdr-y))
kapisyshdr-y := $(addprefix $(kapi)/, $(kapisyshdr-y))
targets += $(addprefix ../../../../, $(uapisyshdr-y) $(kapisyshdr-y))
PHONY += all PHONY += all
all: $(addprefix $(uapi)/,$(uapisyshdr-y)) all: $(uapisyshdr-y) $(kapisyshdr-y)
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
@: @: