diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index a690b7bbf98c58f6e919bc9d934b1032d5d090d6..09983cb5622c0b425357a5edce549786060e3e78 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-29  John David Anglin  <danglin@gcc.gnu.org>
+
+	PR libffi/65567
+	* testsuite/lib/libffi.exp (libffi_feature_test): Use split to ensure
+	lindex is applied to a list.
+
 2015-02-10  Andrew Pinski  <apinski@cavium.com>
 
 	* src/aarch64/ffitarget.h (ffi_arg): Use unsigned long long for ILP32.
diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp
index 049b66d0d58b4f99b28441787f0ba5d8ec896cdc..29b9510a35e54e4ff0162a901ba42b9b79b47803 100644
--- a/libffi/testsuite/lib/libffi.exp
+++ b/libffi/testsuite/lib/libffi.exp
@@ -238,7 +238,7 @@ proc libffi_feature_test { test } {
     set lines [libffi_target_compile $src "" "preprocess" ""]
     file delete $src
 
-    set last [lindex $lines end]
+    set last [lindex [split $lines] end]
     return [regexp -- "xyzzy" $last]
 }