From ce1feff0e7ec703e548ea79af3ae0081481d8fd8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 17 Apr 2020 13:16:56 +0100 Subject: [PATCH] Revert "Fix the test for PR 18963 so that it will work on 16-bit targets." This reverts commit 7a1a12f4d1c6152017142d74c736dc1cc6b0e81c. --- ld/ChangeLog | 8 -------- ld/pe-dll.c | 2 +- ld/testsuite/ld-scripts/pr18963.d | 19 ++++++------------- ld/testsuite/ld-scripts/pr18963.s | 7 ------- ld/testsuite/ld-scripts/pr18963.t | 13 +++++++++---- 5 files changed, 16 insertions(+), 33 deletions(-) delete mode 100644 ld/testsuite/ld-scripts/pr18963.s diff --git a/ld/ChangeLog b/ld/ChangeLog index 8e3e2df3e8..095748b0d6 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -13,14 +13,6 @@ * testsuite/ld-elfvers/vers.exp: Add checks to detect if files were built before attempting to copy them. -2020-04-16 Stephen Casner - - PR ld/18963 - * testsuite/ld-scripts/pr18963.s: New, replaces empty data.s to - allocate space in text, data, bss here rather than pr18963.t. - * testsuite/ld-scripts/pr18963.t: Remove assignments to dot. - * testsuite/ld-scripts/pr18963.d: Change addresses to fit 16 bits. - 2020-04-15 Fangrui Song PR binutils/24613 diff --git a/ld/pe-dll.c b/ld/pe-dll.c index 1145d7a251..0addde2318 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -1540,7 +1540,7 @@ generate_reloc (bfd *abfd, struct bfd_link_info *info) if (s->output_section->vma == 0) { /* Huh? Shouldn't happen, but punt if it does. */ - einfo (_("%P: zero vma section reloc detected: `%s' index %d flags %x\n"), + einfo (_("%P: zero vma section reloc detected: `%s' #%d f=%d\n"), s->output_section->name, s->output_section->index, s->output_section->flags); continue; diff --git a/ld/testsuite/ld-scripts/pr18963.d b/ld/testsuite/ld-scripts/pr18963.d index 293887f6a9..699db594ac 100644 --- a/ld/testsuite/ld-scripts/pr18963.d +++ b/ld/testsuite/ld-scripts/pr18963.d @@ -1,22 +1,15 @@ -# source: pr18963.s +# source: data.s # ld: -T pr18963.t # nm: -B -n -# notarget: tic*-*-* ia64-*-* *-*-aix* microblaze-*-* *-*-vms -# Skip this test on targets which have sizeof(byte) != sizeof(octet). -# On these targets the ".lcomm _bss,0x100" directive does not create -# a 0x100 byte long section as needed by the test. -# Also skip it for AIX and IA64 targets because they use a non-standard version of .lcomm. -# And skip for the microblaze target which does not support a .bss section at all. -# Plus skip for VMS based targets as the linker automatically adds extra libraries that may not be present in a cross build. #... -0+a00 . D +0+70000 A D #... -0+a00 . E +0+70000 A E #... -[02]+b00 T A +0+80000 T A #... -[02]+c00 D B +0+90000 T B #... -[02]+d00 . C +0+a0000 D C #pass diff --git a/ld/testsuite/ld-scripts/pr18963.s b/ld/testsuite/ld-scripts/pr18963.s deleted file mode 100644 index 6a59f5583e..0000000000 --- a/ld/testsuite/ld-scripts/pr18963.s +++ /dev/null @@ -1,7 +0,0 @@ - .globl _start - .text -_start: - .=.+0x800 - .data - .=.+0x100 - .lcomm _bss,0x100 diff --git a/ld/testsuite/ld-scripts/pr18963.t b/ld/testsuite/ld-scripts/pr18963.t index 94f8f164d0..830ded78dd 100644 --- a/ld/testsuite/ld-scripts/pr18963.t +++ b/ld/testsuite/ld-scripts/pr18963.t @@ -1,20 +1,25 @@ SECTIONS { - .text 0x300 : + . = 0x80000; + A = .; + .text : { + _start = .; *(.text) + . = 0x10000; } - A = .; + B = .; .data : { *(.data) + . = 0x10000; } - B = .; + C = .; .bss : { *(.bss) + . = 0x10000; } - C = .; D = A - C + B; E = A + B - C; /DISCARD/ : {*(*)} -- 2.34.1