Remove #include <asm/unistd.h> from linux_syscall_ranges.h and syscall.cc.

sandbox/linux/bpf_dsl/linux_syscall_ranges.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SANDBOX_LINUX_BPF_DSL_LINUX_SYSCALL_RANGES_H_
 #define SANDBOX_LINUX_BPF_DSL_LINUX_SYSCALL_RANGES_H_
 
-#include <asm/unistd.h>  // For __NR_SYSCALL_BASE
-
 #if defined(__x86_64__)
 
 #define MIN_SYSCALL         0u
 #define MAX_PUBLIC_SYSCALL  1024u
 #define MAX_SYSCALL         MAX_PUBLIC_SYSCALL
 
 #elif defined(__i386__)
 
 #define MIN_SYSCALL         0u
 #define MAX_PUBLIC_SYSCALL  1024u
 #define MAX_SYSCALL         MAX_PUBLIC_SYSCALL
 
 #elif defined(__arm__) && (defined(__thumb__) || defined(__ARM_EABI__))
 
 // ARM EABI includes "ARM private" system calls starting at |__ARM_NR_BASE|,
 // and a "ghost syscall private to the kernel", cmpxchg,
 // at |__ARM_NR_BASE+0x00fff0|.
 // See </arch/arm/include/asm/unistd.h> in the Linux kernel.
+
+#if !defined(__NR_SYSCALL_BASE)
+#define __NR_SYSCALL_BASE 0

[mdempsky, 2015/04/08 18:23:51]

Unless you think there's any particular value to still providing these #defines
broken out separately, I'd probably just inline them below and simplify like for
x86-64 and x86 above.

[hidehiko, 2015/04/09 02:34:37]

Done.

+#endif
+
+#if !defined(__ARM_NR_BASE)
+#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xf0000u)
+#endif
+
 #define MIN_SYSCALL         ((unsigned int)__NR_SYSCALL_BASE)
 #define MAX_PUBLIC_SYSCALL  (MIN_SYSCALL + 1024u)
 #define MIN_PRIVATE_SYSCALL ((unsigned int)__ARM_NR_BASE)
 #define MAX_PRIVATE_SYSCALL (MIN_PRIVATE_SYSCALL + 16u)
 #define MIN_GHOST_SYSCALL   ((unsigned int)__ARM_NR_BASE + 0xfff0u)
 #define MAX_SYSCALL         (MIN_GHOST_SYSCALL + 4u)
 
 #elif defined(__mips__) && (_MIPS_SIM == _ABIO32)
 
 #define MIN_SYSCALL         __NR_O32_Linux

[mdempsky, 2015/04/08 18:23:51]

I think this will require <asm/unistd.h>?  Unfortunately, there aren't any MIPS
bots. :-/

Maybe for now just move the #include <asm/unistd.h> into this #elif block.

[hidehiko, 2015/04/09 02:34:37]

Good catch. Fixed.

 #define MAX_PUBLIC_SYSCALL  (MIN_SYSCALL + __NR_Linux_syscalls)
 #define MAX_SYSCALL         MAX_PUBLIC_SYSCALL
 
 #elif defined(__mips__) && (_MIPS_SIM == _ABI64)
 
 #error "Add support to header file"
 
 #elif defined(__aarch64__)
 
 #define MIN_SYSCALL 0u
 #define MAX_PUBLIC_SYSCALL 279u
 #define MAX_SYSCALL MAX_PUBLIC_SYSCALL
 
 #else
 #error "Unsupported architecture"
 #endif
 
 #endif  // SANDBOX_LINUX_BPF_DSL_LINUX_SYSCALL_RANGES_H_