Attachment #855328 for bug #860888

View | Details | Raw Unified | Return to bug 860888
Collapse All | Expand All




                // some binaries might this section stripped
                // in which case we just ignore the value.
                if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr;
            #ifdef __GLIBC__
            } else if (d_tag == DT_MIPS_XHASH) {
                // the .MIPS.xhash section was added to the glibc-ABI
                // in commit 23c1c256ae7b0f010d0fcaff60682b620887b164
                dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr;
            #endif
            } else if (d_tag == DT_JMPREL) {
                auto shdr = tryFindSectionHeader(".rel.plt");
                if (!shdr) shdr = tryFindSectionHeader(".rela.plt");

Return to bug 860888

Lines 1184-1193 void ElfFile<ElfFileParamNames>::rewriteHeaders(Elf_Addr phdrAddress) Link Here

(-)a/src/patchelf.cc (+2 lines)
1184	// some binaries might this section stripped	1184	// some binaries might this section stripped
1185	// in which case we just ignore the value.	1185	// in which case we just ignore the value.
1186	if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr;	1186	if (shdr) dyn->d_un.d_ptr = (*shdr).get().sh_addr;
		1187	#ifdef __GLIBC__
1187	} else if (d_tag == DT_MIPS_XHASH) {	1188	} else if (d_tag == DT_MIPS_XHASH) {
1188	// the .MIPS.xhash section was added to the glibc-ABI	1189	// the .MIPS.xhash section was added to the glibc-ABI
1189	// in commit 23c1c256ae7b0f010d0fcaff60682b620887b164	1190	// in commit 23c1c256ae7b0f010d0fcaff60682b620887b164
1190	dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr;	1191	dyn->d_un.d_ptr = findSectionHeader(".MIPS.xhash").sh_addr;
		1192	#endif
1191	} else if (d_tag == DT_JMPREL) {	1193	} else if (d_tag == DT_JMPREL) {
1192	auto shdr = tryFindSectionHeader(".rel.plt");	1194	auto shdr = tryFindSectionHeader(".rel.plt");
1193	if (!shdr) shdr = tryFindSectionHeader(".rela.plt");	1195	if (!shdr) shdr = tryFindSectionHeader(".rela.plt");