diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-12 19:46:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-12 19:46:53 -0500 |
| commit | 37fba82c155dda2ba5d4b3bdd63ea4cd54f264ee (patch) | |
| tree | bc4b9de2f77553348a5baf3ec03c722cee802f46 | |
| parent | dc9f2cdf73a4a55288f2321aa78b72ea188fedec (diff) | |
| parent | 15b41fa6ae6a1356d5453242ccb7d7d301dd5e67 (diff) | |
| download | tor-37fba82c155dda2ba5d4b3bdd63ea4cd54f264ee.tar.gz tor-37fba82c155dda2ba5d4b3bdd63ea4cd54f264ee.zip | |
Merge branch 'maint-0.3.2' into release-0.3.2
| -rw-r--r-- | changes/bug24424 | 3 | ||||
| -rw-r--r-- | src/common/sandbox.c | 5 |
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.*/ |