Commit b34b9820 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Russell King (Oracle)
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 6073882c

arch/arm/tools/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ quiet_cmd_systbl = SYSTBL $@ 
      cmd_systbl = $(CONFIG_SHELL) $(systbl) --abis $(abis) $< $@



quiet_cmd_sysnr  = SYSNR   $@

      cmd_sysnr  = $(CONFIG_SHELL) '$(sysnr)' '$<' '$@' \

		   '$(syshdr_abi_$(basetarget))'

      cmd_sysnr  = $(CONFIG_SHELL) $(sysnr) $< $@



$(uapi)/unistd-oabi.h: abis := common,oabi

$(uapi)/unistd-oabi.h: $(syscall) $(syshdr) FORCE
@@ -57,7 +56,6 @@ $(uapi)/unistd-eabi.h: abis := common,eabi 
$(uapi)/unistd-eabi.h: $(syscall) $(syshdr) FORCE

	$(call if_changed,syshdr)



sysnr_abi_unistd-nr := common,oabi,eabi,compat

$(kapi)/unistd-nr.h: $(syscall) $(sysnr) FORCE

	$(call if_changed,sysnr)

arch/arm/tools/syscallnr.sh

+1 −2
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ 
# SPDX-License-Identifier: GPL-2.0

in="$1"

out="$2"

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

align=1



fileguard=_ASM_ARM_`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 | tail -n1 | (

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

    echo "#ifndef ${fileguard}

#define ${fileguard} 1