forked from OSchip/llvm-project
Remove the default ARMSubtarget from the ARM TargetMachine.
This enables us to ensure better LTO and code generation in the face of module linking. Remove a report_fatal_error from the TargetMachine and replace it with an assert in ARMSubtarget - and remove the test that depended on the error. The assertion will still fire in the case that we were reporting before, but error reporting needs to be in front end tools if possible for options parsing. llvm-svn: 306939
This commit is contained in:
parent
9282f1aece
commit
3df231a1f7
|
@ -144,6 +144,9 @@ ARMSubtarget::ARMSubtarget(const Triple &TT, const std::string &CPU,
|
|||
? (ARMBaseInstrInfo *)new ARMInstrInfo(*this)
|
||||
: (ARMBaseInstrInfo *)new Thumb2InstrInfo(*this)),
|
||||
TLInfo(TM, *this) {
|
||||
assert((isThumb() || hasARMOps()) &&
|
||||
"Target must either be thumb or support ARM operations!");
|
||||
|
||||
#ifndef LLVM_BUILD_GLOBAL_ISEL
|
||||
GISelAccessor *GISel = new GISelAccessor();
|
||||
#else
|
||||
|
|
|
@ -202,28 +202,35 @@ ARMBaseTargetMachine::ARMBaseTargetMachine(const Target &T, const Triple &TT,
|
|||
CPU, FS, Options, getEffectiveRelocModel(TT, RM), CM,
|
||||
OL),
|
||||
TargetABI(computeTargetABI(TT, CPU, Options)),
|
||||
TLOF(createTLOF(getTargetTriple())),
|
||||
Subtarget(TT, CPU, FS, *this, isLittle), isLittle(isLittle) {
|
||||
TLOF(createTLOF(getTargetTriple())), isLittle(isLittle) {
|
||||
|
||||
// Default to triple-appropriate float ABI
|
||||
if (Options.FloatABIType == FloatABI::Default)
|
||||
this->Options.FloatABIType =
|
||||
Subtarget.isTargetHardFloat() ? FloatABI::Hard : FloatABI::Soft;
|
||||
if (Options.FloatABIType == FloatABI::Default) {
|
||||
if (TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
|
||||
TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
|
||||
TargetTriple.getEnvironment() == Triple::EABIHF ||
|
||||
TargetTriple.isOSWindows() ||
|
||||
TargetABI == ARMBaseTargetMachine::ARM_ABI_AAPCS16)
|
||||
this->Options.FloatABIType = FloatABI::Hard;
|
||||
else
|
||||
this->Options.FloatABIType = FloatABI::Soft;
|
||||
}
|
||||
|
||||
// Default to triple-appropriate EABI
|
||||
if (Options.EABIVersion == EABI::Default ||
|
||||
Options.EABIVersion == EABI::Unknown) {
|
||||
// musl is compatible with glibc with regard to EABI version
|
||||
if (Subtarget.isTargetGNUAEABI() || Subtarget.isTargetMuslAEABI())
|
||||
if ((TargetTriple.getEnvironment() == Triple::GNUEABI ||
|
||||
TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
|
||||
TargetTriple.getEnvironment() == Triple::MuslEABI ||
|
||||
TargetTriple.getEnvironment() == Triple::MuslEABIHF) &&
|
||||
!(TargetTriple.isOSWindows() || TargetTriple.isOSDarwin()))
|
||||
this->Options.EABIVersion = EABI::GNU;
|
||||
else
|
||||
this->Options.EABIVersion = EABI::EABI5;
|
||||
}
|
||||
|
||||
initAsmInfo();
|
||||
if (!Subtarget.isThumb() && !Subtarget.hasARMOps())
|
||||
report_fatal_error("CPU: '" + Subtarget.getCPUString() + "' does not "
|
||||
"support ARM mode execution!");
|
||||
}
|
||||
|
||||
ARMBaseTargetMachine::~ARMBaseTargetMachine() = default;
|
||||
|
|
|
@ -36,7 +36,6 @@ public:
|
|||
|
||||
protected:
|
||||
std::unique_ptr<TargetLoweringObjectFile> TLOF;
|
||||
ARMSubtarget Subtarget;
|
||||
bool isLittle;
|
||||
mutable StringMap<std::unique_ptr<ARMSubtarget>> SubtargetMap;
|
||||
|
||||
|
@ -47,8 +46,8 @@ public:
|
|||
CodeGenOpt::Level OL, bool isLittle);
|
||||
~ARMBaseTargetMachine() override;
|
||||
|
||||
const ARMSubtarget *getSubtargetImpl() const { return &Subtarget; }
|
||||
const ARMSubtarget *getSubtargetImpl(const Function &F) const override;
|
||||
const ARMSubtarget *getSubtargetImpl() const = delete;
|
||||
bool isLittleEndian() const { return isLittle; }
|
||||
|
||||
/// \brief Get the TargetIRAnalysis for this target.
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
; RUN: not llc -mtriple=armv7-windows-itanium -mcpu=cortex-a9 -o /dev/null %s 2>&1 \
|
||||
; RUN: | FileCheck %s -check-prefix CHECK-WIN
|
||||
|
||||
; RUN: not llc -mtriple=armv7-windows-gnu -mcpu=cortex-a9 -o /dev/null %s 2>&1 \
|
||||
; RUN: | FileCheck %s -check-prefix CHECK-GNU
|
||||
|
||||
; CHECK-WIN: does not support ARM mode execution
|
||||
|
||||
; CHECK-GNU: does not support ARM mode execution
|
||||
|
Loading…
Reference in New Issue