diff --git a/bolt/include/bolt/Core/Relocation.h b/bolt/include/bolt/Core/Relocation.h --- a/bolt/include/bolt/Core/Relocation.h +++ b/bolt/include/bolt/Core/Relocation.h @@ -55,7 +55,10 @@ /// Return size of this relocation. size_t getSize() const { return getSizeForType(Type); } - /// Handle special cases when relocation should not be processed by bolt + /// Skip relocations that we don't want to handle in BOLT + static bool skipRelocationType(uint64_t Type); + + /// Handle special cases when relocation should not be processed by BOLT static bool skipRelocationProcess(uint64_t Type, uint64_t Contents); // Adjust value depending on relocation type (make it PC relative or not) diff --git a/bolt/lib/Core/Relocation.cpp b/bolt/lib/Core/Relocation.cpp --- a/bolt/lib/Core/Relocation.cpp +++ b/bolt/lib/Core/Relocation.cpp @@ -165,6 +165,12 @@ } } +bool skipRelocationTypeX86(uint64_t Type) { return Type == ELF::R_X86_64_NONE; } + +bool skipRelocationTypeAArch64(uint64_t Type) { + return Type == ELF::R_AARCH64_NONE || Type == ELF::R_AARCH64_LD_PREL_LO19; +} + bool skipRelocationProcessX86(uint64_t Type, uint64_t Contents) { return false; } @@ -536,6 +542,12 @@ return getSizeForTypeX86(Type); } +bool Relocation::skipRelocationType(uint64_t Type) { + if (Arch == Triple::aarch64) + return skipRelocationTypeAArch64(Type); + return skipRelocationTypeX86(Type); +} + bool Relocation::skipRelocationProcess(uint64_t Type, uint64_t Contents) { if (Arch == Triple::aarch64) return skipRelocationProcessAArch64(Type, Contents); diff --git a/bolt/lib/Rewrite/RewriteInstance.cpp b/bolt/lib/Rewrite/RewriteInstance.cpp --- a/bolt/lib/Rewrite/RewriteInstance.cpp +++ b/bolt/lib/Rewrite/RewriteInstance.cpp @@ -2332,7 +2332,7 @@ SmallString<16> TypeName; Rel.getTypeName(TypeName); uint64_t RType = Rel.getType(); - if (Relocation::isNone(RType)) + if (Relocation::skipRelocationType(RType)) continue; // Adjust the relocation type as the linker might have skewed it.