5ab1de932e
The new syscall table support for arm64 mistakenly used the system's asm-generic/unistd.h file when processing the tools/arch/arm64/include/uapi/asm/unistd.h file's include directive: #include <asm-generic/unistd.h> See "Committer notes" section of commit2b58824356"perf arm64: Generate system call table from asm/unistd.h" for more details. This patch removes the committer's temporary workaround, and instructs the host compiler to search the build tree's include path for the right copy of the unistd.h file, instead of the one on the system's /usr/include path. It thus fixes the committer's test that cross-builds an arm64 perf on an x86 platform running Ubuntu 14.04.5 LTS with an old toolchain: $ tools/perf/arch/arm64/entry/syscalls/mksyscalltbl /gcc-linaro-5.4.1-2017.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc gcc `pwd`/tools tools/arch/arm64/include/uapi/asm/unistd.h | grep bpf [280] = "bpf", Signed-off-by: Kim Phillips <kim.phillips@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Cc: Thomas Richter <tmricht@linux.vnet.ibm.com> Fixes:2b58824356("perf arm64: Generate system call table from asm/unistd.h") Link: http://lkml.kernel.org/r/20180806172800.bbcec3cfcc51e2facc978bf2@arm.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
63 lines
1.2 KiB
Bash
Executable File
63 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Generate system call table for perf. Derived from
|
|
# powerpc script.
|
|
#
|
|
# Copyright IBM Corp. 2017
|
|
# Author(s): Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
|
|
# Changed by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
|
|
# Changed by: Kim Phillips <kim.phillips@arm.com>
|
|
|
|
gcc=$1
|
|
hostcc=$2
|
|
incpath=$3
|
|
input=$4
|
|
|
|
if ! test -r $input; then
|
|
echo "Could not read input file" >&2
|
|
exit 1
|
|
fi
|
|
|
|
create_table_from_c()
|
|
{
|
|
local sc nr last_sc
|
|
|
|
create_table_exe=`mktemp /tmp/create-table-XXXXXX`
|
|
|
|
{
|
|
|
|
cat <<-_EoHEADER
|
|
#include <stdio.h>
|
|
#include "$input"
|
|
int main(int argc, char *argv[])
|
|
{
|
|
_EoHEADER
|
|
|
|
while read sc nr; do
|
|
printf "%s\n" " printf(\"\\t[%d] = \\\"$sc\\\",\\n\", __NR_$sc);"
|
|
last_sc=$sc
|
|
done
|
|
|
|
printf "%s\n" " printf(\"#define SYSCALLTBL_ARM64_MAX_ID %d\\n\", __NR_$last_sc);"
|
|
printf "}\n"
|
|
|
|
} | $hostcc -I $incpath/include/uapi -o $create_table_exe -x c -
|
|
|
|
$create_table_exe
|
|
|
|
rm -f $create_table_exe
|
|
}
|
|
|
|
create_table()
|
|
{
|
|
echo "static const char *syscalltbl_arm64[] = {"
|
|
create_table_from_c
|
|
echo "};"
|
|
}
|
|
|
|
$gcc -E -dM -x c $input \
|
|
|sed -ne 's/^#define __NR_//p' \
|
|
|sort -t' ' -k2 -nu \
|
|
|create_table
|