diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index dd8d516a42c..c02ee226574 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-19  Richard Henderson  <rth@redhat.com>
+
+	PR libffi/64581
+	* testsuite/lib/libffi.exp (libffi_target_compile): Don't switch
+	to C++ mode when compiling C++ source code.
+
 2015-01-19  Richard Henderson  <rth@redhat.com>
 
 	* Merge to upstream commit 3ac1610aa33c887ea9b14935208943925714a33e.
diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp
index 86ee76639b3..6f865fd6286 100644
--- a/libffi/testsuite/lib/libffi.exp
+++ b/libffi/testsuite/lib/libffi.exp
@@ -219,10 +219,6 @@ proc libffi_target_compile { source dest type options } {
 	lappend options "libs= -lpthread"
     }
 
-    if { [string match "*.cc" $source] } {
-	lappend options "c++"
-    }
-
     verbose "options: $options"
     return [target_compile $source $dest $type $options]
 }