summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2015-01-14 00:50:32 +0000
committerEric Christopher <echristo@gmail.com>2015-01-14 00:50:32 +0000
commit2b8ef99aa8c14c848126cc204bc9248e75d94cc4 (patch)
treea5a9533a657ce2d39e057cbbd6cd4598d59249bd /clang/lib
parent6e30cd95cbde1f8c78a581da36d6fe318112200b (diff)
downloadbcm5719-llvm-2b8ef99aa8c14c848126cc204bc9248e75d94cc4.tar.gz
bcm5719-llvm-2b8ef99aa8c14c848126cc204bc9248e75d94cc4.zip
Update for move in llvm.
llvm-svn: 225892
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/CodeGen/BackendUtil.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index e1267192a74..25ecec58624 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -516,7 +516,6 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) {
Options.StackAlignmentOverride = CodeGenOpts.StackAlignment;
Options.DisableTailCalls = CodeGenOpts.DisableTailCalls;
Options.TrapFuncName = CodeGenOpts.TrapFuncName;
- Options.ABIName = TargetOpts.ABI;
Options.PositionIndependentExecutable = LangOpts.PIELevel != 0;
Options.FunctionSections = CodeGenOpts.FunctionSections;
Options.DataSections = CodeGenOpts.DataSections;
@@ -527,6 +526,7 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) {
Options.MCOptions.MCNoExecStack = CodeGenOpts.NoExecStack;
Options.MCOptions.MCFatalWarnings = CodeGenOpts.FatalWarnings;
Options.MCOptions.AsmVerbose = CodeGenOpts.AsmVerbose;
+ Options.MCOptions.ABIName = TargetOpts.ABI;
TargetMachine *TM = TheTarget->createTargetMachine(Triple, TargetOpts.CPU,
FeaturesStr, Options,
OpenPOWER on IntegriCloud