diff --git a/ChangeLog b/ChangeLog
index 284613c42b8..5de77b45714 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-13  David Edelsohn  <dje.gcc@gmail.com>
+
+	* configure.ac: Disable libsanitizer on AIX. Merge libquadmath
+	sections.
+	* configure: Regenerate.
+
 2012-11-13  Hans-Peter Nilsson  <hp@axis.com>
 
 	* configure.ac: Add section for configdirs for libsanitizer.
diff --git a/configure b/configure
index c46a2e4fa9f..c387e9258d4 100755
--- a/configure
+++ b/configure
@@ -3198,6 +3198,9 @@ fi
 
 # Disable libquadmath for some systems.
 case "${target}" in
+  avr-*-*)
+    noconfigdirs="$noconfigdirs target-libquadmath"
+    ;;
   # libquadmath is unused on AIX and libquadmath build process use of
   # LD_LIBRARY_PATH can break AIX bootstrap.
   powerpc-*-aix* | rs6000-*-aix*)
@@ -3210,6 +3213,9 @@ case "${target}" in
   cris-*-* | crisv32-*-* | mmix-*-*)
     noconfigdirs="$noconfigdirs target-libsanitizer"
     ;;
+  powerpc-*-aix* | rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs target-libsanitizer"
+    ;;
 esac
 
 # Disable libssp for some systems.
@@ -3229,13 +3235,6 @@ case "${target}" in
     ;;
 esac
 
-# Disable libquadmath for some systems.
-case "${target}" in
-  avr-*-*)
-    noconfigdirs="$noconfigdirs target-libquadmath"
-    ;;
-esac
-
 # Disable libstdc++-v3 for some systems.
 # Allow user to override this if they pass --enable-libstdc++-v3
 if test "${ENABLE_LIBSTDCXX}" = "default" ; then
diff --git a/configure.ac b/configure.ac
index c66aa748b44..1d958b4c203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,6 +540,9 @@ fi
 
 # Disable libquadmath for some systems.
 case "${target}" in
+  avr-*-*)
+    noconfigdirs="$noconfigdirs target-libquadmath"
+    ;;
   # libquadmath is unused on AIX and libquadmath build process use of
   # LD_LIBRARY_PATH can break AIX bootstrap.
   powerpc-*-aix* | rs6000-*-aix*)
@@ -552,6 +555,9 @@ case "${target}" in
   cris-*-* | crisv32-*-* | mmix-*-*)
     noconfigdirs="$noconfigdirs target-libsanitizer"
     ;;
+  powerpc-*-aix* | rs6000-*-aix*)
+    noconfigdirs="$noconfigdirs target-libsanitizer"
+    ;;
 esac
 
 # Disable libssp for some systems.
@@ -571,13 +577,6 @@ case "${target}" in
     ;;
 esac
 
-# Disable libquadmath for some systems.
-case "${target}" in
-  avr-*-*)
-    noconfigdirs="$noconfigdirs target-libquadmath"
-    ;;
-esac
-
 # Disable libstdc++-v3 for some systems.
 # Allow user to override this if they pass --enable-libstdc++-v3
 if test "${ENABLE_LIBSTDCXX}" = "default" ; then