maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Pull out the ppc incompatible features check into a separate function. 

llvm-svn: 246467
This commit is contained in:
Eric Christopher 2015-08-31 18:39:16 +00:00
parent a894266d28
commit a8a14c3d88
1 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
clang/lib/Basic/Targets.cpp
View File

@ -1226,8 +1226,35 @@ void PPCTargetInfo::getTargetDefines(const LangOptions &Opts,
// __NO_FPRS__ // __NO_FPRS__
} }
bool PPCTargetInfo::initFeatureMap( // Handle explicit options being passed to the compiler here: if we've
llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU, // explicitly turned off vsx and turned on power8-vector or direct-move then
// go ahead and error since the customer has expressed a somewhat incompatible
// set of options.
static bool ppcUserFeaturesCheck(DiagnosticsEngine &Diags,
std::vector<std::string> &FeaturesVec) {
if (std::find(FeaturesVec.begin(), FeaturesVec.end(), "-vsx") !=
FeaturesVec.end()) {
if (std::find(FeaturesVec.begin(), FeaturesVec.end(), "+power8-vector") !=
FeaturesVec.end()) {
Diags.Report(diag::err_opt_not_valid_with_opt) << "-mpower8-vector"
<< "-mno-vsx";
return false;
}
if (std::find(FeaturesVec.begin(), FeaturesVec.end(), "+direct-move") !=
FeaturesVec.end()) {
Diags.Report(diag::err_opt_not_valid_with_opt) << "-mdirect-move"
<< "-mno-vsx";
return false;
}
}
return true;
}
bool PPCTargetInfo::initFeatureMap(llvm::StringMap<bool> &Features,
DiagnosticsEngine &Diags, StringRef CPU,
std::vector<std::string> &FeaturesVec) const { std::vector<std::string> &FeaturesVec) const {
Features["altivec"] = llvm::StringSwitch<bool>(CPU) Features["altivec"] = llvm::StringSwitch<bool>(CPU)
.Case("7400", true) .Case("7400", true)
@ -1272,26 +1299,9 @@ bool PPCTargetInfo::initFeatureMap(
.Case("pwr7", true) .Case("pwr7", true)
.Default(false); .Default(false);
// Handle explicit options being passed to the compiler here: if we've if (!ppcUserFeaturesCheck(Diags, FeaturesVec))
// explicitly turned off vsx and turned on power8-vector or direct-move then
// go ahead and error since the customer has expressed a somewhat incompatible
// set of options.
if (std::find(FeaturesVec.begin(), FeaturesVec.end(), "-vsx") !=
FeaturesVec.end()) {
if (std::find(FeaturesVec.begin(), FeaturesVec.end(), "+power8-vector") !=
FeaturesVec.end()) {
Diags.Report(diag::err_opt_not_valid_with_opt) << "-mpower8-vector"
<< "-mno-vsx";
return false; return false;
}
if (std::find(FeaturesVec.begin(), FeaturesVec.end(), "+direct-move") !=
FeaturesVec.end()) {
Diags.Report(diag::err_opt_not_valid_with_opt) << "-mdirect-move"
<< "-mno-vsx";
return false;
}
}
return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec); return TargetInfo::initFeatureMap(Features, Diags, CPU, FeaturesVec);
} }
@ -2492,7 +2502,6 @@ bool X86TargetInfo::initFeatureMap(
llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU, llvm::StringMap<bool> &Features, DiagnosticsEngine &Diags, StringRef CPU,
std::vector<std::string> &FeaturesVec) const { std::vector<std::string> &FeaturesVec) const {
// FIXME: This *really* should not be here. // FIXME: This *really* should not be here.
// X86_64 always has SSE2. // X86_64 always has SSE2.
if (getTriple().getArch() == llvm::Triple::x86_64) if (getTriple().getArch() == llvm::Triple::x86_64)
setFeatureEnabledImpl(Features, "sse2", true); setFeatureEnabledImpl(Features, "sse2", true);