diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2014-08-26 18:39:50 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2014-08-26 18:39:50 +0000 |
| commit | 2981591f7fa4c01b4999a40063074bcca0d7e623 (patch) | |
| tree | bfbd5cb485b9cb97b34178afa49df5d2fa33c90c | |
| parent | c540dd0daff3b3d9a393822f416f35315b45932a (diff) | |
| download | bcm5719-llvm-2981591f7fa4c01b4999a40063074bcca0d7e623.tar.gz bcm5719-llvm-2981591f7fa4c01b4999a40063074bcca0d7e623.zip | |
Convert MC command line option for fatal assembler warnings into a
proper flag.
llvm-svn: 216471
| -rw-r--r-- | llvm/include/llvm/MC/MCTargetAsmParser.h | 2 | ||||
| -rw-r--r-- | llvm/include/llvm/MC/MCTargetOptions.h | 4 | ||||
| -rw-r--r-- | llvm/lib/MC/MCParser/AsmParser.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/MC/MCTargetOptions.cpp | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/llvm/include/llvm/MC/MCTargetAsmParser.h b/llvm/include/llvm/MC/MCTargetAsmParser.h index 976ed44fde7..4197389a16e 100644 --- a/llvm/include/llvm/MC/MCTargetAsmParser.h +++ b/llvm/include/llvm/MC/MCTargetAsmParser.h @@ -114,6 +114,8 @@ public: bool isParsingInlineAsm () { return ParsingInlineAsm; } void setParsingInlineAsm (bool Value) { ParsingInlineAsm = Value; } + MCTargetOptions getTargetOptions() const { return MCOptions; } + void setSemaCallback(MCAsmParserSemaCallback *Callback) { SemaCallback = Callback; } diff --git a/llvm/include/llvm/MC/MCTargetOptions.h b/llvm/include/llvm/MC/MCTargetOptions.h index eb4348ed3ec..de79bae8259 100644 --- a/llvm/include/llvm/MC/MCTargetOptions.h +++ b/llvm/include/llvm/MC/MCTargetOptions.h @@ -24,6 +24,7 @@ public: bool MCRelaxAll : 1; bool MCNoExecStack : 1; + bool MCFatalWarnings : 1; bool MCSaveTempLabels : 1; bool MCUseDwarfDirectory : 1; bool ShowMCEncoding : 1; @@ -38,12 +39,13 @@ inline bool operator==(const MCTargetOptions &LHS, const MCTargetOptions &RHS) { return (ARE_EQUAL(SanitizeAddress) && ARE_EQUAL(MCRelaxAll) && ARE_EQUAL(MCNoExecStack) && + ARE_EQUAL(MCFatalWarnings) && ARE_EQUAL(MCSaveTempLabels) && ARE_EQUAL(MCUseDwarfDirectory) && ARE_EQUAL(ShowMCEncoding) && ARE_EQUAL(ShowMCInst) && ARE_EQUAL(AsmVerbose) && - ARE_EQUAL(DwarfVersion)); + ARE_EQUAL(DwarfVersion)); #undef ARE_EQUAL } diff --git a/llvm/lib/MC/MCParser/AsmParser.cpp b/llvm/lib/MC/MCParser/AsmParser.cpp index 5e44266e26e..bc98967eaa7 100644 --- a/llvm/lib/MC/MCParser/AsmParser.cpp +++ b/llvm/lib/MC/MCParser/AsmParser.cpp @@ -45,10 +45,6 @@ #include <vector> using namespace llvm; -static cl::opt<bool> -FatalAssemblerWarnings("fatal-assembler-warnings", - cl::desc("Consider warnings as error")); - MCAsmParserSemaCallback::~MCAsmParserSemaCallback() {} namespace { @@ -552,7 +548,7 @@ void AsmParser::Note(SMLoc L, const Twine &Msg, ArrayRef<SMRange> Ranges) { } bool AsmParser::Warning(SMLoc L, const Twine &Msg, ArrayRef<SMRange> Ranges) { - if (FatalAssemblerWarnings) + if (getTargetParser().getTargetOptions().MCFatalWarnings) return Error(L, Msg, Ranges); printMessage(L, SourceMgr::DK_Warning, Msg, Ranges); printMacroInstantiations(); diff --git a/llvm/lib/MC/MCTargetOptions.cpp b/llvm/lib/MC/MCTargetOptions.cpp index efd724a15df..3093ba2b87e 100644 --- a/llvm/lib/MC/MCTargetOptions.cpp +++ b/llvm/lib/MC/MCTargetOptions.cpp @@ -13,8 +13,8 @@ namespace llvm { MCTargetOptions::MCTargetOptions() : SanitizeAddress(false), MCRelaxAll(false), MCNoExecStack(false), - MCSaveTempLabels(false), MCUseDwarfDirectory(false), - ShowMCEncoding(false), ShowMCInst(false), AsmVerbose(false), - DwarfVersion(0) {} + MCFatalWarnings(false), MCSaveTempLabels(false), + MCUseDwarfDirectory(false), ShowMCEncoding(false), ShowMCInst(false), + AsmVerbose(false), DwarfVersion(0) {} } // end namespace llvm |
