Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
devel/binutils: Revert "devel/binutils: Update to 2.41"
This was an accidental misoperation of git. This reverts commit 1421177.
- Loading branch information
1 parent
aebef91
commit a52cf54
Showing
5 changed files
with
60 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1690831336 | ||
| SHA256 (binutils-2.41.tar.lz) = eab3444055882ed5eb04e2743d03f0c0e1bc950197a4ddd31898cd5a2843d065 | ||
| SIZE (binutils-2.41.tar.lz) = 26307264 | ||
| TIMESTAMP = 1673799644 | ||
| SHA256 (binutils-2.40.tar.lz) = 48e65ecee1bbcf334d7efb4ea8487fe048dea522e5da3bdf7fa42b1ec779ea33 | ||
| SIZE (binutils-2.40.tar.lz) = 24784952 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- bfd/elf.c.orig 2023-01-14 00:00:00 UTC | ||
| +++ bfd/elf.c | ||
| @@ -3870,21 +3870,23 @@ assign_section_numbers (bfd *abfd, struct bfd_link_inf | ||
| { | ||
| case SHT_REL: | ||
| case SHT_RELA: | ||
| - /* A reloc section which we are treating as a normal BFD | ||
| - section. sh_link is the section index of the symbol | ||
| - table. sh_info is the section index of the section to | ||
| - which the relocation entries apply. We assume that an | ||
| - allocated reloc section uses the dynamic symbol table | ||
| - if there is one. Otherwise we guess the normal symbol | ||
| - table. FIXME: How can we be sure? */ | ||
| - if (d->this_hdr.sh_link == 0 && (sec->flags & SEC_ALLOC) != 0) | ||
| + /* sh_link is the section index of the symbol table. | ||
| + sh_info is the section index of the section to which the | ||
| + relocation entries apply. */ | ||
| + if (d->this_hdr.sh_link == 0) | ||
| { | ||
| - s = bfd_get_section_by_name (abfd, ".dynsym"); | ||
| - if (s != NULL) | ||
| - d->this_hdr.sh_link = elf_section_data (s)->this_idx; | ||
| + /* FIXME maybe: If this is a reloc section which we are | ||
| + treating as a normal section then we likely should | ||
| + not be assuming its sh_link is .dynsym or .symtab. */ | ||
| + if ((sec->flags & SEC_ALLOC) != 0) | ||
| + { | ||
| + s = bfd_get_section_by_name (abfd, ".dynsym"); | ||
| + if (s != NULL) | ||
| + d->this_hdr.sh_link = elf_section_data (s)->this_idx; | ||
| + } | ||
| + else | ||
| + d->this_hdr.sh_link = elf_onesymtab (abfd); | ||
| } | ||
| - if (d->this_hdr.sh_link == 0) | ||
| - d->this_hdr.sh_link = elf_onesymtab (abfd); | ||
|
|
||
| s = elf_get_reloc_section (sec); | ||
| if (s != NULL) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- ld/ldlang.c.orig 2023-01-13 16:00:00.000000000 -0800 | ||
| +++ ld/ldlang.c 2023-05-13 21:48:06.006092000 -0700 | ||
| @@ -649,7 +649,8 @@ | ||
| looking at the sections for this file. */ | ||
|
|
||
| /* Find the correct node to append this section. */ | ||
| - if (compare_section (sec->spec.sorted, section, (*tree)->section) < 0) | ||
| + if (sec && sec->spec.sorted != none && sec->spec.sorted != by_none | ||
| + && compare_section (sec->spec.sorted, section, (*tree)->section) < 0) | ||
| tree = &((*tree)->left); | ||
| else | ||
| tree = &((*tree)->right); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters