Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: 9085/1: remove unneeded abi parameter to syscallnr.sh

You do not need to pass the abi parameter to syscallnr.sh because it
parses all the lines of syscall.tbl except comments anyway.

Simplify the code. Also, remove unneeded single-quoting.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

authored by

Masahiro Yamada and committed by
Russell King (Oracle)
b34b9820 6073882c

+2 -5
+1 -3
arch/arm/tools/Makefile
··· 46 46 cmd_systbl = $(CONFIG_SHELL) $(systbl) --abis $(abis) $< $@ 47 47 48 48 quiet_cmd_sysnr = SYSNR $@ 49 - cmd_sysnr = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \ 50 - '$(syshdr_abi_$(basetarget))' 49 + cmd_sysnr = $(CONFIG_SHELL) $(sysnr) $< $@ 51 50 52 51 $(uapi)/unistd-oabi.h: abis := common,oabi 53 52 $(uapi)/unistd-oabi.h: $(syscall) $(syshdr) FORCE ··· 56 57 $(uapi)/unistd-eabi.h: $(syscall) $(syshdr) FORCE 57 58 $(call if_changed,syshdr) 58 59 59 - sysnr_abi_unistd-nr := common,oabi,eabi,compat 60 60 $(kapi)/unistd-nr.h: $(syscall) $(sysnr) FORCE 61 61 $(call if_changed,sysnr) 62 62
+1 -2
arch/arm/tools/syscallnr.sh
··· 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 in="$1" 4 4 out="$2" 5 - my_abis=`echo "($3)" | tr ',' '|'` 6 5 align=1 7 6 8 7 fileguard=_ASM_ARM_`basename "$out" | sed \ 9 8 -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ 10 9 -e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'` 11 10 12 - grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | tail -n1 | ( 11 + grep -E "^[0-9A-Fa-fXx]+[[:space:]]+" "$in" | sort -n | tail -n1 | ( 13 12 echo "#ifndef ${fileguard} 14 13 #define ${fileguard} 1 15 14