Commit 3cba325b authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Thomas Gleixner
Browse files

x86/syscalls: Switch to generic syscallhdr.sh 



Many architectures duplicate similar shell scripts.

Converts x86 to use scripts/syscallhdr.sh.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210517073815.97426-7-masahiroy@kernel.org
parent 49f731f1

arch/x86/entry/syscalls/Makefile

+13 −13
Original line number Diff line number Diff line
@@ -9,40 +9,40 @@ _dummy := $(shell [ -d '$(out)' ] || mkdir -p '$(out)') \ 
syscall32 := $(src)/syscall_32.tbl

syscall64 := $(src)/syscall_64.tbl



syshdr := $(srctree)/$(src)/syscallhdr.sh

syshdr := $(srctree)/scripts/syscallhdr.sh

systbl := $(srctree)/scripts/syscalltbl.sh



quiet_cmd_syshdr = SYSHDR  $@

      cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \

		   '$(syshdr_abi_$(basetarget))' \

		   '$(syshdr_pfx_$(basetarget))' \

		   '$(syshdr_offset_$(basetarget))'

      cmd_syshdr = $(CONFIG_SHELL) $(syshdr) --abis $(abis) --emit-nr \

		$(if $(offset),--offset $(offset)) \

		$(if $(prefix),--prefix $(prefix)) \

		$< $@

quiet_cmd_systbl = SYSTBL  $@

      cmd_systbl = $(CONFIG_SHELL) $(systbl) --abis $(abis) $< $@



quiet_cmd_hypercalls = HYPERCALLS $@

      cmd_hypercalls = $(CONFIG_SHELL) '$<' $@ $(filter-out $<, $(real-prereqs))



syshdr_abi_unistd_32 := i386

$(uapi)/unistd_32.h: abis := i386

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

	$(call if_changed,syshdr)



syshdr_abi_unistd_32_ia32 := i386

syshdr_pfx_unistd_32_ia32 := ia32_

$(out)/unistd_32_ia32.h: abis := i386

$(out)/unistd_32_ia32.h: prefix := ia32_

$(out)/unistd_32_ia32.h: $(syscall32) $(syshdr) FORCE

	$(call if_changed,syshdr)



syshdr_abi_unistd_x32 := common,x32

syshdr_offset_unistd_x32 := __X32_SYSCALL_BIT

$(uapi)/unistd_x32.h: abis := common,x32

$(uapi)/unistd_x32.h: offset := __X32_SYSCALL_BIT

$(uapi)/unistd_x32.h: $(syscall64) $(syshdr) FORCE

	$(call if_changed,syshdr)



syshdr_abi_unistd_64 := common,64

$(uapi)/unistd_64.h: abis := common,64

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

	$(call if_changed,syshdr)



syshdr_abi_unistd_64_x32 := x32

syshdr_pfx_unistd_64_x32 := x32_

$(out)/unistd_64_x32.h: abis := x32

$(out)/unistd_64_x32.h: prefix := x32_

$(out)/unistd_64_x32.h: $(syscall64) $(syshdr) FORCE

	$(call if_changed,syshdr)

arch/x86/entry/syscalls/syscallhdr.sh

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



in="$1"

out="$2"

my_abis=`echo "($3)" | tr ',' '|'`

prefix="$4"

offset="$5"



fileguard=_ASM_X86_`basename "$out" | sed \

    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \

    -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'`

grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (

    echo "#ifndef ${fileguard}"

    echo "#define ${fileguard} 1"

    echo ""



    max=0

    while read nr abi name entry ; do

	if [ -z "$offset" ]; then

	    echo "#define __NR_${prefix}${name} $nr"

	else

	    echo "#define __NR_${prefix}${name} ($offset + $nr)"

        fi



	max=$nr

    done



    echo ""

    echo "#ifdef __KERNEL__"

    echo "#define __NR_${prefix}syscalls $(($max + 1))"

    echo "#endif"

    echo ""

    echo "#endif /* ${fileguard} */"

) > "$out"