diff options
| author | Roland McGrath <roland@gnu.org> | 2012-05-22 18:22:03 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2012-05-22 18:22:03 +0000 |
| commit | ec44c212dfc93dec3fb93bdd0c0c8852bb7cb538 (patch) | |
| tree | 77539b5badec8fd8e3303676c859efa7d13617e5 | |
| parent | 837a1b32050712dcbbb5c07ff17447dc285f330f (diff) | |
| download | binutils-ec44c212dfc93dec3fb93bdd0c0c8852bb7cb538.zip binutils-ec44c212dfc93dec3fb93bdd0c0c8852bb7cb538.tar.gz binutils-ec44c212dfc93dec3fb93bdd0c0c8852bb7cb538.tar.bz2 | |
ld/testsuite/
* 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.
| -rw-r--r-- | ld/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr12570a.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr12570b.d | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 1 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index d159063..b7890c2 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 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;.* #... diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 409f52d..7d2934f 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" |