Thumb2 only force the fixup thumb bit for data relocations.

rdar://10493453

llvm-svn: 145318
This commit is contained in:
Jim Grosbach 2011-11-28 23:39:00 +00:00
parent bc47555417
commit ea721eb4b3

View File

@ -273,13 +273,17 @@ bool MCAssembler::EvaluateFixup(const MCAsmLayout &Layout,
Value = Target.getConstant();
bool IsThumb = false;
bool SetThumbBit = false;
if (const MCSymbolRefExpr *A = Target.getSymA()) {
const MCSymbol &Sym = A->getSymbol().AliasedSymbol();
if (Sym.isDefined())
Value += Layout.getSymbolOffset(&getSymbolData(Sym));
if (isThumbFunc(&Sym))
IsThumb = true;
// ARM data fixups based from a thumb function address need to have the low
// bit set. The actual value is always at least 16-bit aligned, so the
// low bit is normally clear and available for use as an ISA flag for
// interworking.
if (Fixup.getKind() == FK_Data_4 && isThumbFunc(&Sym))
SetThumbBit = true;
}
if (const MCSymbolRefExpr *B = Target.getSymB()) {
const MCSymbol &Sym = B->getSymbol().AliasedSymbol();
@ -302,11 +306,7 @@ bool MCAssembler::EvaluateFixup(const MCAsmLayout &Layout,
Value -= Offset;
}
// ARM fixups based from a thumb function address need to have the low
// bit set. The actual value is always at least 16-bit aligned, so the
// low bit is normally clear and available for use as an ISA flag for
// interworking.
if (IsThumb)
if (SetThumbBit)
Value |= 1;
return IsResolved;