From 125f83f66c10c89530d011f4f81324b1f43afcda Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 2 Jul 2019 14:14:13 +0100 Subject: [PATCH] Fix a bug recently introduced to the linker where it would complain about a section being larger than a file, even if the section was artificial. PR 24753 bfd * compress.c (bfd_get_full_section_contents): Do not complain about linker created sections that are larger than the file size. ld * emultempl/aarch64elf.em (_aarch64_add_stub_section): Include the LINKER_CREATED section flag when creating the stub section. --- bfd/ChangeLog | 6 ++++++ bfd/compress.c | 3 +++ ld/ChangeLog | 6 ++++++ ld/emultempl/aarch64elf.em | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index af25e433af5..063af9ca100 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2019-07-02 Nick Clifton + + PR 24753 + * compress.c (bfd_get_full_section_contents): Do not complain + about linker created sections that are larger than the file size. + 2019-07-02 Christophe Lyon * bfd/elf32-arm.c (CMSE_STUB_NAME): New define. diff --git a/bfd/compress.c b/bfd/compress.c index cba281dca49..32de09923df 100644 --- a/bfd/compress.c +++ b/bfd/compress.c @@ -253,6 +253,9 @@ bfd_get_full_section_contents (bfd *abfd, sec_ptr sec, bfd_byte **ptr) ufile_ptr filesize = bfd_get_file_size (abfd); if (filesize > 0 && filesize < sz + /* PR 24753: Linker created sections can be larger than + the file size, eg if they are being used to hold stubs. */ + && (bfd_get_section_flags (abfd, sec) & SEC_LINKER_CREATED) == 0 /* The MMO file format supports its own special compression technique, but it uses COMPRESS_SECTION_NONE when loading a section's contents. */ diff --git a/ld/ChangeLog b/ld/ChangeLog index 0f0619626d1..d4916f4b698 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2019-07-02 Nick Clifton + + PR 24753 + * emultempl/aarch64elf.em (_aarch64_add_stub_section): Include the + LINKER_CREATED section flag when creating the stub section. + 2019-07-02 Srinath Parvathaneni * testsuite/ld-arm/arm-elf.exp: Add tests. diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em index 4c13f26f4e1..93f60a9b613 100644 --- a/ld/emultempl/aarch64elf.em +++ b/ld/emultempl/aarch64elf.em @@ -169,7 +169,7 @@ elf${ELFSIZE}_aarch64_add_stub_section (const char *stub_sec_name, lang_output_section_statement_type *os; struct hook_stub_info info; - flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE + flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_LINKER_CREATED | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP); stub_sec = bfd_make_section_anyway_with_flags (stub_file->the_bfd, stub_sec_name, flags); -- 2.30.2