summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-12 19:46:03 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-12 19:46:03 -0500
commit15b41fa6ae6a1356d5453242ccb7d7d301dd5e67 (patch)
tree3e3b566a680c0878fa04b31e6df26cdc0f03590d
parentbf89b089306067cffa4d2ca6b7fa7cd54790a961 (diff)
downloadtor-15b41fa6ae6a1356d5453242ccb7d7d301dd5e67.tar.gz
tor-15b41fa6ae6a1356d5453242ccb7d7d301dd5e67.zip
Make sandbox.c compile when libseccomp-dev is installed on arm64
Fixes ticket 24424. Patch from weasel.
-rw-r--r--changes/bug244243
-rw-r--r--src/common/sandbox.c5
2 files changed, 8 insertions, 0 deletions
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.*/