diff --git a/src/foreign/README b/src/foreign/README
index 561a2dbd33..3531ad1f23 100644
--- a/src/foreign/README
+++ b/src/foreign/README
@@ -21,3 +21,7 @@ ways:
 
 *** Synced from GCC repository, removing the above patches, and
 *** perhaps making them unnecessary.
+
+Local changes:
+
+ * Removed libffi/testsuite directory (r8401)
diff --git a/src/foreign/gcc/libffi/Makefile.am b/src/foreign/gcc/libffi/Makefile.am
index a9962686bc..6e86069ebb 100644
--- a/src/foreign/gcc/libffi/Makefile.am
+++ b/src/foreign/gcc/libffi/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I .. -I ../config
 
-SUBDIRS = include testsuite
+SUBDIRS = include
 
 EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
diff --git a/src/foreign/gcc/libffi/Makefile.in b/src/foreign/gcc/libffi/Makefile.in
index 50722e54ef..1b64bf8bf2 100644
--- a/src/foreign/gcc/libffi/Makefile.in
+++ b/src/foreign/gcc/libffi/Makefile.in
@@ -357,7 +357,7 @@ toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I .. -I ../config
-SUBDIRS = include testsuite
+SUBDIRS = include
 EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host \
 	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h \
 	src/arm/ffi.c src/arm/sysv.S src/arm/ffitarget.h \
diff --git a/src/foreign/gcc/libffi/configure b/src/foreign/gcc/libffi/configure
index 9fe4b69b06..06eea5d9ab 100755
--- a/src/foreign/gcc/libffi/configure
+++ b/src/foreign/gcc/libffi/configure
@@ -12675,7 +12675,7 @@ fi
           ac_config_links="$ac_config_links include/ffitarget.h:src/$TARGETDIR/ffitarget.h"
 
 
-                                        ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile testsuite/Makefile"
+                                        ac_config_files="$ac_config_files include/Makefile include/ffi.h Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -13661,7 +13661,6 @@ do
   "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
   "include/ffi.h" ) CONFIG_FILES="$CONFIG_FILES include/ffi.h" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
   "include/ffitarget.h" ) CONFIG_LINKS="$CONFIG_LINKS include/ffitarget.h:src/$TARGETDIR/ffitarget.h" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
diff --git a/src/foreign/gcc/libffi/configure.ac b/src/foreign/gcc/libffi/configure.ac
index 412a86d210..65764effb7 100644
--- a/src/foreign/gcc/libffi/configure.ac
+++ b/src/foreign/gcc/libffi/configure.ac
@@ -354,6 +354,6 @@ test -d src/$TARGETDIR || mkdir src/$TARGETDIR
 
 AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
 
-AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile)
+AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile)
 
 AC_OUTPUT