diff options
author | Doug Kwan <dougkwan@google.com> | 2015-07-26 01:30:55 -0700 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2018-03-06 18:23:10 +1030 |
commit | 582d4301840c637252ba50ed86cc3d75b8103037 (patch) | |
tree | 8d1f47507ea839a1c7b2090edbb8e15e92c4ee3a | |
parent | 7586fe6c9574422dfd295d6787cf4dd2983b775c (diff) | |
download | gdb-582d4301840c637252ba50ed86cc3d75b8103037.zip gdb-582d4301840c637252ba50ed86cc3d75b8103037.tar.gz gdb-582d4301840c637252ba50ed86cc3d75b8103037.tar.bz2 |
Make arm_unaligned_reloc test less sensitive to disassembler output format.
-rw-r--r-- | gold/ChangeLog | 8 | ||||
-rw-r--r-- | gold/testsuite/arm_unaligned_reloc.s | 9 | ||||
-rwxr-xr-x | gold/testsuite/arm_unaligned_reloc.sh | 20 |
3 files changed, 24 insertions, 13 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 5f15fbe..dbe5a9e 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,11 @@ +2015-07-26 Doug Kwan <dougkwan@google.com> + + Apply from master + 2015-07-26 Doug Kwan <dougkwan@google.com> + + * testsuite/arm_unaligned_reloc.{s,sh}: Make test less sensitive to + disassembler output format. + 2015-07-06 Doug Kwan <dougkwan@google.com> Apply from master diff --git a/gold/testsuite/arm_unaligned_reloc.s b/gold/testsuite/arm_unaligned_reloc.s index f85297c..83bd03b 100644 --- a/gold/testsuite/arm_unaligned_reloc.s +++ b/gold/testsuite/arm_unaligned_reloc.s @@ -28,17 +28,20 @@ padding: .type abs32, %object .size abs32, 4 abs32: - .word x + # We use x + 1 instead so that addend is non-zero + # The disassembler sometimes skips repeating + # zeros and prints "..." instead. + .word x + 1 .global rel32 .type rel32, %object .size rel32, 4 rel32: - .word x - . + .word x + 1 - . .global abs16 .type abs16, %object .size abs16, 2 abs16: - .short x + .short x + 1 .short 0 diff --git a/gold/testsuite/arm_unaligned_reloc.sh b/gold/testsuite/arm_unaligned_reloc.sh index bb1c43e..75b0014 100755 --- a/gold/testsuite/arm_unaligned_reloc.sh +++ b/gold/testsuite/arm_unaligned_reloc.sh @@ -41,17 +41,17 @@ check() check arm_unaligned_reloc.stdout "^00009000 <x>:$" check arm_unaligned_reloc.stdout "^0000a001 <abs32>:$" -check arm_unaligned_reloc.stdout "^ a001: 00009000 .*$" +check arm_unaligned_reloc.stdout '^[ ]*a001:[ ]*00009001[ ].*$' check arm_unaligned_reloc.stdout "^0000a005 <rel32>:" -check arm_unaligned_reloc.stdout "^ a005: ffffeffb .*$" +check arm_unaligned_reloc.stdout "^[ ]*a005:[ ]*ffffeffc[ ].*$" check arm_unaligned_reloc.stdout "^0000a009 <abs16>:" -check arm_unaligned_reloc.stdout "^ a009: 00009000 .*$" - -check arm_unaligned_reloc_r.stdout "^ 1: 00000000 .*$" -check arm_unaligned_reloc_r.stdout "^[ ]*1: R_ARM_ABS32 .data.0$" -check arm_unaligned_reloc_r.stdout "^ 5: 00000000 .*$" -check arm_unaligned_reloc_r.stdout "^[ ]*5: R_ARM_REL32 .data.0$" -check arm_unaligned_reloc_r.stdout "^ 9: 00000000 .*$" -check arm_unaligned_reloc_r.stdout "^[ ]*9: R_ARM_ABS16 .data.0$" +check arm_unaligned_reloc.stdout "^[ ]*a009:[ ]*00009001[ ].*$" + +check arm_unaligned_reloc_r.stdout "^[ ]*1:[ ]*00000001[ ].*$" +check arm_unaligned_reloc_r.stdout "^[ ]*1: R_ARM_ABS32[ ]*.data.0$" +check arm_unaligned_reloc_r.stdout "^[ ]*5:[ ]*00000001[ ].*$" +check arm_unaligned_reloc_r.stdout "^[ ]*5: R_ARM_REL32[ ]*.data.0$" +check arm_unaligned_reloc_r.stdout "^[ ]*9:[ ]*00000001[ ].*$" +check arm_unaligned_reloc_r.stdout "^[ ]*9: R_ARM_ABS16[ ]*.data.0$" exit 0 |