From 32d79e68186ae2d123ec2f100c40440fe2951c7e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 14 Feb 2012 01:02:04 +0000 Subject: [PATCH] * ld-elf/linkoncerdiff.d: Don't run for hppa64-hpux. * ld-elf/pr11304a.s: Always have whitespace before directives. * ld-elf/pr11304b.s: Likewise. * ld-selective/selective.exp: Test m68hc1* variant of m6811, m6812. * lib/ld-lib.exp: Likewise, and vice versa. --- ld/testsuite/ChangeLog | 8 ++++++++ ld/testsuite/ld-elf/linkoncerdiff.d | 1 + ld/testsuite/ld-elf/pr11304a.s | 8 ++++---- ld/testsuite/ld-elf/pr11304b.s | 8 ++++---- ld/testsuite/ld-selective/selective.exp | 2 +- ld/testsuite/lib/ld-lib.exp | 4 +++- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index f118153..10cd3ea 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-02-14 Alan Modra + + * ld-elf/linkoncerdiff.d: Don't run for hppa64-hpux. + * ld-elf/pr11304a.s: Always have whitespace before directives. + * ld-elf/pr11304b.s: Likewise. + * ld-selective/selective.exp: Test m68hc1* variant of m6811, m6812. + * lib/ld-lib.exp: Likewise, and vice versa. + 2012-02-13 Richard Henderson PR ld/13621 diff --git a/ld/testsuite/ld-elf/linkoncerdiff.d b/ld/testsuite/ld-elf/linkoncerdiff.d index 8eec3d2..06d08c1 100644 --- a/ld/testsuite/ld-elf/linkoncerdiff.d +++ b/ld/testsuite/ld-elf/linkoncerdiff.d @@ -2,5 +2,6 @@ #source: linkoncerdiff2.s #ld: -r #readelf: -r +#notarget: hppa64*-*-hpux* There are no relocations in this file. #pass diff --git a/ld/testsuite/ld-elf/pr11304a.s b/ld/testsuite/ld-elf/pr11304a.s index 22fbbee..75fcd37 100644 --- a/ld/testsuite/ld-elf/pr11304a.s +++ b/ld/testsuite/ld-elf/pr11304a.s @@ -1,4 +1,4 @@ -.section .zzz,"ax",%progbits -.long 0 -.text -.long 0 + .section .zzz,"ax",%progbits + .long 0 + .text + .long 0 diff --git a/ld/testsuite/ld-elf/pr11304b.s b/ld/testsuite/ld-elf/pr11304b.s index 22fbbee..75fcd37 100644 --- a/ld/testsuite/ld-elf/pr11304b.s +++ b/ld/testsuite/ld-elf/pr11304b.s @@ -1,4 +1,4 @@ -.section .zzz,"ax",%progbits -.long 0 -.text -.long 0 + .section .zzz,"ax",%progbits + .long 0 + .text + .long 0 diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp index f328441..23c23dd 100644 --- a/ld/testsuite/ld-selective/selective.exp +++ b/ld/testsuite/ld-selective/selective.exp @@ -141,7 +141,7 @@ foreach testitem $seltests { } # m6811/m6812 code has references to soft registers. - if {[istarget m6811-*-*] || [istarget m6812-*-*]} { + if {[istarget m6811-*-*] || [istarget m6812-*-*] || [istarget m68hc1*-*-*]} { set objfile "$objfile --defsym _.frame=0 --defsym _.d1=0" set objfile "$objfile --defsym _.d2=0" } diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index 25999e9..8b51123 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -415,7 +415,7 @@ proc ld_simple_link_defsyms {} { } # m6811/m6812 code has references to soft registers. - if {[istarget m6811-*-*] || [istarget m6812-*-*]} { + if {[istarget m6811-*-*] || [istarget m6812-*-*] || [istarget m68hc1*-*-*]} { append flags " --defsym _.frame=0 --defsym _.d1=0 --defsym _.d2=0" append flags " --defsym _.d3=0 --defsym _.d4=0" append flags " --defsym _.tmp=0 --defsym _.xy=0 --defsym _.z=0" @@ -1502,6 +1502,8 @@ proc check_shared_lib_support { } { && ![istarget lm32-*-*] && ![istarget m32c-*-*] && ![istarget m32r-*-*] + && ![istarget m6811-*-*] + && ![istarget m6812-*-*] && ![istarget m68hc1*-*-*] && ![istarget mcore*-*-*] && ![istarget mep-*-*] -- 2.7.4