Remove TargetOptions.h dependency from ARMSubtarget.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133738 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng 2011-06-23 18:15:17 +00:00
parent d8149c1bef
commit df214fa517
2 changed files with 4 additions and 5 deletions

View File

@ -15,7 +15,6 @@
#include "ARMGenSubtarget.inc" #include "ARMGenSubtarget.inc"
#include "ARMBaseRegisterInfo.h" #include "ARMBaseRegisterInfo.h"
#include "llvm/GlobalValue.h" #include "llvm/GlobalValue.h"
#include "llvm/Target/TargetOptions.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
using namespace llvm; using namespace llvm;
@ -60,10 +59,6 @@ ARMSubtarget::ARMSubtarget(const std::string &TT, const std::string &FS,
, CPUString("generic") , CPUString("generic")
, TargetTriple(TT) , TargetTriple(TT)
, TargetABI(ARM_ABI_APCS) { , TargetABI(ARM_ABI_APCS) {
// Default to soft float ABI
if (FloatABIType == FloatABI::Default)
FloatABIType = FloatABI::Soft;
// Determine default and user specified characteristics // Determine default and user specified characteristics
// When no arch is specified either by CPU or by attributes, make the default // When no arch is specified either by CPU or by attributes, make the default

View File

@ -85,6 +85,10 @@ ARMBaseTargetMachine::ARMBaseTargetMachine(const Target &T,
JITInfo(), JITInfo(),
InstrItins(Subtarget.getInstrItineraryData()) { InstrItins(Subtarget.getInstrItineraryData()) {
DefRelocModel = getRelocationModel(); DefRelocModel = getRelocationModel();
// Default to soft float ABI
if (FloatABIType == FloatABI::Default)
FloatABIType = FloatABI::Soft;
} }
ARMTargetMachine::ARMTargetMachine(const Target &T, const std::string &TT, ARMTargetMachine::ARMTargetMachine(const Target &T, const std::string &TT,