From 3b6c19668236e6fd60c6299e7d016396d645fa61 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 19 Mar 2019 15:41:58 +1030 Subject: [PATCH] Fix some dlx fails Generic linker ELF targets using CREATE_OBJECT_SYMBOLS in their scripts run into a problem. The file symbols are created by _bfd_generic_link_output_symbols in each object file, in the section corresponding to the CREATE_OBJECT_SYMBOLS section, typically .text. If it so happens that the output .text section is stripped due to being empty, then elf.c:assign_section_numbers won't assign an ELF section number and swap_out_syms will report "unable to find equivalent output section" for the object symbols. Fix this by always keeping an output section with CREATE_OBJECT_SYMBOLS. * ldlang.c (lang_size_sections_1): Set SEC_KEEP on create_object_symbols_section. * testsuite/ld-elf/pr22319.d: Don't xfail dlx. --- ld/ChangeLog | 6 ++++++ ld/ldlang.c | 5 +++-- ld/testsuite/ld-elf/pr22319.d | 2 -- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 9000cabf9de..4fe6889efab 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2019-03-21 Alan Modra + + * ldlang.c (lang_size_sections_1): Set SEC_KEEP on + create_object_symbols_section. + * testsuite/ld-elf/pr22319.d: Don't xfail dlx. + 2019-03-18 Alan Modra * testsuite/ld-elf/merge.d: Remove csky from xfails, add moxie. diff --git a/ld/ldlang.c b/ld/ldlang.c index 33f6bda292a..77d890eb704 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -5619,8 +5619,9 @@ lang_size_sections_1 break; case lang_object_symbols_statement_enum: - link_info.create_object_symbols_section = - output_section_statement->bfd_section; + link_info.create_object_symbols_section + = output_section_statement->bfd_section; + output_section_statement->bfd_section->flags |= SEC_KEEP; break; case lang_output_statement_enum: diff --git a/ld/testsuite/ld-elf/pr22319.d b/ld/testsuite/ld-elf/pr22319.d index 8ad2f3e90d9..f5413f09fd6 100644 --- a/ld/testsuite/ld-elf/pr22319.d +++ b/ld/testsuite/ld-elf/pr22319.d @@ -1,8 +1,6 @@ #name: PR 22319 - required undefined symbols in output #ld: -u undefined_symbol -e 0 #nm: -u -#xfail: dlx-*-* -# The DLX target fails because it needs a special linker script to handle file symbols. [ ]+U+[ ]+undefined_symbol #pass -- 2.30.2