summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2020-10-26 17:36:22 +0000
committerColin Watson <cjwatson@debian.org>2020-10-26 17:38:53 +0000
commit67434174b3d64b352a794275f77489ebf1575849 (patch)
tree92492be14fc3bdf6ce46764995b76099e364cdc7
parent3728919292c05983372954d27426f7d966813139 (diff)
Revert "detect Linux/X32 systems"
This reverts commit 5b56bd0affea7b02b540bdbc4d1d271b0e4fc885. The bug reporter wasn't actually using x32, but rather an ordinary 32-bit userspace on a 64-bit kernel; this patch broke the seccomp sandbox on the actual x32 architecture. Patch-Name: revert-x32-sandbox-breakage.patch
-rw-r--r--configure.ac6
1 files changed, 0 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 5944299fa..15fc0d653 100644
--- a/configure.ac
+++ b/configure.ac
@@ -521,8 +521,6 @@ SPP_MSG="no"
521# the --with-solaris-privs option and --with-sandbox=solaris). 521# the --with-solaris-privs option and --with-sandbox=solaris).
522SOLARIS_PRIVS="no" 522SOLARIS_PRIVS="no"
523 523
524AC_CHECK_SIZEOF([size_t])
525
526# Check for some target-specific stuff 524# Check for some target-specific stuff
527case "$host" in 525case "$host" in
528*-*-aix*) 526*-*-aix*)
@@ -891,10 +889,6 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
891 case "$host" in 889 case "$host" in
892 x86_64-*) 890 x86_64-*)
893 seccomp_audit_arch=AUDIT_ARCH_X86_64 891 seccomp_audit_arch=AUDIT_ARCH_X86_64
894 # X32: AMD64 instructions in 32bit address space.
895 if test "x$ac_cv_sizeof_size_t" = "x4" ; then
896 seccomp_audit_arch=AUDIT_ARCH_I386
897 fi
898 ;; 892 ;;
899 i*86-*) 893 i*86-*)
900 seccomp_audit_arch=AUDIT_ARCH_I386 894 seccomp_audit_arch=AUDIT_ARCH_I386