VS: Add flag table entry for -Qspectre

Add special logic to map this flag to a top-level build setting
instead of being in ClCompile.

Fixes: #18426
This commit is contained in:
Brad King
2018-10-08 13:51:29 -04:00
parent fd02538974
commit bb60ed6e72
3 changed files with 11 additions and 0 deletions

View File

@@ -83,6 +83,8 @@ static cmVS7FlagTable cmVS141CLFlagTable[] = {
{ "FloatingPointModel", "fp:strict", "Strict", "Strict", 0 },
{ "FloatingPointModel", "fp:fast", "Fast", "Fast", 0 },
{ "SpectreMitigation", "Qspectre", "Spectre mitigations", "Spectre", 0 },
{ "LanguageStandard", "std:c++17", "ISO C++17 Standard", "stdcpp17", 0 },
{ "LanguageStandard", "std:c++14", "ISO C++14 Standard", "stdcpp14", 0 },
{ "LanguageStandard", "std:c++latest", "ISO C++ Latest Draft Standard",

View File

@@ -1125,6 +1125,9 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValues(
if (this->IPOEnabledConfigurations.count(config) > 0) {
e1.Element("WholeProgramOptimization", "true");
}
if (this->SpectreMitigationConfigurations.count(config) > 0) {
e1.Element("SpectreMitigation", "Spectre");
}
}
void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValuesManaged(
@@ -2625,6 +2628,11 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
}
}
if (clOptions.HasFlag("SpectreMitigation")) {
this->SpectreMitigationConfigurations.insert(configName);
clOptions.RemoveFlag("SpectreMitigation");
}
this->ClOptions[configName] = std::move(pOptions);
return true;
}

View File

@@ -205,6 +205,7 @@ private:
unsigned int NsightTegraVersion[4];
bool TargetCompileAsWinRT;
std::set<std::string> IPOEnabledConfigurations;
std::set<std::string> SpectreMitigationConfigurations;
cmGlobalVisualStudio10Generator* const GlobalGenerator;
cmLocalVisualStudio10Generator* const LocalGenerator;
std::set<std::string> CSharpCustomCommandNames;