diff --git a/configure b/configure
index c387e92..39df09f 100755
--- a/configure
+++ b/configure
@@ -3208,12 +3208,11 @@ case "${target}" in
     ;;
 esac
 
-# Disable libsanitizer for some systems.
+# Disable libsanitizer on all systems but x86 linux for now.
 case "${target}" in
-  cris-*-* | crisv32-*-* | mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libsanitizer"
+  x86_64-*-linux-* | i?86-*-linux-*)
     ;;
-  powerpc-*-aix* | rs6000-*-aix*)
+  *)
     noconfigdirs="$noconfigdirs target-libsanitizer"
     ;;
 esac
diff --git a/configure.ac b/configure.ac
index 1d958b4..6c1b008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -550,12 +550,11 @@ case "${target}" in
     ;;
 esac
 
-# Disable libsanitizer for some systems.
+# Disable libsanitizer on all systems but x86 linux for now.
 case "${target}" in
-  cris-*-* | crisv32-*-* | mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libsanitizer"
+  x86_64-*-linux-* | i?86-*-linux-*)
     ;;
-  powerpc-*-aix* | rs6000-*-aix*)
+  *)
     noconfigdirs="$noconfigdirs target-libsanitizer"
     ;;
 esac