diff --git a/ChangeLog b/ChangeLog
index ef3d5245bcf844d1b8a28c891f69b8c5e4752fc2..db9688728841fbe5a21afbb8fe92557f0a04c4da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-03  Hans-Peter Nilsson  <hp@axis.com>
+
+	PR libffi/46792
+	* configure.ac (cris-*-elf, crisv32-*-elf): Disable target-libffi.
+	* configure: Regenerate.
+
 2010-12-02  Ian Lance Taylor  <iant@google.com>
 
 	* configure.ac: Always set default for poststage1_ldflags to
diff --git a/configure b/configure
index de6da33de974dcf77b78371cb14655c153beb775..6dde71a00d7da9802d67831785431199fdc4c677 100755
--- a/configure
+++ b/configure
@@ -3247,8 +3247,8 @@ case "${target}" in
       *-*-aout)
 	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-      *-*-elf)
-	noconfigdirs="$noconfigdirs target-boehm-gc";;
+      *-*-elf) # See PR46792 regarding target-libffi.
+	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
       *-*-linux*)
 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
       *)
diff --git a/configure.ac b/configure.ac
index 289416f79f672d4e7de485566c2c4bbfb0af96dc..fcf5ba2c7c8ccca40e0ea0da3c46ca3b6ecf1a10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -707,8 +707,8 @@ case "${target}" in
       *-*-aout)
 	unsupported_languages="$unsupported_languages fortran"
 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-      *-*-elf)
-	noconfigdirs="$noconfigdirs target-boehm-gc";;
+      *-*-elf) # See PR46792 regarding target-libffi.
+	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
       *-*-linux*)
 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
       *)