darlinghq/darling-gdb
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-gdb.git synced 2025-01-05 19:29:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug with grouping sections.

Browse Source 
The fix for PR 15370 did not correctly check all patterns in a group,
but instead threw all unassigned sections into the group. This patch
fixes that.

2016-06-23  Cary Coutant  <ccoutant@gmail.com>
	    Igor Kudrin  <ikudrin@accesssoftek.com>

gold/
	PR gold/15370
	* script-sections.cc
	(Output_section_element_input::set_section_addresses): Keep bin_count
	separate from input_pattern_count.
	* testsuite/script_test_12.t: Add another section .x4.
	* testsuite/script_test_12i.t: Likewise.
	* testsuite/script_test_12a.c: Likewise.
	* testsuite/script_test_12b.c: Likewise.
This commit is contained in:
Cary Coutant 2016-06-23 09:45:25 -07:00
parent 2ec060b71c
commit 3ca25b560a
6 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gold/ChangeLog
View File

@ -1,3 +1,15 @@
2016-06-23 Cary Coutant <ccoutant@gmail.com>
Igor Kudrin <ikudrin@accesssoftek.com>
PR gold/15370
* script-sections.cc
(Output_section_element_input::set_section_addresses): Keep bin_count
separate from input_pattern_count.
* testsuite/script_test_12.t: Add another section .x4.
* testsuite/script_test_12i.t: Likewise.
* testsuite/script_test_12a.c: Likewise.
* testsuite/script_test_12b.c: Likewise.
2016-06-23 Igor Kudrin <ikudrin@accesssoftek.com>
* gold-threads.cc (impl_threads::Lock_impl_threads): Fix typos.

13
gold/script-sections.cc
View File

@ -1595,6 +1595,7 @@ Output_section_element_input::set_section_addresses(
typedef std::vector<std::vector<Input_section_info> > Matching_sections;
size_t input_pattern_count = this->input_section_patterns_.size();
size_t bin_count = 1;
bool any_patterns_with_sort = false;
for (size_t i = 0; i < input_pattern_count; ++i)
{
@ -1602,9 +1603,9 @@ Output_section_element_input::set_section_addresses(
if (isp.sort != SORT_WILDCARD_NONE)
any_patterns_with_sort = true;
}
if (input_pattern_count == 0 || !any_patterns_with_sort)
input_pattern_count = 1;
Matching_sections matching_sections(input_pattern_count);
if (any_patterns_with_sort)
bin_count = input_pattern_count;
Matching_sections matching_sections(bin_count);
// Look through the list of sections for this output section. Add
// each one which matches to one of the elements of
@ -1661,11 +1662,11 @@ Output_section_element_input::set_section_addresses(
break;
}
if (i >= this->input_section_patterns_.size())
if (i >= input_pattern_count)
++p;
else
{
if (!any_patterns_with_sort)
if (i >= bin_count)
i = 0;
matching_sections[i].push_back(isi);
p = input_sections->erase(p);
@ -1679,7 +1680,7 @@ Output_section_element_input::set_section_addresses(
// output section.
uint64_t dot = *dot_value;
for (size_t i = 0; i < input_pattern_count; ++i)
for (size_t i = 0; i < bin_count; ++i)
{
if (matching_sections[i].empty())
continue;

1
gold/testsuite/script_test_12.t
View File

@ -57,6 +57,7 @@ SECTIONS
test_array_start = .;
*(.x1 .x2 .x3);
test_array_end = .;
*(.x4);
}
.bss : { *(.bss) }

1
gold/testsuite/script_test_12a.c
View File

@ -73,3 +73,4 @@ main(void)
int a1[] __attribute((section(".x1"))) = { 0x01, 0x02, 0x03, 0x04 };
int a2[] __attribute((section(".x2"))) = { 0x11, 0x12, 0x13, 0x14};
int a3[] __attribute((section(".x3"))) = { 0x21, 0x22, 0x23, 0x24 };
int a4[] __attribute((section(".x4"))) = { 0xff, 0xff, 0xff, 0xff };

1
gold/testsuite/script_test_12b.c
View File

@ -1,3 +1,4 @@
int b1[] __attribute((section(".x1"))) = { 0x85, 0x86, 0x87, 0x88 };
int b2[] __attribute((section(".x2"))) = { 0x95, 0x96, 0x97, 0x98 };
int b3[] __attribute((section(".x3"))) = { 0xa5, 0xa6, 0xa7, 0xa8 };
int b4[] __attribute((section(".x4"))) = { 0xff, 0xff, 0xff, 0xff };

1
gold/testsuite/script_test_12i.t
View File

@ -57,6 +57,7 @@ SECTIONS
test_array_start = .;
*(.x1) *(.x2) *(.x3)
test_array_end = .;
*(.x4);
}
.bss : { *(.bss) }