diff options
author | Alan Modra <amodra@gmail.com> | 2022-01-14 12:24:22 +1030 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2022-01-18 11:18:51 +1030 |
commit | e29de63f0d160268850d79fa29b6c0b1ee65fd75 (patch) | |
tree | 709849ebe274ed3f872f8e54522197d39c78d5ff /ld | |
parent | 1657026ccd8aa05a97cb35f1d9bff646937a244e (diff) | |
download | fsf-binutils-gdb-e29de63f0d160268850d79fa29b6c0b1ee65fd75.zip fsf-binutils-gdb-e29de63f0d160268850d79fa29b6c0b1ee65fd75.tar.gz fsf-binutils-gdb-e29de63f0d160268850d79fa29b6c0b1ee65fd75.tar.bz2 |
lang_size_relro_segment tidy
This function has seen too many minimal change style edits.
No functional changes in this patch.
* ldlang.c (lang_size_relro_segment): Tidy.
Diffstat (limited to 'ld')
-rw-r--r-- | ld/ldlang.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/ld/ldlang.c b/ld/ldlang.c index 499a9c7..93fcfc4 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -6465,36 +6465,24 @@ static bool lang_size_relro_segment (bool *relax, bool check_regions) { bool do_reset = false; - bool do_data_relro; - bfd_vma data_initial_base, data_relro_end; if (link_info.relro && expld.dataseg.relro_end) { - do_data_relro = true; - data_initial_base = expld.dataseg.base; - data_relro_end = lang_size_relro_segment_1 (&expld.dataseg); - } - else - { - do_data_relro = false; - data_initial_base = data_relro_end = 0; - } + bfd_vma data_initial_base = expld.dataseg.base; + bfd_vma data_relro_end = lang_size_relro_segment_1 (&expld.dataseg); - if (do_data_relro) - { lang_reset_memory_regions (); one_lang_size_sections_pass (relax, check_regions); /* Assignments to dot, or to output section address in a user script have increased padding over the original. Revert. */ - if (do_data_relro && expld.dataseg.relro_end > data_relro_end) + if (expld.dataseg.relro_end > data_relro_end) { expld.dataseg.base = data_initial_base;; do_reset = true; } } - - if (!do_data_relro && lang_size_segment (&expld.dataseg)) + else if (lang_size_segment (&expld.dataseg)) do_reset = true; return do_reset; |