From f82be201dcd2001b5c458d3cfe604e2aeab695b1 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 4 Jun 2021 14:11:32 +0000 Subject: [PATCH] Bug 1714459 - Remove duplicated linux/arm64 syscalls definitions r=gcp Differential Revision: https://phabricator.services.mozilla.com/D116827 --- .../system_headers/arm64_linux_syscalls.h | 64 +------------------ 1 file changed, 2 insertions(+), 62 deletions(-) diff --git a/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h b/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h index 17f22cd1c068..61b6c7a949ac 100644 --- a/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h +++ b/security/sandbox/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h @@ -4,8 +4,8 @@ /* Constructed by running: * curl -vsSL https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/include/uapi/asm-generic/unistd.h?h=v5.8 - * | grep '^#define' | sed -e 's/__NR3264_/__NR_/g' | grep '__NR_' - * | awk '{ if ($2 != $3) { print "#if !defined(" $2 ")\n#define " $2 " " $3 "\n#endif\n"; } }' + * | grep '^#define' | grep -v '__NR3264_' | grep '__NR_' + * | awk '{ if ($2 != $3 && $3 != 440) { print "#if !defined(" $2 ")\n#define " $2 " " $3 "\n#endif\n"; } } * */ #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ @@ -1277,64 +1277,4 @@ #define __NR_faccessat2 439 #endif -#if !defined(__NR_syscalls) -#define __NR_syscalls 440 -#endif - -#if !defined(__NR_newfstatat) -#define __NR_newfstatat __NR_fstatat -#endif - -#if !defined(__NR_fcntl64) -#define __NR_fcntl64 __NR_fcntl -#endif - -#if !defined(__NR_statfs64) -#define __NR_statfs64 __NR_statfs -#endif - -#if !defined(__NR_fstatfs64) -#define __NR_fstatfs64 __NR_fstatfs -#endif - -#if !defined(__NR_truncate64) -#define __NR_truncate64 __NR_truncate -#endif - -#if !defined(__NR_ftruncate64) -#define __NR_ftruncate64 __NR_ftruncate -#endif - -#if !defined(__NR_llseek) -#define __NR_llseek __NR_lseek -#endif - -#if !defined(__NR_sendfile64) -#define __NR_sendfile64 __NR_sendfile -#endif - -#if !defined(__NR_fstatat64) -#define __NR_fstatat64 __NR_fstatat -#endif - -#if !defined(__NR_fstat64) -#define __NR_fstat64 __NR_fstat -#endif - -#if !defined(__NR_mmap2) -#define __NR_mmap2 __NR_mmap -#endif - -#if !defined(__NR_fadvise64_64) -#define __NR_fadvise64_64 __NR_fadvise64 -#endif - -#if !defined(__NR_stat64) -#define __NR_stat64 __NR_stat -#endif - -#if !defined(__NR_lstat64) -#define __NR_lstat64 __NR_lstat -#endif - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_