Commit 865fa29f authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 585d32f9

arch/alpha/kernel/syscalls/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@ 
		   '$(systbl_abi_$(basetarget))'		\

		   '$(systbl_offset_$(basetarget))'



$(uapi)/unistd_32.h: $(syscall) $(syshdr)

$(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE

	$(call if_changed,syshdr)



$(kapi)/syscall_table.h: $(syscall) $(systbl)

$(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



uapisyshdr-y		+= unistd_32.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

all: $(addprefix $(uapi)/,$(uapisyshdr-y))

all: $(addprefix $(kapi)/,$(kapisyshdr-y))

all: $(uapisyshdr-y) $(kapisyshdr-y)

	@:

arch/ia64/kernel/syscalls/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -22,19 +22,20 @@ quiet_cmd_systbl = SYSTBL $@ 
		   '$(systbl_offset_$(basetarget))'



syshdr_offset_unistd_64 := __NR_Linux

$(uapi)/unistd_64.h: $(syscall) $(syshdr)

$(uapi)/unistd_64.h: $(syscall) $(syshdr) FORCE

	$(call if_changed,syshdr)



systbl_offset_syscall_table := 1024

$(kapi)/syscall_table.h: $(syscall) $(systbl)

$(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



uapisyshdr-y		+= unistd_64.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

all: $(addprefix $(uapi)/,$(uapisyshdr-y))

all: $(addprefix $(kapi)/,$(kapisyshdr-y))

all: $(uapisyshdr-y) $(kapisyshdr-y)

	@:

arch/m68k/kernel/syscalls/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@ 
		   '$(systbl_abi_$(basetarget))'		\

		   '$(systbl_offset_$(basetarget))'



$(uapi)/unistd_32.h: $(syscall) $(syshdr)

$(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE

	$(call if_changed,syshdr)



$(kapi)/syscall_table.h: $(syscall) $(systbl)

$(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



uapisyshdr-y		+= unistd_32.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

all: $(addprefix $(uapi)/,$(uapisyshdr-y))

all: $(addprefix $(kapi)/,$(kapisyshdr-y))

all: $(uapisyshdr-y) $(kapisyshdr-y)

	@:

arch/microblaze/kernel/syscalls/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -21,18 +21,19 @@ quiet_cmd_systbl = SYSTBL $@ 
		   '$(systbl_abi_$(basetarget))'		\

		   '$(systbl_offset_$(basetarget))'



$(uapi)/unistd_32.h: $(syscall) $(syshdr)

$(uapi)/unistd_32.h: $(syscall) $(syshdr) FORCE

	$(call if_changed,syshdr)



$(kapi)/syscall_table.h: $(syscall) $(systbl)

$(kapi)/syscall_table.h: $(syscall) $(systbl) FORCE

	$(call if_changed,systbl)



uapisyshdr-y		+= unistd_32.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

all: $(addprefix $(uapi)/,$(uapisyshdr-y))

all: $(addprefix $(kapi)/,$(kapisyshdr-y))

all: $(uapisyshdr-y) $(kapisyshdr-y)

	@:

arch/mips/kernel/syscalls/Makefile

+14 −13
Original line number Diff line number Diff line
@@ -31,50 +31,50 @@ quiet_cmd_systbl = SYSTBL $@ 
		   '$(systbl_offset_$(basetarget))'



syshdr_offset_unistd_n32 := __NR_Linux

$(uapi)/unistd_n32.h: $(syscalln32) $(syshdr)

$(uapi)/unistd_n32.h: $(syscalln32) $(syshdr) FORCE

	$(call if_changed,syshdr)



syshdr_offset_unistd_n64 := __NR_Linux

$(uapi)/unistd_n64.h: $(syscalln64) $(syshdr)

$(uapi)/unistd_n64.h: $(syscalln64) $(syshdr) FORCE

	$(call if_changed,syshdr)



syshdr_offset_unistd_o32 := __NR_Linux

$(uapi)/unistd_o32.h: $(syscallo32) $(syshdr)

$(uapi)/unistd_o32.h: $(syscallo32) $(syshdr) FORCE

	$(call if_changed,syshdr)



sysnr_pfx_unistd_nr_n32 := N32

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)



sysnr_pfx_unistd_nr_n64 := 64

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)



sysnr_pfx_unistd_nr_o32 := O32

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)



systbl_abi_syscall_table_32_o32 := 32_o32

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)



systbl_abi_syscall_table_64_n32 := 64_n32

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)



systbl_abi_syscall_table_64_n64 := 64_n64

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)



systbl_abi_syscall_table_64_o32 := 64_o32

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)



uapisyshdr-y		+= unistd_n32.h			\
@@ -88,9 +88,10 @@ kapisyshdr-y += syscall_table_32_o32.h \ 
			   syscall_table_64_n64.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

all: $(addprefix $(uapi)/,$(uapisyshdr-y))

all: $(addprefix $(kapi)/,$(kapisyshdr-y))

all: $(uapisyshdr-y) $(kapisyshdr-y)

	@: