From a3d84bd52e21bbd9547d15b31550dd7401917d19 Mon Sep 17 00:00:00 2001 From: hp Date: Tue, 8 Mar 2005 02:26:18 +0000 Subject: [PATCH] Adjust testsuite for cris-axis-aout. * gas/cris/rd-bcnst.d, gas/cris/rd-usp-1.d: Adjust regexps for a.out output. * gas/cris/mulbug-err-1.s, gas/cris/rd-arch-1.d, gas/cris/rd-arch-2.d, gas/cris/rd-arch-3.d, gas/cris/rd-break32.d, gas/cris/rd-pcrel2.d, gas/cris/rd-ppv1032.d, gas/cris/rd-ppv32.d, gas/cris/rd-usp-1b.d, gas/cris/v32-err-7.s: Pass --em=criself. --- gas/testsuite/ChangeLog | 9 +++++++++ gas/testsuite/gas/cris/mulbug-err-1.s | 1 + gas/testsuite/gas/cris/rd-arch-1.d | 2 +- gas/testsuite/gas/cris/rd-arch-2.d | 2 +- gas/testsuite/gas/cris/rd-arch-3.d | 2 +- gas/testsuite/gas/cris/rd-bcnst.d | 18 +++++++++--------- gas/testsuite/gas/cris/rd-break32.d | 2 +- gas/testsuite/gas/cris/rd-pcrel2.d | 1 + gas/testsuite/gas/cris/rd-ppv1032.d | 2 +- gas/testsuite/gas/cris/rd-ppv32.d | 2 +- gas/testsuite/gas/cris/rd-usp-1.d | 4 ++-- gas/testsuite/gas/cris/rd-usp-1b.d | 2 +- gas/testsuite/gas/cris/v32-err-7.s | 2 +- 13 files changed, 30 insertions(+), 19 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 21a8ff6c07..7b3cf0f832 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2005-03-08 Hans-Peter Nilsson + + Adjust testsuite for cris-axis-aout. + * gas/cris/rd-bcnst.d, gas/cris/rd-usp-1.d: Adjust regexps for a.out output. + * gas/cris/mulbug-err-1.s, gas/cris/rd-arch-1.d, + gas/cris/rd-arch-2.d, gas/cris/rd-arch-3.d, gas/cris/rd-break32.d, + gas/cris/rd-pcrel2.d, gas/cris/rd-ppv1032.d, gas/cris/rd-ppv32.d, + gas/cris/rd-usp-1b.d, gas/cris/v32-err-7.s: Pass --em=criself. + 2005-03-04 David Daney * gas/mips/elf-rel23b.d: Use '__gnu_local_gp' instead of '_gp' diff --git a/gas/testsuite/gas/cris/mulbug-err-1.s b/gas/testsuite/gas/cris/mulbug-err-1.s index fbd830398c..b8a0d9ca0a 100644 --- a/gas/testsuite/gas/cris/mulbug-err-1.s +++ b/gas/testsuite/gas/cris/mulbug-err-1.s @@ -2,6 +2,7 @@ ; a hardware bug. ; { dg-do assemble { target cris-*-* } } +; { dg-options "--em=criself" } ; First, .text isn't dword-aligned by default. .text diff --git a/gas/testsuite/gas/cris/rd-arch-1.d b/gas/testsuite/gas/cris/rd-arch-1.d index a3bd076ae1..52f19c80a8 100644 --- a/gas/testsuite/gas/cris/rd-arch-1.d +++ b/gas/testsuite/gas/cris/rd-arch-1.d @@ -1,5 +1,5 @@ #source: arch-err-2.s -#as: --march=v32 +#as: --march=v32 --em=criself #objdump: -p #... diff --git a/gas/testsuite/gas/cris/rd-arch-2.d b/gas/testsuite/gas/cris/rd-arch-2.d index 8886a72558..6f7d069dec 100644 --- a/gas/testsuite/gas/cris/rd-arch-2.d +++ b/gas/testsuite/gas/cris/rd-arch-2.d @@ -1,5 +1,5 @@ #source: arch-err-4.s -#as: --march=common_v10_v32 +#as: --march=common_v10_v32 --em=criself #objdump: -p #... diff --git a/gas/testsuite/gas/cris/rd-arch-3.d b/gas/testsuite/gas/cris/rd-arch-3.d index e77ff0d62e..9039e8d9dd 100644 --- a/gas/testsuite/gas/cris/rd-arch-3.d +++ b/gas/testsuite/gas/cris/rd-arch-3.d @@ -1,5 +1,5 @@ #source: arch-err-5.s -#as: --march=v0_v10 +#as: --march=v0_v10 --em=criself #objdump: -p #... diff --git a/gas/testsuite/gas/cris/rd-bcnst.d b/gas/testsuite/gas/cris/rd-bcnst.d index f21066657b..80e9716dd5 100644 --- a/gas/testsuite/gas/cris/rd-bcnst.d +++ b/gas/testsuite/gas/cris/rd-bcnst.d @@ -8,15 +8,15 @@ Disassembly of section \.text: 0+ <\.text>: -[ ]+0:[ ]+08e0[ ]+ba 0xa +[ ]+0:[ ]+08e0[ ]+ba (0xa|a <.*) [ ]+2:[ ]+0f05[ ]+nop -[ ]+4:[ ]+3f0d 00db ba00[ ]+jump 0xbadb00 -[ ]+a:[ ]+f970[ ]+bmi 0x4 -[ ]+c:[ ]+08e0[ ]+ba 0x16 +[ ]+4:[ ]+3f0d 00db ba00[ ]+jump (0xbadb00|badb00 <.*) +[ ]+a:[ ]+f970[ ]+bmi (0x4|4 <.*) +[ ]+c:[ ]+08e0[ ]+ba (0x16|16 <.*) [ ]+e:[ ]+0f05[ ]+nop -[ ]+10:[ ]+3f0d 000b 0000[ ]+jump 0xb00 -[ ]+16:[ ]+f970[ ]+bmi 0x10 -[ ]+18:[ ]+08e0[ ]+ba 0x22 +[ ]+10:[ ]+3f0d 000b 0000[ ]+jump (0xb00|b00 <.*) +[ ]+16:[ ]+f970[ ]+bmi (0x10|10 <.*) +[ ]+18:[ ]+08e0[ ]+ba (0x22|22 <.*) [ ]+1a:[ ]+0f05[ ]+nop -[ ]+1c:[ ]+3f0d 4200 0000[ ]+jump 0x42 -[ ]+22:[ ]+f970[ ]+bmi 0x1c +[ ]+1c:[ ]+3f0d 4200 0000[ ]+jump (0x42|42 <.*) +[ ]+22:[ ]+f970[ ]+bmi (0x1c|1c <.*) diff --git a/gas/testsuite/gas/cris/rd-break32.d b/gas/testsuite/gas/cris/rd-break32.d index 7959ecf741..ba7c518e05 100644 --- a/gas/testsuite/gas/cris/rd-break32.d +++ b/gas/testsuite/gas/cris/rd-break32.d @@ -1,4 +1,4 @@ -#as: --march=v32 +#as: --march=v32 --em=criself #source: break.s #objdump: -dr diff --git a/gas/testsuite/gas/cris/rd-pcrel2.d b/gas/testsuite/gas/cris/rd-pcrel2.d index 8dac5ca4b0..2b401e7a0f 100644 --- a/gas/testsuite/gas/cris/rd-pcrel2.d +++ b/gas/testsuite/gas/cris/rd-pcrel2.d @@ -1,4 +1,5 @@ #objdump: -dr +#as: --em=criself .*: file format .*-cris diff --git a/gas/testsuite/gas/cris/rd-ppv1032.d b/gas/testsuite/gas/cris/rd-ppv1032.d index d545fbd015..159648f867 100644 --- a/gas/testsuite/gas/cris/rd-ppv1032.d +++ b/gas/testsuite/gas/cris/rd-ppv1032.d @@ -1,5 +1,5 @@ #source: pushpopv32.s -#as: --march=common_v10_v32 +#as: --march=common_v10_v32 --em=criself #objdump: -dr #name: pushpopv1032 diff --git a/gas/testsuite/gas/cris/rd-ppv32.d b/gas/testsuite/gas/cris/rd-ppv32.d index abc74fb5e7..e84ff30241 100644 --- a/gas/testsuite/gas/cris/rd-ppv32.d +++ b/gas/testsuite/gas/cris/rd-ppv32.d @@ -1,5 +1,5 @@ #source: pushpopv32.s -#as: --march=v32 +#as: --march=v32 --em=criself #objdump: -dr #name: pushpopv32 diff --git a/gas/testsuite/gas/cris/rd-usp-1.d b/gas/testsuite/gas/cris/rd-usp-1.d index 2ded594e95..80bf7a9d22 100644 --- a/gas/testsuite/gas/cris/rd-usp-1.d +++ b/gas/testsuite/gas/cris/rd-usp-1.d @@ -4,12 +4,12 @@ # Check that USP gets the right number for V10. -.*: file format elf32-us-cris +.*: file format .*-cris Disassembly of section \.text: 0+ <\.text>: 0: 3af6 move r10,usp - 2: 3ffe b0ab 0f00 move 0xfabb0,usp + 2: 3ffe b0ab 0f00 move (0xfabb0|fabb0 <.*>),usp 8: 75fa move usp,\[r5\] a: 3cfa move \[r12\],usp diff --git a/gas/testsuite/gas/cris/rd-usp-1b.d b/gas/testsuite/gas/cris/rd-usp-1b.d index 07fa6c56cb..b808f8425b 100644 --- a/gas/testsuite/gas/cris/rd-usp-1b.d +++ b/gas/testsuite/gas/cris/rd-usp-1b.d @@ -1,5 +1,5 @@ #objdump: -dr -#as: --march=v32 +#as: --march=v32 --em=criself #source: v32-err-8.s # Check that USP gets the right number for V32. diff --git a/gas/testsuite/gas/cris/v32-err-7.s b/gas/testsuite/gas/cris/v32-err-7.s index 572ff20244..72b65033cd 100644 --- a/gas/testsuite/gas/cris/v32-err-7.s +++ b/gas/testsuite/gas/cris/v32-err-7.s @@ -1,6 +1,6 @@ ; Error for lapcq out-of-range. ; { dg-do assemble } -; { dg-options "--march=v32" } +; { dg-options "--march=v32 --em=criself" } a: nop -- 2.11.0