From 7c519c12a36a82acb25b7fa17a25f8804c8e2b90 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Mon, 14 Oct 2002 13:08:19 +0000 Subject: [PATCH] * ldlang.c (load_symbols): Don't call bfd_link_add_symbols when just_syms_flag. (lang_reasonable_defaults): Don't compare against false. (size_input_section): Likewise. (lang_size_sections_1): Likewise. (lang_do_assignments): Likewise. (lang_add_output): Likewise. --- ld/ChangeLog | 22 +++++++++++++++------- ld/ldlang.c | 23 ++++++++++++----------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index fce8aa242a0..b1329327a6c 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,13 @@ 2002-10-14 Alan Modra + * ldlang.c (load_symbols): Don't call bfd_link_add_symbols when + just_syms_flag. + (lang_reasonable_defaults): Don't compare against false. + (size_input_section): Likewise. + (lang_size_sections_1): Likewise. + (lang_do_assignments): Likewise. + (lang_add_output): Likewise. + * Makefile.am: Run "make dep-am". * Makefile.in: Regenerate. * ldver.c: #include "bfdver.h". @@ -41,7 +49,7 @@ * configure.tgt: Add sh64eb-*-linux* and sh64-*-linux* emulations. * emulparams/shelf32_linux.sh: New file. * emulparams/shlelf32_linux.sh: New file. - + 2002-10-08 H.J. Lu * ldlang.c (lang_file_exist): Removed. @@ -58,7 +66,7 @@ 2002-10-05 Elias Athanasopoulos * ldlang.c (lang_file_exist): New function. - (new_afile): Abort if the filename to be added matches the linker + (new_afile): Abort if the filename to be added matches the linker output filename. * ldlang.h: Add prototype for lang_file_exist. * lexsup.c (parse_args): Abort if the output filename matches @@ -140,7 +148,7 @@ 2002-09-06 Jeffrey A Law (law@redhat.com) - * configure.tgt (h8300-*-hms*, h8500-*-hms*): Restore. + * configure.tgt (h8300-*-hms*, h8500-*-hms*): Restore. 2002-09-02 Nick Clifton @@ -154,7 +162,7 @@ used. Change INSN to start at 0x01000000 and extend for 256K (ignoring holes). Start the STACK on a word aligned boundary. - (.rodata): Start it at the READONLY_START_ADDR. + (.rodata): Start it at the READONLY_START_ADDR. 2002-08-30 Alan Modra @@ -193,18 +201,18 @@ 2002-08-27 Nick Clifton * emultempl/armelf.em: Revert this patch, it is not needed. - + 2002-08-22 Adam Nemet 2002-08-20 Dan Kegel - + * configure.in: added --with-lib-path argument to ld's configure to set LIB_PATH. * ld/NEWS: Document new switch. * ld/README: Mention new switch. * configure: Regenerate. * Makefile.in: Regenerate. - + Based on this patch: 2001-04-25 Christopher Faylor diff --git a/ld/ldlang.c b/ld/ldlang.c index 8ebd1bd2eaa..f2bb9b29aed 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -1590,7 +1590,9 @@ load_symbols (entry, place) break; } - if (bfd_link_add_symbols (entry->the_bfd, &link_info)) + if (entry->just_syms_flag) + entry->loaded = true; + else if (bfd_link_add_symbols (entry->the_bfd, &link_info)) entry->loaded = true; else einfo (_("%F%B: could not read symbols: %E\n"), entry->the_bfd); @@ -2022,7 +2024,7 @@ lang_reasonable_defaults () default_common_section = lang_output_section_statement_lookup (".bss"); - if (placed_commons == false) + if (!placed_commons) { lang_wild_statement_type *new = new_stat (lang_wild_statement, @@ -2778,7 +2780,7 @@ size_input_section (this_ptr, output_section_statement, fill, dot) lang_input_section_type *is = &((*this_ptr)->input_section); asection *i = is->section; - if (is->ifile->just_syms_flag == false) + if (!is->ifile->just_syms_flag) { unsigned opb = bfd_arch_mach_octets_per_byte (ldfile_output_architecture, ldfile_output_machine); @@ -3033,11 +3035,10 @@ lang_size_sections_1 (s, output_section_statement, prev, fill, dot, relax) abs_output_section, lang_allocating_phase_enum, dot, &dot); - if (r.valid_p == false) - { - einfo (_("%F%S: non constant address expression for section %s\n"), - os->name); - } + if (!r.valid_p) + einfo (_("%F%S: non constant address expression for section %s\n"), + os->name); + dot = r.value + r.section->bfd_section->vma; } @@ -3404,7 +3405,7 @@ lang_do_assignments (s, output_section_statement, fill, dot) abs_output_section, lang_final_phase_enum, dot, &dot); s->data_statement.value = value.value; - if (value.valid_p == false) + if (!value.valid_p) einfo (_("%F%P: invalid data statement\n")); } { @@ -3441,7 +3442,7 @@ lang_do_assignments (s, output_section_statement, fill, dot) abs_output_section, lang_final_phase_enum, dot, &dot); s->reloc_statement.addend_value = value.value; - if (value.valid_p == false) + if (!value.valid_p) einfo (_("%F%P: invalid reloc statement\n")); } dot += bfd_get_reloc_size (s->reloc_statement.howto) / opb; @@ -4024,7 +4025,7 @@ lang_add_output (name, from_script) int from_script; { /* Make -o on command line override OUTPUT in script. */ - if (had_output_filename == false || !from_script) + if (!had_output_filename || !from_script) { output_filename = name; had_output_filename = true; -- 2.30.2