From: H.J. Lu Date: Mon, 19 Feb 2018 13:07:33 +0000 (-0800) Subject: ld: Add -z separate-code tests to frame.exp X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f61f94ec1bf9cb3d32b38a90a1f5c2d58ececbfb;p=binutils-gdb.git ld: Add -z separate-code tests to frame.exp On x86, "-z separate-code" leads to assertion fail at bfd/elf.c:5917. Alsp skip tests if -shared isn't supported. PR ld/22845 * testsuite/ld-elf/frame.exp: Skip if -shared isn't supported. Add tests for "-z noseparate-code" and "-z separate-code". Remove unsupported -shared check. --- diff --git a/ld/ChangeLog b/ld/ChangeLog index 2f022ec7a78..6d9ccc5622a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2018-02-19 H.J. Lu + + PR ld/22845 + * testsuite/ld-elf/frame.exp: Skip if -shared isn't supported. + Add tests for "-z noseparate-code" and "-z separate-code". + Remove unsupported -shared check. + 2018-02-17 H.J. Lu PR ld/22845 diff --git a/ld/testsuite/ld-elf/frame.exp b/ld/testsuite/ld-elf/frame.exp index 6cce42deb31..8862ff14a5c 100644 --- a/ld/testsuite/ld-elf/frame.exp +++ b/ld/testsuite/ld-elf/frame.exp @@ -29,7 +29,7 @@ if ![is_elf_format] { } # No shared lib support on this target. -if { [istarget "mcore-*-*"] } { +if ![istarget shared] { return } @@ -64,14 +64,16 @@ if { ![ld_assemble_flags $as $as_opt $srcdir/$subdir/tbss.s tmpdir/tbss.o ] return } -if { [ld_link $ld tmpdir/frame.so "--shared tmpdir/frame.o tmpdir/tbss.o"] } { - pass "$test1" +if { [ld_link $ld tmpdir/frame.so "-z noseparate-code --shared tmpdir/frame.o tmpdir/tbss.o"] } { + pass "$test1 -z noseparate-code" } else { - if [string match "*shared not supported*" $link_output] { - unsupported "-shared is not supported by this target" - } else { - fail "$test1" - } + fail "$test1 -z noseparate-code" +} + +if { [ld_link $ld tmpdir/frame.so "-z separate-code --shared tmpdir/frame.o tmpdir/tbss.o"] } { + pass "$test1 -z separate-code" +} else { + fail "$test1 -z separate-code" } if ![ld_assemble_flags $as $as_opt $srcdir/$subdir/table.s tmpdir/table.o ] { @@ -79,12 +81,14 @@ if ![ld_assemble_flags $as $as_opt $srcdir/$subdir/table.s tmpdir/table.o ] { return } -if { [ld_link $ld tmpdir/table.so "--shared tmpdir/table.o tmpdir/tbss.o"] } { - pass "$test2" +if { [ld_link $ld tmpdir/table.so "-z noseparate-code --shared tmpdir/table.o tmpdir/tbss.o"] } { + pass "$test2 -z noseparate-code" +} else { + fail "$test2 -z noseparate-code" +} + +if { [ld_link $ld tmpdir/table.so "-z separate-code --shared tmpdir/table.o tmpdir/tbss.o"] } { + pass "$test2 -z separate-code" } else { - if [string match "*shared not supported*" $link_output] { - unsupported "-shared is not supported by this target" - } else { - fail "$test2" - } + fail "$test2 -z separate-code" }