diff options
| author | Eric Christopher <echristo@gmail.com> | 2015-01-14 00:50:31 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2015-01-14 00:50:31 +0000 |
| commit | 6e30cd95cbde1f8c78a581da36d6fe318112200b (patch) | |
| tree | af19578f2b86cc370f07f5bd2bbace5508f84be0 /llvm/lib/Target/ARM/ARMTargetMachine.cpp | |
| parent | bc301a8ed4ce5ef4e69590c595bfc777cfbdafdf (diff) | |
| download | llvm-6e30cd95cbde1f8c78a581da36d6fe318112200b.zip llvm-6e30cd95cbde1f8c78a581da36d6fe318112200b.tar.gz llvm-6e30cd95cbde1f8c78a581da36d6fe318112200b.tar.bz2 | |
Migrate ABIName to MCTargetOptions so that it can be shared between
the TargetMachine level and the MC level.
llvm-svn: 225891
Diffstat (limited to 'llvm/lib/Target/ARM/ARMTargetMachine.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMTargetMachine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index d0a768a..21b1d460 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -55,12 +55,13 @@ static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) { static ARMBaseTargetMachine::ARMABI computeTargetABI(const Triple &TT, StringRef CPU, const TargetOptions &Options) { - if (Options.getABIName().startswith("aapcs")) + if (Options.MCOptions.getABIName().startswith("aapcs")) return ARMBaseTargetMachine::ARM_ABI_AAPCS; - else if (Options.getABIName().startswith("apcs")) + else if (Options.MCOptions.getABIName().startswith("apcs")) return ARMBaseTargetMachine::ARM_ABI_APCS; - assert(Options.getABIName().empty() && "Unknown target-abi option!"); + assert(Options.MCOptions.getABIName().empty() && + "Unknown target-abi option!"); ARMBaseTargetMachine::ARMABI TargetABI = ARMBaseTargetMachine::ARM_ABI_UNKNOWN; |