commit 426110dfa2e27f134e7bf44341e5df6f454e49a3 parent 9abef516f609a619b25e8f53a413a2e3df05bde8 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 12 Dec 2017 19:46:53 -0500 Merge branch 'maint-0.3.2' Diffstat:
| A | changes/bug24424 | | | 3 | +++ |
| M | src/common/sandbox.c | | | 5 | +++++ |
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/bug24424 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 @@ -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.*/