From fae5f26d81ece45024c9bd91bcec85a0aa5825f6 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 13 Feb 2012 02:31:53 +0000 Subject: [PATCH] * ld-m68hc11/m68hc11.exp: Run for m68hc11-*-* and m68hc12-*-*. * ld-m68hc11/adj-brset.d: Remove redundant #target line. Add -m m68hc11elf to ld invocation. * ld-m68hc11/adj-jump.d: Likewise. * ld-m68hc11/bug-1403.d: Likewise. * ld-m68hc11/bug-1417.d: Likewise. * ld-m68hc11/bug-3331.d: Likewise. * ld-m68hc11/relax-direct.d: Likewise. * ld-m68hc11/relax-group.d: Likewise. * ld-m68hc11/far-hc11.d: Remove redundant #target line. Adjust for changed addresses. * ld-m68hc11/far-hc12.d: Remove redundant #target line. * ld-m68hc11/link-hcs12.d: Likewise, and adjust for header changes. --- ld/testsuite/ChangeLog | 28 ++++++++++++++++++------ ld/testsuite/ld-m68hc11/adj-brset.d | 3 +-- ld/testsuite/ld-m68hc11/adj-jump.d | 3 +-- ld/testsuite/ld-m68hc11/bug-1403.d | 3 +-- ld/testsuite/ld-m68hc11/bug-1417.d | 3 +-- ld/testsuite/ld-m68hc11/bug-3331.d | 3 +-- ld/testsuite/ld-m68hc11/far-hc11.d | 39 +++++++++++++++++----------------- ld/testsuite/ld-m68hc11/far-hc12.d | 1 - ld/testsuite/ld-m68hc11/link-hcs12.d | 5 ----- ld/testsuite/ld-m68hc11/m68hc11.exp | 5 +++-- ld/testsuite/ld-m68hc11/relax-direct.d | 3 +-- ld/testsuite/ld-m68hc11/relax-group.d | 3 +-- 12 files changed, 51 insertions(+), 48 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index b53cb8b..f1c82a0 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,18 +1,34 @@ +2012-02-13 Alan Modra + + * ld-m68hc11/m68hc11.exp: Run for m68hc11-*-* and m68hc12-*-*. + * ld-m68hc11/adj-brset.d: Remove redundant #target line. Add + -m m68hc11elf to ld invocation. + * ld-m68hc11/adj-jump.d: Likewise. + * ld-m68hc11/bug-1403.d: Likewise. + * ld-m68hc11/bug-1417.d: Likewise. + * ld-m68hc11/bug-3331.d: Likewise. + * ld-m68hc11/relax-direct.d: Likewise. + * ld-m68hc11/relax-group.d: Likewise. + * ld-m68hc11/far-hc11.d: Remove redundant #target line. Adjust for + changed addresses. + * ld-m68hc11/far-hc12.d: Remove redundant #target line. + * ld-m68hc11/link-hcs12.d: Likewise, and adjust for header changes. + 2012-02-09 H.J. Lu PR ld/13675 * ld-i386/tlsnopic.dd: Update no-op padding. - * ld-i386/tlspic.dd: Likewise. + * ld-i386/tlspic.dd: Likewise. 2012-01-31 H.J. Lu PR ld/13616 * ld-i386/tlsbindesc.dd: Update no-op padding. - * ld-i386/tlsnopic.dd: Likewise. - * ld-i386/tlspic.dd: Likewise. - * ld-x86-64/tlsbin.dd: Likewise. - * ld-x86-64/tlsbindesc.dd: Likewise. - * ld-x86-64/tlspic.dd: Likewise. + * ld-i386/tlsnopic.dd: Likewise. + * ld-i386/tlspic.dd: Likewise. + * ld-x86-64/tlsbin.dd: Likewise. + * ld-x86-64/tlsbindesc.dd: Likewise. + * ld-x86-64/tlspic.dd: Likewise. 2012-01-17 Alan Modra diff --git a/ld/testsuite/ld-m68hc11/adj-brset.d b/ld/testsuite/ld-m68hc11/adj-brset.d index f1788f7..a6306cf 100644 --- a/ld/testsuite/ld-m68hc11/adj-brset.d +++ b/ld/testsuite/ld-m68hc11/adj-brset.d @@ -1,8 +1,7 @@ #source: adj-brset.s #as: -m68hc11 -#ld: --relax +#ld: -m m68hc11elf --relax #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: +file format elf32\-m68hc11 diff --git a/ld/testsuite/ld-m68hc11/adj-jump.d b/ld/testsuite/ld-m68hc11/adj-jump.d index be87524..da181bd 100644 --- a/ld/testsuite/ld-m68hc11/adj-jump.d +++ b/ld/testsuite/ld-m68hc11/adj-jump.d @@ -1,8 +1,7 @@ #source: adj-jump.s #as: -m68hc11 -#ld: --relax +#ld: -m m68hc11elf --relax #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: +file format elf32\-m68hc11 diff --git a/ld/testsuite/ld-m68hc11/bug-1403.d b/ld/testsuite/ld-m68hc11/bug-1403.d index c643cd1..dfd69b0 100644 --- a/ld/testsuite/ld-m68hc11/bug-1403.d +++ b/ld/testsuite/ld-m68hc11/bug-1403.d @@ -1,8 +1,7 @@ #source: bug-1403.s #as: -m68hc11 -#ld: --relax +#ld: -m m68hc11elf --relax #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: +file format elf32-m68hc11 diff --git a/ld/testsuite/ld-m68hc11/bug-1417.d b/ld/testsuite/ld-m68hc11/bug-1417.d index 84b3ad4..1947506 100644 --- a/ld/testsuite/ld-m68hc11/bug-1417.d +++ b/ld/testsuite/ld-m68hc11/bug-1417.d @@ -1,8 +1,7 @@ #source: bug-1417.s #as: -m68hc11 -#ld: --relax +#ld: -m m68hc11elf --relax #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: +file format elf32-m68hc11 diff --git a/ld/testsuite/ld-m68hc11/bug-3331.d b/ld/testsuite/ld-m68hc11/bug-3331.d index 91050bf..cee93ab 100644 --- a/ld/testsuite/ld-m68hc11/bug-3331.d +++ b/ld/testsuite/ld-m68hc11/bug-3331.d @@ -1,8 +1,7 @@ #source: bug-3331.s #as: -m68hc11 -#ld: --relax +#ld: -m m68hc11elf --relax #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: +file format elf32-m68hc11 diff --git a/ld/testsuite/ld-m68hc11/far-hc11.d b/ld/testsuite/ld-m68hc11/far-hc11.d index e380511..d563356 100644 --- a/ld/testsuite/ld-m68hc11/far-hc11.d +++ b/ld/testsuite/ld-m68hc11/far-hc11.d @@ -2,31 +2,30 @@ #as: -m68hc11 #ld: -m m68hc11elf #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: file format elf32-m68hc11 Disassembly of section .text: 0+8000 pshb 0+8001 ldab \#0 -0+8003 ldy \#0+6c <_far_foo> +0+8003 ldy \#0+8072 <_far_foo> 0+8007 jmp 0+8056 <__far_trampoline> 0+800a pshb 0+800b ldab \#0 -0+800d ldy \#0+64 +0+800d ldy \#0+806a .* 0+8011 jmp 0+8056 <__far_trampoline> 0+8014 <_start> lds \#0+64 -0+8017 <_start\+0x3> ldx \#0+abcd <__data_image\+0x2b63> +0+8017 <_start\+0x3> ldx \#0+abcd .* 0+801a <_start\+0x6> pshx -0+801b <_start\+0x7> ldd \#0+1234 <__data_section_start\+0x134> -0+801e <_start\+0xa> ldx \#0+5678 <__data_section_start\+0x4578> +0+801b <_start\+0x7> ldd \#0+1234 .* +0+801e <_start\+0xa> ldx \#0+5678 .* 0+8021 <_start\+0xd> jsr 0+800a -0+8024 <_start\+0x10> cpx \#0+1234 <__data_section_start\+0x134> +0+8024 <_start\+0x10> cpx \#0+1234 .* 0+8027 <_start\+0x13> bne 0+804e -0+8029 <_start\+0x15> cpd \#0+5678 <__data_section_start\+0x4578> +0+8029 <_start\+0x15> cpd \#0+5678 .* 0+802d <_start\+0x19> bne 0+804e 0+802f <_start\+0x1b> pulx -0+8030 <_start\+0x1c> cpx \#0+abcd <__data_image\+0x2b63> +0+8030 <_start\+0x1c> cpx \#0+abcd .* 0+8033 <_start\+0x1f> bne 0+804e 0+8035 <_start\+0x21> ldd \#0+8000 0+8038 <_start\+0x24> xgdx @@ -35,7 +34,7 @@ Disassembly of section .text: 0+803e <_start\+0x2a> xgdy 0+8040 <_start\+0x2c> jsr 0,y 0+8043 <_start\+0x2f> ldaa \#0 -0+8045 <_start\+0x31> ldy \#0+73 <_far_no_tramp> +0+8045 <_start\+0x31> ldy \#0+8079 <_far_no_tramp> 0+8049 <_start\+0x35> bsr 0+8066 <__call_a16> 0+804b <_start\+0x37> clra 0+804c <_start\+0x38> clrb @@ -59,15 +58,15 @@ Disassembly of section .text: 0+8066 <__call_a16> psha 0+8067 <__call_a16\+0x1> jmp 0,y Disassembly of section .bank1: -0+64 <_far_bar> jsr 0+6b -0+67 <_far_bar\+0x3> xgdx -0+68 <_far_bar\+0x4> jmp 0+8054 <__return> -0+6b rts +0+806a <_far_bar> jsr 0+8071 +0+806d <_far_bar\+0x3> xgdx +0+806e <_far_bar\+0x4> jmp 0+8054 <__return> +0+8071 rts Disassembly of section .bank2: -0+6c <_far_foo> jsr 0+72 -0+6f <_far_foo\+0x3> jmp 0+8054 <__return> -0+72 rts +0+8072 <_far_foo> jsr 0+8078 +0+8075 <_far_foo\+0x3> jmp 0+8054 <__return> +0+8078 rts Disassembly of section .bank3: -0+73 <_far_no_tramp> jsr 0+79 -0+76 <_far_no_tramp\+0x3> jmp 0+8054 <__return> -0+79 rts +0+8079 <_far_no_tramp> jsr 0+807f +0+807c <_far_no_tramp\+0x3> jmp 0+8054 <__return> +0+807f rts diff --git a/ld/testsuite/ld-m68hc11/far-hc12.d b/ld/testsuite/ld-m68hc11/far-hc12.d index 304ae87..09b3fec 100644 --- a/ld/testsuite/ld-m68hc11/far-hc12.d +++ b/ld/testsuite/ld-m68hc11/far-hc12.d @@ -2,7 +2,6 @@ #as: -m68hc12 #ld: -m m68hc12elf --script $srcdir/$subdir/far-hc12.ld #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: file format elf32\-m68hc12 diff --git a/ld/testsuite/ld-m68hc11/link-hcs12.d b/ld/testsuite/ld-m68hc11/link-hcs12.d index f243da2..d90fcf6 100644 --- a/ld/testsuite/ld-m68hc11/link-hcs12.d +++ b/ld/testsuite/ld-m68hc11/link-hcs12.d @@ -3,17 +3,12 @@ #as: -mshort #ld: -m m68hc12elf #objdump: -p -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: file format elf32\-m68hc12 Program Header: - LOAD off 0x0+ vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*12 - filesz 0x0+100 memsz 0x0+100 flags rw- LOAD off 0x0+1000 vaddr 0x0+8000 paddr 0x0+8000 align 2\*\*12 filesz 0x0+6 memsz 0x0+6 flags r-x - LOAD off 0x0+1100 vaddr 0x0+1100 paddr 0x0+8006 align 2\*\*12 - filesz 0x0+ memsz 0x0+ flags rw- private flags = 22:\[abi=16\-bit int, 64\-bit double, cpu=HCS12\] \[memory=flat\] Disassembly of section .text: diff --git a/ld/testsuite/ld-m68hc11/m68hc11.exp b/ld/testsuite/ld-m68hc11/m68hc11.exp index 103b792..d673bc0 100644 --- a/ld/testsuite/ld-m68hc11/m68hc11.exp +++ b/ld/testsuite/ld-m68hc11/m68hc11.exp @@ -1,5 +1,5 @@ # Expect script for run_dump_test based ld-m68hc11 tests. -# Copyright 2002, 2005, 2007 Free Software Foundation, Inc. +# Copyright 2002, 2005, 2007, 2012 Free Software Foundation, Inc. # # This file is part of the GNU Binutils. # @@ -22,7 +22,8 @@ # Test 68HC11 relaxing. This tests the assembler as well as the linker. -if { ![istarget m6811-*-*] && ![istarget m6812-*-*] } { +if { ![istarget m6811-*-*] && ![istarget m6812-*-*] + && ![istarget m68hc11-*-*] && ![istarget m68hc12-*-*] } { return } diff --git a/ld/testsuite/ld-m68hc11/relax-direct.d b/ld/testsuite/ld-m68hc11/relax-direct.d index 9bd0822..3de3d9a 100644 --- a/ld/testsuite/ld-m68hc11/relax-direct.d +++ b/ld/testsuite/ld-m68hc11/relax-direct.d @@ -1,8 +1,7 @@ #source: relax-direct.s #as: -m68hc11 -#ld: --relax +#ld: -m m68hc11elf --relax #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: +file format elf32-m68hc11 diff --git a/ld/testsuite/ld-m68hc11/relax-group.d b/ld/testsuite/ld-m68hc11/relax-group.d index baf294b..25ac588 100644 --- a/ld/testsuite/ld-m68hc11/relax-group.d +++ b/ld/testsuite/ld-m68hc11/relax-group.d @@ -1,8 +1,7 @@ #source: relax-group.s #as: -m68hc11 -#ld: --relax +#ld: -m m68hc11elf --relax #objdump: -d --prefix-addresses -r -#target: m6811-*-* m6812-*-* .*: +file format elf32-m68hc11 -- 2.7.4