revert r176531 due to clan-native-arm fails
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@176544 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 9cf4f3b..d856c31 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -1471,8 +1471,7 @@
Opts.RewriteIncludes = Args.hasArg(OPT_frewrite_includes);
}
-static void ParseTargetArgs(TargetOptions &Opts, ArgList &Args,
- DiagnosticsEngine &Diags) {
+static void ParseTargetArgs(TargetOptions &Opts, ArgList &Args) {
using namespace options;
Opts.ABI = Args.getLastArgValue(OPT_target_abi);
Opts.CXXABI = Args.getLastArgValue(OPT_cxx_abi);
@@ -1484,21 +1483,6 @@
// Use the default target triple if unspecified.
if (Opts.Triple.empty())
Opts.Triple = llvm::sys::getDefaultTargetTriple();
-
- // Check if Opts.ABI conflicts with the environment of triple on ARM.
- llvm::Triple T(Opts.Triple);
- if (T.getArch() == llvm::Triple::arm && !Opts.ABI.empty() &&
- !T.getEnvironmentName().empty()) {
- llvm::Triple::EnvironmentType env = T.getEnvironment();
- // Env and ABI (Triple::EnvironmentType and ARMABIInfo::ABIKind) are not
- // 1-to-1 mapping. Later on, Env will be overrided by ABI option when
- // computing ARMABIInfo.
- bool isOpsEABI = StringRef(Opts.ABI).startswith("aapcs");
- bool isEnvEABI = (env == llvm::Triple::GNUEABI || env == llvm::Triple::EABI
- || env == llvm::Triple::Android);
- if (isEnvEABI != isOpsEABI)
- Diags.Report(diag::warn_target_override_abi) << T.getEnvironmentName();
- }
}
//
@@ -1563,7 +1547,7 @@
ParsePreprocessorArgs(Res.getPreprocessorOpts(), *Args, FileMgr, Diags);
ParsePreprocessorOutputArgs(Res.getPreprocessorOutputOpts(), *Args,
Res.getFrontendOpts().ProgramAction);
- ParseTargetArgs(Res.getTargetOpts(), *Args, Diags);
+ ParseTargetArgs(Res.getTargetOpts(), *Args);
return Success;
}