D34652.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34652.diff
View Options

	diff --git a/contrib/llvm-project/lld/ELF/Relocations.cpp b/contrib/llvm-project/lld/ELF/Relocations.cpp
	--- a/contrib/llvm-project/lld/ELF/Relocations.cpp
	+++ b/contrib/llvm-project/lld/ELF/Relocations.cpp
	@@ -1966,7 +1966,8 @@
	// out in the relocation addend. We compensate for the PC bias so that
	// an Arm and Thumb relocation to the same destination get the same keyAddend,
	// which is usually 0.
	- int64_t keyAddend = rel.addend + getPCBias(rel.type);
	+ const int64_t pcBias = getPCBias(rel.type);
	+ const int64_t keyAddend = rel.addend + pcBias;

	// We use a ((section, offset), addend) pair to find the thunk position if
	// possible so that we create only one thunk for aliased symbols or ICFed
	@@ -1985,7 +1986,7 @@
	if (isThunkSectionCompatible(isec, t->getThunkTargetSym()->section) &&
	t->isCompatibleWith(*isec, rel) &&
	target->inBranchRange(rel.type, src,
	- t->getThunkTargetSym()->getVA(rel.addend)))
	+ t->getThunkTargetSym()->getVA(-pcBias)))
	return std::make_pair(t, false);

	// No existing compatible Thunk in range, create a new one