From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Dec 2017 00:46:03 +0000 (-0500)
Subject: Make sandbox.c compile when libseccomp-dev is installed on arm64
X-Git-Tag: tor-0.3.2.7-rc~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15b41fa6ae6a1356d5453242ccb7d7d301dd5e67;p=thirdparty%2Ftor.git

Make sandbox.c compile when libseccomp-dev is installed on arm64

Fixes ticket 24424.  Patch from weasel.
---

diff --git a/changes/bug24424 b/changes/bug24424
new file mode 100644
index 0000000000..63c2d39ba1
--- /dev/null
+++ b/changes/bug24424
@@ -0,0 +1,3 @@
+  o Minor features (portability):
+    - Tor now compiles correctly on arm64 with libseccomp-dev installed.
+      (It doesn't yet work with the sandbox enabled.) Closes ticket 24424.
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index ba6c3efb9e..8827370c24 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -106,6 +106,11 @@
 
 #define M_SYSCALL arm_r7
 
+#elif defined(__aarch64__) && defined(__LP64__)
+
+#define REG_SYSCALL 8
+#define M_SYSCALL regs[REG_SYSCALL]
+
 #endif /* defined(__i386__) || ... */
 
 /**Determines if at least one sandbox is active.*/