From 34c4758cc210e2ca042b0373938e57fd6844f89d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 13 Aug 2017 05:41:37 -0700 Subject: [PATCH] ld: Restore linker scripts in PR ld/21884 tests OUTPUT_FORMAT in linker script of PR ld/21884 tests is needed to trigger PR ld/21884. Restore linker scripts and add nacl versions of the same tests. * testsuite/ld-i386/i386.exp: Run pr21884-nacl. * testsuite/ld-x86-64/x86-64.exp: Likewise. * testsuite/ld-i386/pr21884.d: Don't run on nacl targets. * testsuite/ld-x86-64/pr21884.d: Likewise. * testsuite/ld-i386/pr21884.t: Revert the last change. * testsuite/ld-x86-64/pr21884.t: Likewise. * testsuite/ld-i386/pr21884-nacl.d: New file. * testsuite/ld-i386/pr21884-nacl.t: Likewise. * testsuite/ld-x86-64/pr21884-nacl.d: Likewise. * testsuite/ld-x86-64/pr21884-nacl.t: Likewise. --- ld/ChangeLog | 13 +++++++++++++ ld/testsuite/ld-i386/i386.exp | 1 + ld/testsuite/ld-i386/pr21884-nacl.d | 10 ++++++++++ ld/testsuite/ld-i386/pr21884-nacl.t | 11 +++++++++++ ld/testsuite/ld-i386/pr21884.d | 1 + ld/testsuite/ld-i386/pr21884.t | 4 ++++ ld/testsuite/ld-x86-64/pr21884-nacl.d | 10 ++++++++++ ld/testsuite/ld-x86-64/pr21884-nacl.t | 11 +++++++++++ ld/testsuite/ld-x86-64/pr21884.d | 1 + ld/testsuite/ld-x86-64/pr21884.t | 4 ++++ ld/testsuite/ld-x86-64/x86-64.exp | 1 + 11 files changed, 67 insertions(+) create mode 100644 ld/testsuite/ld-i386/pr21884-nacl.d create mode 100644 ld/testsuite/ld-i386/pr21884-nacl.t create mode 100644 ld/testsuite/ld-x86-64/pr21884-nacl.d create mode 100644 ld/testsuite/ld-x86-64/pr21884-nacl.t diff --git a/ld/ChangeLog b/ld/ChangeLog index fdd8d58c170..aad32493af1 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,16 @@ +2017-08-13 H.J. Lu + + * testsuite/ld-i386/i386.exp: Run pr21884-nacl. + * testsuite/ld-x86-64/x86-64.exp: Likewise. + * testsuite/ld-i386/pr21884.d: Don't run on nacl targets. + * testsuite/ld-x86-64/pr21884.d: Likewise. + * testsuite/ld-i386/pr21884.t: Revert the last change. + * testsuite/ld-x86-64/pr21884.t: Likewise. + * testsuite/ld-i386/pr21884-nacl.d: New file. + * testsuite/ld-i386/pr21884-nacl.t: Likewise. + * testsuite/ld-x86-64/pr21884-nacl.d: Likewise. + * testsuite/ld-x86-64/pr21884-nacl.t: Likewise. + 2017-08-13 Alan Modra * testsuite/ld-i386/pr21884.t: Remove unneeded format, arch and entry. diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 34f03e04702..27d622eab42 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -438,6 +438,7 @@ run_dump_test "property-x86-shstk5" run_dump_test "pie1" run_dump_test "pie1-nacl" run_dump_test "pr21884" +run_dump_test "pr21884-nacl" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr21884-nacl.d b/ld/testsuite/ld-i386/pr21884-nacl.d new file mode 100644 index 00000000000..82daaaafe2c --- /dev/null +++ b/ld/testsuite/ld-i386/pr21884-nacl.d @@ -0,0 +1,10 @@ +#source: dummy.s +#as: --32 +#ld: -m elf_i386 -T pr21884-nacl.t -b binary +#objdump: -b binary -s +#target: i?86-*-nacl* x86_64-*-nacl* + +.*: file format binary + +Contents of section .data: +#pass diff --git a/ld/testsuite/ld-i386/pr21884-nacl.t b/ld/testsuite/ld-i386/pr21884-nacl.t new file mode 100644 index 00000000000..3ffb56c0703 --- /dev/null +++ b/ld/testsuite/ld-i386/pr21884-nacl.t @@ -0,0 +1,11 @@ +OUTPUT_FORMAT("elf32-i386-nacl"); +OUTPUT_ARCH(i386); + +ENTRY(_start); +SECTIONS { + . = 0x10000; + _start = . ; + .data : { + *(.data) + } +} diff --git a/ld/testsuite/ld-i386/pr21884.d b/ld/testsuite/ld-i386/pr21884.d index dc212d3c68a..ea73aa2a759 100644 --- a/ld/testsuite/ld-i386/pr21884.d +++ b/ld/testsuite/ld-i386/pr21884.d @@ -2,6 +2,7 @@ #as: --32 #ld: -m elf_i386 -T pr21884.t -b binary #objdump: -b binary -s +#notarget: i?86-*-nacl* x86_64-*-nacl* .*: file format binary diff --git a/ld/testsuite/ld-i386/pr21884.t b/ld/testsuite/ld-i386/pr21884.t index fcb7bce20ec..4cf8cdcaa30 100644 --- a/ld/testsuite/ld-i386/pr21884.t +++ b/ld/testsuite/ld-i386/pr21884.t @@ -1,3 +1,7 @@ +OUTPUT_FORMAT("elf32-i386"); +OUTPUT_ARCH(i386); + +ENTRY(_start); SECTIONS { . = 0x10000; _start = . ; diff --git a/ld/testsuite/ld-x86-64/pr21884-nacl.d b/ld/testsuite/ld-x86-64/pr21884-nacl.d new file mode 100644 index 00000000000..88835055c32 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr21884-nacl.d @@ -0,0 +1,10 @@ +#source: dummy.s +#as: --64 +#ld: -m elf_x86_64 -T pr21884-nacl.t -b binary +#objdump: -b binary -s +#target: x86_64-*-nacl* + +.*: file format binary + +Contents of section .data: +#pass diff --git a/ld/testsuite/ld-x86-64/pr21884-nacl.t b/ld/testsuite/ld-x86-64/pr21884-nacl.t new file mode 100644 index 00000000000..722312e0812 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr21884-nacl.t @@ -0,0 +1,11 @@ +OUTPUT_FORMAT("elf64-x86-64-nacl"); +OUTPUT_ARCH(i386:x86-64); + +ENTRY(_start); +SECTIONS { + . = 0x10000; + _start = . ; + .data : { + *(.data) + } +} diff --git a/ld/testsuite/ld-x86-64/pr21884.d b/ld/testsuite/ld-x86-64/pr21884.d index a62d8bc4f7a..7a2a3f361c6 100644 --- a/ld/testsuite/ld-x86-64/pr21884.d +++ b/ld/testsuite/ld-x86-64/pr21884.d @@ -2,6 +2,7 @@ #as: --64 #ld: -m elf_x86_64 -T pr21884.t -b binary #objdump: -b binary -s +#notarget: x86_64-*-nacl* .*: file format binary diff --git a/ld/testsuite/ld-x86-64/pr21884.t b/ld/testsuite/ld-x86-64/pr21884.t index fcb7bce20ec..edd20704c7f 100644 --- a/ld/testsuite/ld-x86-64/pr21884.t +++ b/ld/testsuite/ld-x86-64/pr21884.t @@ -1,3 +1,7 @@ +OUTPUT_FORMAT("elf64-x86-64"); +OUTPUT_ARCH(i386:x86-64); + +ENTRY(_start); SECTIONS { . = 0x10000; _start = . ; diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 0009fe321bb..46311577e4b 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -366,6 +366,7 @@ run_dump_test "property-x86-shstk4-x32" run_dump_test "property-x86-shstk5" run_dump_test "property-x86-shstk5-x32" run_dump_test "pr21884" +run_dump_test "pr21884-nacl" if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { return -- 2.30.2