diff mbox

[v2] gas/arm: Fix gas tests to run on armeb-none-eabi

Message ID 1396621713-17220-1-git-send-email-will.newton@linaro.org
State Accepted
Headers show

Commit Message

Will Newton April 4, 2014, 2:28 p.m. UTC 
Fix various places where endianness needed to be taken into account
in the gas testsuite for ARM.

gas/testsuite/ChangeLog:

2014-04-04  Will Newton  <will.newton@linaro.org>

	* gas/arm/backslash-at.d: Fix dump output regexps for
	armeb-none-eabi configuration.
	* gas/arm/got_prel.d: Likewise.
	* gas/arm/inst-po.d: Likewise.
	* gas/arm/unwind.d: Likewise.
---
 gas/testsuite/gas/arm/backslash-at.d | 2 +-
 gas/testsuite/gas/arm/got_prel.d     | 4 ++--
 gas/testsuite/gas/arm/inst-po.d      | 4 ++--
 gas/testsuite/gas/arm/unwind.d       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

Changes in v2:
 - Fix test breakage on little endian targets

Comments

Will Newton April 22, 2014, 8:51 a.m. UTC | #1 
On 4 April 2014 15:28, Will Newton <will.newton@linaro.org> wrote:
> Fix various places where endianness needed to be taken into account
> in the gas testsuite for ARM.
>
> gas/testsuite/ChangeLog:
>
> 2014-04-04  Will Newton  <will.newton@linaro.org>
>
>         * gas/arm/backslash-at.d: Fix dump output regexps for
>         armeb-none-eabi configuration.
>         * gas/arm/got_prel.d: Likewise.
>         * gas/arm/inst-po.d: Likewise.
>         * gas/arm/unwind.d: Likewise.
> ---
>  gas/testsuite/gas/arm/backslash-at.d | 2 +-
>  gas/testsuite/gas/arm/got_prel.d     | 4 ++--
>  gas/testsuite/gas/arm/inst-po.d      | 4 ++--
>  gas/testsuite/gas/arm/unwind.d       | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
>
> Changes in v2:
>  - Fix test breakage on little endian targets

Ping?

> diff --git a/gas/testsuite/gas/arm/backslash-at.d b/gas/testsuite/gas/arm/backslash-at.d
> index c87965f..3397573 100644
> --- a/gas/testsuite/gas/arm/backslash-at.d
> +++ b/gas/testsuite/gas/arm/backslash-at.d
> @@ -4,7 +4,7 @@
>  .*:     file format .*arm.*
>
>  Disassembly of section .text:
> -0+000 <.*>.*615c.*
> +0+000 <.*>.*(615c|5c61).*
>  0+002 <foo> e3a00000   mov     r0, #0
>  0+006 <foo\+0x4> e3a00000      mov     r0, #0
>  0+00a <foo\+0x8> e3a00000      mov     r0, #0
> diff --git a/gas/testsuite/gas/arm/got_prel.d b/gas/testsuite/gas/arm/got_prel.d
> index 8360fb9..16ffe78 100644
> --- a/gas/testsuite/gas/arm/got_prel.d
> +++ b/gas/testsuite/gas/arm/got_prel.d
> @@ -15,5 +15,5 @@ Relocation section '.rel.ARM.exidx.text.foo' at offset 0x3f8 contains 2 entries:
>
>  Hex dump of section '.text.foo':
>   NOTE: This section has relocations against it, but these have NOT been applied to this dump.
> -  0x00000000 034b7b44 1b681a68 1860101c 7047c046 .K{D.h.h.`..pG.F
> -  0x00000010 0a000000                            ....
> +  0x00000000 (034b7b44|4b03447b) (1b681a68|681b681a) (1860101c|60181c10) (7047c046|477046c0) .*
> +  0x00000010 (0a000000|0000000a)                            ....
> diff --git a/gas/testsuite/gas/arm/inst-po.d b/gas/testsuite/gas/arm/inst-po.d
> index be912c8..af41139 100644
> --- a/gas/testsuite/gas/arm/inst-po.d
> +++ b/gas/testsuite/gas/arm/inst-po.d
> @@ -9,8 +9,8 @@ Disassembly of section .text:
>  00000004 <.text\+0x4> bf0c             ite     eq
>  00000006 <.text\+0x6> 4649             moveq   r1, r9
>  00000008 <.text\+0x8> 4649             movne   r1, r9
> -0000000a <.text\+0xa> 1234             .short  0x1234
> -0000000c <.text\+0xc> 0000             .short  0x0000
> +0000000a <.text\+0xa> (1234|0000)              .short  (0x1234|0x0000)
> +0000000c <.text\+0xc> (0000|1234)              .short  (0x0000|0x1234)
>  0000000e <.text\+0xe> bf0c             ite     eq
>  00000010 <.text\+0x10> 4649            moveq   r1, r9
>  00000012 <.text\+0x12> 4649            movne   r1, r9
> diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
> index 060f7ba..557c3e4 100644
> --- a/gas/testsuite/gas/arm/unwind.d
> +++ b/gas/testsuite/gas/arm/unwind.d
> @@ -31,7 +31,7 @@ OFFSET   TYPE              VALUE
>
>  Contents of section .text:
>   0000 (0000a0e3 0100a0e3 0200a0e3 0300a0e3|e3a00000 e3a00001 e3a00002 e3a00003)  .*
> - 0010 (04200520 0600a0e3|20052004 e3a00006)                    .*
> + 0010 (04200520 0600a0e3|20042005 e3a00006)                    .*
>  Contents of section .ARM.extab:
>   0000 (449b0181 b0b08086|81019b44 8680b0b0) 00000000 00000000  .*
>   0010 (8402b101 b0b0b005 2a000000 00c60281|01b10284 05b0b0b0 0000002a 8102c600)  .*
> --
> 1.8.1.4
>
Nick Clifton April 22, 2014, 4:15 p.m. UTC | #2 
Hi Will,

>> gas/testsuite/ChangeLog:
>> 2014-04-04  Will Newton  <will.newton@linaro.org>
>>
>>          * gas/arm/backslash-at.d: Fix dump output regexps for
>>          armeb-none-eabi configuration.
>>          * gas/arm/got_prel.d: Likewise.
>>          * gas/arm/inst-po.d: Likewise.
>>          * gas/arm/unwind.d: Likewise.
>> ---
>>   gas/testsuite/gas/arm/backslash-at.d | 2 +-
>>   gas/testsuite/gas/arm/got_prel.d     | 4 ++--
>>   gas/testsuite/gas/arm/inst-po.d      | 4 ++--
>>   gas/testsuite/gas/arm/unwind.d       | 2 +-
>>   4 files changed, 6 insertions(+), 6 deletions(-)
>>
>> Changes in v2:
>>   - Fix test breakage on little endian targets
>
> Ping?

Pong!  Please commit.

Cheers
   Nick
diff mbox

Patch

diff --git a/gas/testsuite/gas/arm/backslash-at.d b/gas/testsuite/gas/arm/backslash-at.d
index c87965f..3397573 100644
--- a/gas/testsuite/gas/arm/backslash-at.d
+++ b/gas/testsuite/gas/arm/backslash-at.d
@@ -4,7 +4,7 @@ 
 .*:     file format .*arm.*
 
 Disassembly of section .text:
-0+000 <.*>.*615c.*
+0+000 <.*>.*(615c|5c61).*
 0+002 <foo> e3a00000 	mov	r0, #0
 0+006 <foo\+0x4> e3a00000 	mov	r0, #0
 0+00a <foo\+0x8> e3a00000 	mov	r0, #0
diff --git a/gas/testsuite/gas/arm/got_prel.d b/gas/testsuite/gas/arm/got_prel.d
index 8360fb9..16ffe78 100644
--- a/gas/testsuite/gas/arm/got_prel.d
+++ b/gas/testsuite/gas/arm/got_prel.d
@@ -15,5 +15,5 @@  Relocation section '.rel.ARM.exidx.text.foo' at offset 0x3f8 contains 2 entries:
 
 Hex dump of section '.text.foo':
  NOTE: This section has relocations against it, but these have NOT been applied to this dump.
-  0x00000000 034b7b44 1b681a68 1860101c 7047c046 .K{D.h.h.`..pG.F
-  0x00000010 0a000000                            ....
+  0x00000000 (034b7b44|4b03447b) (1b681a68|681b681a) (1860101c|60181c10) (7047c046|477046c0) .*
+  0x00000010 (0a000000|0000000a)                            ....
diff --git a/gas/testsuite/gas/arm/inst-po.d b/gas/testsuite/gas/arm/inst-po.d
index be912c8..af41139 100644
--- a/gas/testsuite/gas/arm/inst-po.d
+++ b/gas/testsuite/gas/arm/inst-po.d
@@ -9,8 +9,8 @@  Disassembly of section .text:
 00000004 <.text\+0x4> bf0c      	ite	eq
 00000006 <.text\+0x6> 4649      	moveq	r1, r9
 00000008 <.text\+0x8> 4649      	movne	r1, r9
-0000000a <.text\+0xa> 1234      	.short	0x1234
-0000000c <.text\+0xc> 0000      	.short	0x0000
+0000000a <.text\+0xa> (1234|0000)      	.short	(0x1234|0x0000)
+0000000c <.text\+0xc> (0000|1234)      	.short	(0x0000|0x1234)
 0000000e <.text\+0xe> bf0c      	ite	eq
 00000010 <.text\+0x10> 4649      	moveq	r1, r9
 00000012 <.text\+0x12> 4649      	movne	r1, r9
diff --git a/gas/testsuite/gas/arm/unwind.d b/gas/testsuite/gas/arm/unwind.d
index 060f7ba..557c3e4 100644
--- a/gas/testsuite/gas/arm/unwind.d
+++ b/gas/testsuite/gas/arm/unwind.d
@@ -31,7 +31,7 @@  OFFSET   TYPE              VALUE
 
 Contents of section .text:
  0000 (0000a0e3 0100a0e3 0200a0e3 0300a0e3|e3a00000 e3a00001 e3a00002 e3a00003)  .*
- 0010 (04200520 0600a0e3|20052004 e3a00006)                    .*
+ 0010 (04200520 0600a0e3|20042005 e3a00006)                    .*
 Contents of section .ARM.extab:
  0000 (449b0181 b0b08086|81019b44 8680b0b0) 00000000 00000000  .*
  0010 (8402b101 b0b0b005 2a000000 00c60281|01b10284 05b0b0b0 0000002a 8102c600)  .*