This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] loosen PR ld/12570 test regexps so x86_64-*-nacl* passes too


The issue being tested for applies to x86_64-*-nacl* targets just as well
but the precise contents of their PLT CFI differs.  This loosens the
regexps matching the CFI so that both variants are accepted.

Ok for trunk?


Thanks,
Roland


ld/testsuite/
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.

diff --git a/ld/testsuite/ld-x86-64/pr12570a.d b/ld/testsuite/ld-x86-64/pr12570a.d
index 6105a74..1d79411 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 d65f8da..159aab4 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;.*
 #...


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]