Merge remote-tracking branch 'stable/linux-5.4.y' into rpi-5.4.y
This commit is contained in:
@@ -434,6 +434,11 @@ static int arm_is_fake_mcount(Elf32_Rel const *rp)
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int arm64_is_fake_mcount(Elf64_Rel const *rp)
|
||||
{
|
||||
return ELF64_R_TYPE(w(rp->r_info)) != R_AARCH64_CALL26;
|
||||
}
|
||||
|
||||
/* 64-bit EM_MIPS has weird ELF64_Rela.r_info.
|
||||
* http://techpubs.sgi.com/library/manuals/4000/007-4658-001/pdf/007-4658-001.pdf
|
||||
* We interpret Table 29 Relocation Operation (Elf64_Rel, Elf64_Rela) [p.40]
|
||||
@@ -547,6 +552,7 @@ static int do_file(char const *const fname)
|
||||
make_nop = make_nop_arm64;
|
||||
rel_type_nop = R_AARCH64_NONE;
|
||||
ideal_nop = ideal_nop4_arm64;
|
||||
is_fake_mcount64 = arm64_is_fake_mcount;
|
||||
break;
|
||||
case EM_IA_64: reltype = R_IA64_IMM64; break;
|
||||
case EM_MIPS: /* reltype: e_class */ break;
|
||||
|
||||
Reference in New Issue
Block a user