diff options
author | Roland McGrath <mcgrathr@google.com> | 2020-06-23 12:01:24 -0700 |
---|---|---|
committer | Roland McGrath <mcgrathr@google.com> | 2020-06-23 12:01:24 -0700 |
commit | f37b21b481a7804a13c5806098c19b6119288ba4 (patch) | |
tree | 3949b039081a31a28f9c9c227c7810e13ea2f25a /gold/layout.cc | |
parent | 236ef0346d88efffd1ca1da1a5d80724cb145660 (diff) | |
download | gdb-f37b21b481a7804a13c5806098c19b6119288ba4.zip gdb-f37b21b481a7804a13c5806098c19b6119288ba4.tar.gz gdb-f37b21b481a7804a13c5806098c19b6119288ba4.tar.bz2 |
PR 22843: ld, gold: Add --dependency-file option.
gold/
* options.h (class General_options): Add --dependency-file option.
* fileread.cc (File_read::files_read): New static variable.
(File_read::open): Add the file to the files_read list.
(File_read::record_file_read): New static member function.
(File_read::write_dependency_file): New static member function.
* fileread.h (class File_read): Declare them.
* layout.cc (Layout::read_layout_from_file): Call record_file_read.
(Close_task_runner::run): Call write_dependency_file if
--dependency-file was passed.
ld/
* NEWS: Note --dependency-file.
* ld.texi (Options): Document --dependency-file.
* ldlex.h (enum option_values): Add OPTION_DEPENDENCY_FILE.
* ld.h (ld_config_type): New member dependency_file.
* lexsup.c (ld_options, parse_args): Parse --dependency-file.
* ldmain.c (struct dependency_file): New type.
(dependency_files, dependency_files_tail): New static variables.
(track_dependency_files): New function.
(write_dependency_file): New function.
(main): Call it when --dependency-file was passed.
* ldfile.c (ldfile_try_open_bfd): Call track_dependency_files.
(ldfile_open_command_file_1): Likewise.
* ldelf.c (ldelf_try_needed): Likewise.
* pe-dll.c (pe_implied_import_dll): Likewise.
Diffstat (limited to 'gold/layout.cc')
-rw-r--r-- | gold/layout.cc | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/gold/layout.cc b/gold/layout.cc index 0c7be85..13e533a 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -1183,11 +1183,11 @@ Layout::layout(Sized_relobj_file<size, big_endian>* object, unsigned int shndx, // All ".text.unlikely.*" sections can be moved to a unique // segment with --text-unlikely-segment option. bool text_unlikely_segment - = (parameters->options().text_unlikely_segment() - && is_prefix_of(".text.unlikely", - object->section_name(shndx).c_str())); + = (parameters->options().text_unlikely_segment() + && is_prefix_of(".text.unlikely", + object->section_name(shndx).c_str())); if (text_unlikely_segment) - { + { elfcpp::Elf_Xword flags = this->get_output_section_flags(shdr.get_sh_flags()); @@ -1196,11 +1196,11 @@ Layout::layout(Sized_relobj_file<size, big_endian>* object, unsigned int shndx, &name_key); os = this->get_output_section(os_name, name_key, sh_type, flags, ORDER_INVALID, false); - // Map this output section to a unique segment. This is done to - // separate "text" that is not likely to be executed from "text" - // that is likely executed. + // Map this output section to a unique segment. This is done to + // separate "text" that is not likely to be executed from "text" + // that is likely executed. os->set_is_unique_segment(); - } + } else { // Plugins can choose to place one or more subsets of sections in @@ -1221,7 +1221,7 @@ Layout::layout(Sized_relobj_file<size, big_endian>* object, unsigned int shndx, // We know the name of the output section, directly call // get_output_section here by-passing choose_output_section. elfcpp::Elf_Xword flags - = this->get_output_section_flags(shdr.get_sh_flags()); + = this->get_output_section_flags(shdr.get_sh_flags()); const char* os_name = it->second->name; Stringpool::Key name_key; @@ -1229,11 +1229,11 @@ Layout::layout(Sized_relobj_file<size, big_endian>* object, unsigned int shndx, os = this->get_output_section(os_name, name_key, sh_type, flags, ORDER_INVALID, false); if (!os->is_unique_segment()) - { - os->set_is_unique_segment(); - os->set_extra_segment_flags(it->second->flags); - os->set_segment_alignment(it->second->align); - } + { + os->set_is_unique_segment(); + os->set_extra_segment_flags(it->second->flags); + os->set_segment_alignment(it->second->align); + } } } if (os == NULL) @@ -2268,9 +2268,9 @@ Layout::layout_gnu_property(unsigned int note_type, const int size = parameters->target().get_size(); const bool is_big_endian = parameters->target().is_big_endian(); if (size == 32) - { - if (is_big_endian) - { + { + if (is_big_endian) + { #ifdef HAVE_TARGET_32_BIG parameters->sized_target<32, true>()-> record_gnu_property(note_type, pr_type, pr_datasz, pr_data, @@ -2278,9 +2278,9 @@ Layout::layout_gnu_property(unsigned int note_type, #else gold_unreachable(); #endif - } - else - { + } + else + { #ifdef HAVE_TARGET_32_LITTLE parameters->sized_target<32, false>()-> record_gnu_property(note_type, pr_type, pr_datasz, pr_data, @@ -2288,12 +2288,12 @@ Layout::layout_gnu_property(unsigned int note_type, #else gold_unreachable(); #endif - } - } + } + } else if (size == 64) - { - if (is_big_endian) - { + { + if (is_big_endian) + { #ifdef HAVE_TARGET_64_BIG parameters->sized_target<64, true>()-> record_gnu_property(note_type, pr_type, pr_datasz, pr_data, @@ -2301,9 +2301,9 @@ Layout::layout_gnu_property(unsigned int note_type, #else gold_unreachable(); #endif - } - else - { + } + else + { #ifdef HAVE_TARGET_64_LITTLE parameters->sized_target<64, false>()-> record_gnu_property(note_type, pr_type, pr_datasz, pr_data, @@ -2311,10 +2311,10 @@ Layout::layout_gnu_property(unsigned int note_type, #else gold_unreachable(); #endif - } - } + } + } else - gold_unreachable(); + gold_unreachable(); return; } @@ -2922,6 +2922,8 @@ Layout::read_layout_from_file() gold_fatal(_("unable to open --section-ordering-file file %s: %s"), filename, strerror(errno)); + File_read::record_file_read(filename); + std::getline(in, line); // this chops off the trailing \n, if any unsigned int position = 1; this->set_section_ordering_specified(); @@ -3299,7 +3301,7 @@ Layout::create_gnu_properties_note() write_sized_value(datasz, 4, p + 4, is_big_endian); memcpy(p + 8, prop->second.pr_data, datasz); if (aligned_datasz > datasz) - memset(p + 8 + datasz, 0, aligned_datasz - datasz); + memset(p + 8 + datasz, 0, aligned_datasz - datasz); p += 8 + aligned_datasz; } Output_section_data* posd = new Output_data_const(desc, descsz, 4); @@ -6156,6 +6158,10 @@ Close_task_runner::run(Workqueue*, const Task*) if (this->options_->oformat_enum() != General_options::OBJECT_FORMAT_ELF) this->layout_->write_binary(this->of_); + if (this->options_->dependency_file()) + File_read::write_dependency_file(this->options_->dependency_file(), + this->options_->output_file_name()); + this->of_->close(); } |