diff options
| author | Felipe Sateler <fsateler@debian.org> | 2020-08-29 11:59:01 -0400 |
|---|---|---|
| committer | Felipe Sateler <fsateler@debian.org> | 2020-08-29 11:59:01 -0400 |
| commit | cc7a9d85717d843ac164cacae9d154087fe128cc (patch) | |
| tree | daf22ee5dfd7ec37ef9a2629f3faa7c348f9fd43 /debian | |
| parent | a7c158fcd684c7dcfdf2d83c98f590fb68208d04 (diff) | |
Refresh patches for new release
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/Adjust-DT_MIPS_RLD_MAP_REL-dynamic-section-entry-if-prese.patch | 8 | ||||
| -rw-r--r-- | debian/patches/Adjust-PT_MIPS_ABIFLAGS-segment-if-present.patch | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/Adjust-DT_MIPS_RLD_MAP_REL-dynamic-section-entry-if-prese.patch b/debian/patches/Adjust-DT_MIPS_RLD_MAP_REL-dynamic-section-entry-if-prese.patch index ffee4b9..f63f702 100644 --- a/debian/patches/Adjust-DT_MIPS_RLD_MAP_REL-dynamic-section-entry-if-prese.patch +++ b/debian/patches/Adjust-DT_MIPS_RLD_MAP_REL-dynamic-section-entry-if-prese.patch @@ -50,12 +50,12 @@ index 87cb141..e4e167c 100644 /* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */ diff --git a/src/patchelf.cc b/src/patchelf.cc -index 965686a..d8ea097 100644 +index 05ec793..18e1f83 100644 --- a/src/patchelf.cc +++ b/src/patchelf.cc -@@ -949,9 +949,9 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) +@@ -1078,9 +1078,9 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) (e.g., those produced by klibc's klcc). */ - Elf_Shdr * shdrDynamic = findSection2(".dynamic"); + auto shdrDynamic = findSection2(".dynamic"); if (shdrDynamic) { - Elf_Dyn * dyn = (Elf_Dyn *) (contents + rdi(shdrDynamic->sh_offset)); + Elf_Dyn * dyn_table = (Elf_Dyn *) (contents + rdi(shdrDynamic->sh_offset)); @@ -65,7 +65,7 @@ index 965686a..d8ea097 100644 if (d_tag == DT_STRTAB) dyn->d_un.d_ptr = findSection(".dynstr").sh_addr; else if (d_tag == DT_STRSZ) -@@ -990,6 +990,14 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) +@@ -1119,6 +1119,14 @@ void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) dyn->d_un.d_ptr = findSection(".gnu.version_r").sh_addr; else if (d_tag == DT_VERSYM) dyn->d_un.d_ptr = findSection(".gnu.version").sh_addr; diff --git a/debian/patches/Adjust-PT_MIPS_ABIFLAGS-segment-if-present.patch b/debian/patches/Adjust-PT_MIPS_ABIFLAGS-segment-if-present.patch index 7cdf2c1..ed33108 100644 --- a/debian/patches/Adjust-PT_MIPS_ABIFLAGS-segment-if-present.patch +++ b/debian/patches/Adjust-PT_MIPS_ABIFLAGS-segment-if-present.patch @@ -36,14 +36,14 @@ index e4e167c..a92289d 100644 /* Special program header types. */ diff --git a/src/patchelf.cc b/src/patchelf.cc -index d8ea097..fecfc90 100644 +index 18e1f83..31013a4 100644 --- a/src/patchelf.cc +++ b/src/patchelf.cc -@@ -687,6 +687,17 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff, +@@ -742,6 +742,17 @@ void ElfFile<ElfFileParamNames>::writeReplacedSections(Elf_Off & curOff, } } -+ /* If there is .MIPS.abiflags section, then the PT_MIPS_ABIFLAGS ++ /* If there is .MIPS.abiflags section, then the PT_MIPS_ABIFLAGS + segment must be sync'ed with it. */ + if (sectionName == ".MIPS.abiflags") { + for (unsigned int j = 0; j < phdrs.size(); ++j) |