diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 19b4e8ce362..449fed2eaf7 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-21  Matthias Klose  <doko@ubuntu.com>
+
+	* configure.tgt (i[3456]86): Handle -mx32 like -m64.
+
 2012-11-04  Thomas Schwinge  <thomas@codesourcery.com>
 
 	* acinclude.m4 (LIBAT_CHECK_IFUNC): Clarify message.
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index 0caa0f42ff9..69a36c80694 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -59,7 +59,7 @@ case "${target_cpu}" in
 
   i[3456]86)
 	case " ${CC} ${CFLAGS} " in
-	  *" -m64 "*)
+	  *" -m64 "*|*" -mx32 "*)
 	    ;;
 	  *)
 	    if test -z "$with_arch"; then