maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

X86: Form IMGREL relocations for LLVM Functions 

We supported forming IMGREL relocations from ConstantExprs involving
__ImageBase if the minuend was a GlobalVariable.  Extend this
functionality to all GlobalObjects.

llvm-svn: 231456
This commit is contained in:
David Majnemer 2015-03-06 08:11:32 +00:00
parent 322bdad085
commit b61f4e403d
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Target/X86/X86TargetObjectFile.cpp
View File

@ -96,14 +96,12 @@ const MCExpr *X86WindowsTargetObjectFile::getExecutableRelativeSymbol(
SubRHS->getPointerAddressSpace() != 0)
return nullptr;
// Both ptrtoint instructions must wrap global variables:
// Both ptrtoint instructions must wrap global objects:
// - Only global variables are eligible for image relative relocations.
// - The subtrahend refers to the special symbol __ImageBase, a global.
const GlobalVariable *GVLHS =
dyn_cast<GlobalVariable>(SubLHS->getPointerOperand());
const GlobalVariable *GVRHS =
dyn_cast<GlobalVariable>(SubRHS->getPointerOperand());
if (!GVLHS || !GVRHS)
// - The subtrahend refers to the special symbol __ImageBase, a GlobalVariable.
const auto *GOLHS = dyn_cast<GlobalObject>(SubLHS->getPointerOperand());
const auto *GVRHS = dyn_cast<GlobalVariable>(SubRHS->getPointerOperand());
if (!GOLHS || !GVRHS)
return nullptr;
// We expect __ImageBase to be a global variable without a section, externally
@ -116,10 +114,10 @@ const MCExpr *X86WindowsTargetObjectFile::getExecutableRelativeSymbol(
return nullptr;
// An image-relative, thread-local, symbol makes no sense.
if (GVLHS->isThreadLocal())
if (GOLHS->isThreadLocal())
return nullptr;
return MCSymbolRefExpr::Create(TM.getSymbol(GVLHS, Mang),
return MCSymbolRefExpr::Create(TM.getSymbol(GOLHS, Mang),
MCSymbolRefExpr::VK_COFF_IMGREL32,
getContext());
}

5
llvm/test/MC/COFF/ir-to-imgrel.ll
View File

@ -4,3 +4,8 @@
; X64: .quad "?x@@3HA"@IMGREL
@"\01?x@@3HA" = global i64 sub nsw (i64 ptrtoint (i64* @"\01?x@@3HA" to i64), i64 ptrtoint (i8* @__ImageBase to i64)), align 8
declare void @f()
; X64: .quad f@IMGREL
@fp = global i64 sub nsw (i64 ptrtoint (void ()* @f to i64), i64 ptrtoint (i8* @__ImageBase to i64)), align 8