diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index d96b1a55ba3..da17417eab4 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-19  Richard Henderson  <rth@redhat.com>
+
+	PR libffi/64607
+	* testsuite/lib/libffi.exp (libffi-init): Append -L for the
+	just built libstdc++.
+
 2015-01-15  Dominique d'Humieres  <dominiq@lps.ens.fr>
 	    Richard Henderson  <rth@redhat.com>
 
diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp
index b9ef4f10b69..86ee76639b3 100644
--- a/libffi/testsuite/lib/libffi.exp
+++ b/libffi/testsuite/lib/libffi.exp
@@ -152,6 +152,7 @@ proc libffi-init { args } {
     if { $libffi_dir != "" } {
 	set libffi_dir [file dirname ${libffi_dir}]
 	set libffi_link_flags "-L${libffi_dir}/.libs"
+	lappend libffi_link_flags "-L${blddircxx}/src/.libs"
     }
 
     set_ld_library_path_env_vars