diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index d159063c6e..b7890c2b7c 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-22  Roland McGrath  <mcgrathr@google.com>
+
+	* ld-x86-64/pr12570a.d (name): Distinguish it from pr12570b.d case.
+	Loosen CFI-matching regexp so it matches x86_64-*-nacl* variant too.
+	* ld-x86-64/pr12570b.d: Likewise.
+	* ld-x86-64/x86-64.exp: Revert last change.
+
 2012-05-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-elf/eh4.d: Skip x86_64-*-nacl*.
diff --git a/ld/testsuite/ld-x86-64/pr12570a.d b/ld/testsuite/ld-x86-64/pr12570a.d
index 6105a74b03..1d79411482 100644
--- a/ld/testsuite/ld-x86-64/pr12570a.d
+++ b/ld/testsuite/ld-x86-64/pr12570a.d
@@ -1,8 +1,8 @@
-#name: PR ld/12570
+#name: PR ld/12570 (PLT)
 #as: --64
 #ld: -melf_x86_64 -shared
 #readelf: -wf --wide
 
 #...
-  DW_CFA_def_cfa_expression \(DW_OP_breg7 \(rsp\): 8; DW_OP_breg16 \(rip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit11; DW_OP_ge; DW_OP_lit3; DW_OP_shl; DW_OP_plus\)
+  DW_CFA_def_cfa_expression \(DW_OP_breg7 \(rsp\): 8; DW_OP_breg16 \(rip\): 0;.*
 #...
diff --git a/ld/testsuite/ld-x86-64/pr12570b.d b/ld/testsuite/ld-x86-64/pr12570b.d
index d65f8da1f2..159aab414a 100644
--- a/ld/testsuite/ld-x86-64/pr12570b.d
+++ b/ld/testsuite/ld-x86-64/pr12570b.d
@@ -1,9 +1,9 @@
-#name: PR ld/12570
+#name: PR ld/12570 (no PLT)
 #as: --64
 #ld: -melf_x86_64 -shared
 #readelf: -wf --wide
 
 #failif
 #...
-  DW_CFA_def_cfa_expression \(DW_OP_breg7 \(rsp\): 8; DW_OP_breg16 \(rip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit11; DW_OP_ge; DW_OP_lit3; DW_OP_shl; DW_OP_plus\)
+  DW_CFA_def_cfa_expression \(DW_OP_breg7 \(rsp\): 8; DW_OP_breg16 \(rip\): 0;.*
 #...
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 409f52dc13..7d2934f9b5 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -206,7 +206,6 @@ run_dump_test "discarded1"
 run_dump_test "pr12718"
 run_dump_test "pr12921"
 run_dump_test "pr13947"
-setup_xfail "x86_64-*-nacl*"
 run_dump_test "pr12570a"
 run_dump_test "pr12570b"