Browse Source

Merge branch 'maint-0.3.2'

Nick Mathewson 6 years ago
parent
commit
426110dfa2
2 changed files with 8 additions and 0 deletions
  1. 3 0
      changes/bug24424
  2. 5 0
      src/common/sandbox.c

+ 3 - 0
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.

+ 5 - 0
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.*/