Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1371)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sandbox/linux/system_headers/arm_linux_syscalls.h

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« mojo/public/tools/BUILD.gn ('K') | « sandbox/linux/system_headers/arm64_linux_ucontext.h ('k') | sandbox/linux/system_headers/arm_linux_ucontext.h » ('j') | sky/engine/bindings/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sandbox/linux/system_headers/arm_linux_syscalls.h
diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h b/sandbox/linux/system_headers/arm_linux_syscalls.h
index b11041d28206e6655928299ea854d8eb25e8832d..bfd5342ccab812bd46f0fd692227ac7e24fbb608 100644
--- a/sandbox/linux/system_headers/arm_linux_syscalls.h
+++ b/sandbox/linux/system_headers/arm_linux_syscalls.h
@@ -10,8 +10,10 @@
#error "Including header on wrong architecture"
#endif
-// __NR_SYSCALL_BASE, __ARM_NR_BASE are defined in <asm/unistd.h>.
-#include <asm/unistd.h>
+#if !defined(__NR_SYSCALL_BASE)
+// On ARM EABI arch, __NR_SYSCALL_BASE is 0.
+#define __NR_SYSCALL_BASE 0
+#endif
// This syscall list has holes, because ARM EABI makes some syscalls obsolete.
@@ -1380,6 +1382,10 @@
#endif
// ARM private syscalls.
+#if !defined(__ARM_NR_BASE)
+#define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000)
+#endif
+
#if !defined(__ARM_NR_breakpoint)
#define __ARM_NR_breakpoint (__ARM_NR_BASE+1)
#endif
@@ -1406,4 +1412,3 @@
#endif
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM_LINUX_SYSCALLS_H_
-
« mojo/public/tools/BUILD.gn ('K') | « sandbox/linux/system_headers/arm64_linux_ucontext.h ('k') | sandbox/linux/system_headers/arm_linux_ucontext.h » ('j') | sky/engine/bindings/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698