From 5fa5f8f5fe494ba4fe98c11899a5464cd164ec75 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 18 Sep 2019 13:23:34 +0200 Subject: [PATCH] Introduce new .text.sorted.* sections. gold/ChangeLog: 2019-11-26 Martin Liska * layout.cc (Layout::special_ordering_of_input_section): Add ".text.sorted". * output.cc: Special case ".text.sorted". * testsuite/section_sorting_name.cc: Cover also .text.sorted subsections. * testsuite/section_sorting_name.sh: Likewise. ld/ChangeLog: 2019-11-26 Martin Liska * scripttempl/arclinux.sc: Add .text.sorted.* which is sorted by default. * scripttempl/elf.sc: Likewise. * scripttempl/elf64bpf.sc: Likewise. * scripttempl/nds32elf.sc: Likewise. * testsuite/ld-arm/arm-no-rel-plt.ld: Expect .text.sorted.* in the default linker script. * testsuite/ld-arm/fdpic-main.ld: Likewise. * testsuite/ld-arm/fdpic-shared.ld: Likewise. --- gold/ChangeLog | 9 ++++++ gold/layout.cc | 3 +- gold/output.cc | 8 +++-- gold/testsuite/section_sorting_name.cc | 43 ++++++++++++++++++++++++++ gold/testsuite/section_sorting_name.sh | 6 ++++ ld/ChangeLog | 12 +++++++ ld/scripttempl/arclinux.sc | 1 + ld/scripttempl/elf.sc | 1 + ld/scripttempl/elf64bpf.sc | 1 + ld/scripttempl/nds32elf.sc | 1 + ld/testsuite/ld-arm/arm-no-rel-plt.ld | 1 + ld/testsuite/ld-arm/fdpic-main.ld | 1 + ld/testsuite/ld-arm/fdpic-shared.ld | 1 + 13 files changed, 85 insertions(+), 3 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 9d71814ae31..3dc2ce81b72 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,12 @@ +2019-11-26 Martin Liska + + * layout.cc (Layout::special_ordering_of_input_section): + Add ".text.sorted". + * output.cc: Special case ".text.sorted". + * testsuite/section_sorting_name.cc: Cover also .text.sorted + subsections. + * testsuite/section_sorting_name.sh: Likewise. + 2019-11-19 Alan Modra PR 24853 diff --git a/gold/layout.cc b/gold/layout.cc index 194d088c2a1..4a6a7f69dd5 100644 --- a/gold/layout.cc +++ b/gold/layout.cc @@ -1129,7 +1129,8 @@ Layout::special_ordering_of_input_section(const char* name) ".text.unlikely", ".text.exit", ".text.startup", - ".text.hot" + ".text.hot", + ".text.sorted" }; for (size_t i = 0; diff --git a/gold/output.cc b/gold/output.cc index df80587e666..428a880b147 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -3547,8 +3547,10 @@ Output_section::Input_section_sort_section_prefix_special_ordering_compare const Output_section::Input_section_sort_entry& s2) const { // Some input section names have special ordering requirements. - int o1 = Layout::special_ordering_of_input_section(s1.section_name().c_str()); - int o2 = Layout::special_ordering_of_input_section(s2.section_name().c_str()); + const char *s1_section_name = s1.section_name().c_str(); + const char *s2_section_name = s2.section_name().c_str(); + int o1 = Layout::special_ordering_of_input_section(s1_section_name); + int o2 = Layout::special_ordering_of_input_section(s2_section_name); if (o1 != o2) { if (o1 < 0) @@ -3558,6 +3560,8 @@ Output_section::Input_section_sort_section_prefix_special_ordering_compare else return o1 < o2; } + else if (is_prefix_of(".text.sorted", s1_section_name)) + return strcmp(s1_section_name, s2_section_name) <= 0; // Keep input order otherwise. return s1.index() < s2.index(); diff --git a/gold/testsuite/section_sorting_name.cc b/gold/testsuite/section_sorting_name.cc index 3a1d9baac3c..8270b400aa8 100644 --- a/gold/testsuite/section_sorting_name.cc +++ b/gold/testsuite/section_sorting_name.cc @@ -50,6 +50,49 @@ int hot_foo_0002() return 1; } +extern "C" +__attribute__ ((section(".text.sorted.0002"))) +int sorted_foo_0002() +{ + return 1; +} + +extern "C" +__attribute__ ((section(".text.sorted.0001.abc"))) +int sorted_foo_0001_abc() +{ + return 1; +} + + +extern "C" +__attribute__ ((section(".text.sorted.0001"))) +int sorted_foo_0001() +{ + return 1; +} + +extern "C" +__attribute__ ((section(".text.sorted.0003"))) +int sorted_foo_0003() +{ + return 1; +} + +extern "C" +__attribute__ ((section(".text.sorted.z"))) +int sorted_foo_z() +{ + return 1; +} + +extern "C" +__attribute__ ((section(".text.sorted.y"))) +int sorted_foo_y() +{ + return 1; +} + int vdata_0002 __attribute__((section(".data.0002"))) = 2; int vbss_0002 __attribute__((section(".bss.0002"))) = 0; diff --git a/gold/testsuite/section_sorting_name.sh b/gold/testsuite/section_sorting_name.sh index ae44570f7f4..00ad7cc20a6 100755 --- a/gold/testsuite/section_sorting_name.sh +++ b/gold/testsuite/section_sorting_name.sh @@ -59,6 +59,12 @@ END { check section_sorting_name.stdout "hot_foo_0001" "hot_foo_0002" check section_sorting_name.stdout "hot_foo_0002" "hot_foo_0003" +check section_sorting_name.stdout "sorted_foo_0001" "sorted_foo_0001_abc" +check section_sorting_name.stdout "sorted_foo_0001_abc" "sorted_foo_0002" +check section_sorting_name.stdout "sorted_foo_0002" "sorted_foo_0003" +check section_sorting_name.stdout "sorted_foo_0003" "sorted_foo_y" +check section_sorting_name.stdout "sorted_foo_y" "sorted_foo_z" + check section_sorting_name.stdout "vdata_0001" "vdata_0002" check section_sorting_name.stdout "vdata_0002" "vdata_0003" diff --git a/ld/ChangeLog b/ld/ChangeLog index 029de5f0b95..969ab780352 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,15 @@ +2019-11-26 Martin Liska + + * scripttempl/arclinux.sc: Add .text.sorted.* which is sorted + by default. + * scripttempl/elf.sc: Likewise. + * scripttempl/elf64bpf.sc: Likewise. + * scripttempl/nds32elf.sc: Likewise. + * testsuite/ld-arm/arm-no-rel-plt.ld: Expect .text.sorted.* + in the default linker script. + * testsuite/ld-arm/fdpic-main.ld: Likewise. + * testsuite/ld-arm/fdpic-shared.ld: Likewise. + 2019-11-25 Alan Modra * ldexp.c (fold_name): Pass section to bfd_octets_per_byte. diff --git a/ld/scripttempl/arclinux.sc b/ld/scripttempl/arclinux.sc index e13969ede07..41e8ccdf1b2 100644 --- a/ld/scripttempl/arclinux.sc +++ b/ld/scripttempl/arclinux.sc @@ -491,6 +491,7 @@ cat <