diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 07f8daf3123..18dc5048a2e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-11  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* acinclude.m4 (gcc_GAS_FLAGS): Add more gcc_cv_as_flags
+	overrides.
+	* configure: Regenerate.
+
 2013-10-11  Jakub Jelinek  <jakub@redhat.com>
 
 	* tree-pretty-print.c (dump_omp_clause): Handle OMP_CLAUSE__LOOPTEMP_
diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4
index e68be77f510..6798d6fbc6a 100644
--- a/gcc/acinclude.m4
+++ b/gcc/acinclude.m4
@@ -444,8 +444,16 @@ AC_DEFUN([gcc_GAS_FLAGS],
 [AC_CACHE_CHECK([assembler flags], gcc_cv_as_flags,
 [ case "$target" in
   i[[34567]]86-*-linux*)
-    dnl Always pass --32 to ia32 Linux assembler.
-    gcc_cv_as_flags="--32"
+    dnl Override the default, which may be incompatible.
+    gcc_cv_as_flags=--32
+    ;;
+  x86_64-*-linux-gnux32)
+    dnl Override the default, which may be incompatible.
+    gcc_cv_as_flags=--x32
+    ;;
+  x86_64-*-linux*)
+    dnl Override the default, which may be incompatible.
+    gcc_cv_as_flags=--64
     ;;
   powerpc*-*-darwin*)
     dnl Always pass -arch ppc to assembler.
diff --git a/gcc/configure b/gcc/configure
index 2ac03470bda..4d12a2142d5 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -21760,7 +21760,13 @@ if test "${gcc_cv_as_flags+set}" = set; then :
 else
    case "$target" in
   i[34567]86-*-linux*)
-        gcc_cv_as_flags="--32"
+        gcc_cv_as_flags=--32
+    ;;
+  x86_64-*-linux-gnux32)
+        gcc_cv_as_flags=--x32
+    ;;
+  x86_64-*-linux*)
+        gcc_cv_as_flags=--64
     ;;
   powerpc*-*-darwin*)
         gcc_cv_as_flags="-arch ppc"