From 887e9df0c7f5898905c670888a44e9a8a8ca82f7 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 4 Jun 2021 08:44:27 -0400 Subject: VS: Update v142 CL flag table for VS 16.10 Run the command python3 Source/cmConvertMSBuildXMLToJSON.py -t v142 \ 'c:/.../MSBuild/Microsoft/VC/v160/1033/cl.xml' To generate `v142_CL.json` locally. Manually move new and updated settings over to `Templates/MSBuild/FlagTables/v142_CL.json`. Revise the `/sourceDependencies[:directives]` table entries to properly distinguish the two options (because one is a prefix of the other), and to populate both `Generate*Dependencies` and `*DependenciesFile`. --- Templates/MSBuild/FlagTables/v142_CL.json | 224 +++++++++++++++++++++++++++++- 1 file changed, 219 insertions(+), 5 deletions(-) (limited to 'Templates') diff --git a/Templates/MSBuild/FlagTables/v142_CL.json b/Templates/MSBuild/FlagTables/v142_CL.json index 68dcb13097..650ff6c180 100644 --- a/Templates/MSBuild/FlagTables/v142_CL.json +++ b/Templates/MSBuild/FlagTables/v142_CL.json @@ -384,6 +384,13 @@ "value": "AdvancedVectorExtensions2", "flags": [] }, + { + "name": "EnableEnhancedInstructionSet", + "switch": "arch:AVX512", + "comment": "Advanced Vector Extensions 512", + "value": "AdvancedVectorExtensions512", + "flags": [] + }, { "name": "EnableEnhancedInstructionSet", "switch": "arch:IA32", @@ -419,31 +426,45 @@ "value": "Fast", "flags": [] }, + { + "name": "SpectreMitigation", + "switch": "Qspectre-load-cf", + "comment": "All Control Flow Loads", + "value": "SpectreLoadCF", + "flags": [] + }, + { + "name": "SpectreMitigation", + "switch": "Qspectre-load", + "comment": "All Loads", + "value": "SpectreLoad", + "flags": [] + }, { "name": "SpectreMitigation", "switch": "Qspectre-", - "comment": "Spectre mitigations disabled", + "comment": "Disabled", "value": "false", "flags": [] }, { "name": "SpectreMitigation", "switch": "Qspectre", - "comment": "Spectre mitigations enabled", + "comment": "Enabled", "value": "Spectre", "flags": [] }, { "name": "ConformanceMode", "switch": "permissive-", - "comment": "Conformance mode enabled", + "comment": "Yes", "value": "true", "flags": [] }, { "name": "ConformanceMode", "switch": "permissive", - "comment": "Conformance mode disabled", + "comment": "No", "value": "false", "flags": [] }, @@ -630,6 +651,27 @@ "value": "CompileAsCpp", "flags": [] }, + { + "name": "CompileAs", + "switch": "interface", + "comment": "Compile as C++ Module Code", + "value": "CompileAsCppModule", + "flags": [] + }, + { + "name": "CompileAs", + "switch": "internalPartition", + "comment": "Compile as C++ Module Internal Partition", + "value": "CompileAsCppModuleInternalPartition", + "flags": [] + }, + { + "name": "CompileAs", + "switch": "exportHeader", + "comment": "Compile as C++ Header Unit", + "value": "CompileAsHeaderUnit", + "flags": [] + }, { "name": "ErrorReporting", "switch": "errorReport:none", @@ -732,6 +774,13 @@ "Continue" ] }, + { + "name": "ForceSynchronousPDBWrites", + "switch": "FS", + "comment": "Force Synchronous PDB Writes", + "value": "true", + "flags": [] + }, { "name": "IntrinsicFunctions", "switch": "Oi", @@ -802,6 +851,20 @@ "value": "true", "flags": [] }, + { + "name": "UseStandardPreprocessor", + "switch": "Zc:preprocessor-", + "comment": "Use Standard Conforming Preprocessor", + "value": "false", + "flags": [] + }, + { + "name": "UseStandardPreprocessor", + "switch": "Zc:preprocessor", + "comment": "Use Standard Conforming Preprocessor", + "value": "true", + "flags": [] + }, { "name": "StringPooling", "switch": "GF-", @@ -886,6 +949,41 @@ "value": "true", "flags": [] }, + { + "name": "IntelJCCErratum", + "switch": "QIntel-jcc-erratum", + "comment": "Enable Intel JCC Erratum Mitigation", + "value": "true", + "flags": [] + }, + { + "name": "GuardEHContMetadata", + "switch": "guard:ehcont-", + "comment": "Enable EH Continuation Metadata", + "value": "false", + "flags": [] + }, + { + "name": "GuardEHContMetadata", + "switch": "guard:ehcont", + "comment": "Enable EH Continuation Metadata", + "value": "true", + "flags": [] + }, + { + "name": "GuardSignedReturns", + "switch": "guard:signret-", + "comment": "Enable Signed Returns", + "value": "false", + "flags": [] + }, + { + "name": "GuardSignedReturns", + "switch": "guard:signret", + "comment": "Enable Signed Returns", + "value": "true", + "flags": [] + }, { "name": "DisableLanguageExtensions", "switch": "Za", @@ -980,7 +1078,7 @@ { "name": "EnableModules", "switch": "experimental:module", - "comment": "Enable C++ Modules (experimental)", + "comment": "Enable Experimental C++ Standard Library Modules", "value": "true", "flags": [] }, @@ -998,6 +1096,15 @@ "value": "true", "flags": [] }, + { + "name": "GenerateModuleDependencies", + "switch": "sourceDependencies:directives", + "comment": "Generate Module Dependenices File", + "value": "true", + "flags": [ + "Continue" + ] + }, { "name": "GenerateXMLDocumentationFiles", "switch": "doc", @@ -1009,6 +1116,15 @@ "Continue" ] }, + { + "name": "GenerateSourceDependencies", + "switch": "sourceDependencies", + "comment": "Generate Source Dependencies File", + "value": "true", + "flags": [ + "Continue" + ] + }, { "name": "BrowseInformation", "switch": "FR", @@ -1020,6 +1136,27 @@ "Continue" ] }, + { + "name": "TreatAngleIncludeAsExternal", + "switch": "external:anglebrackets", + "comment": "Treat Files Included with Angle Brackets as External", + "value": "true", + "flags": [] + }, + { + "name": "ExternalTemplatesDiagnostics", + "switch": "external:templates-", + "comment": "Template Diagnostics in External Headers", + "value": "true", + "flags": [] + }, + { + "name": "DisableAnalyzeExternal", + "switch": "analyze:external-", + "comment": "Disable Code Analysis for External Headers", + "value": "true", + "flags": [] + }, { "name": "ShowIncludes", "switch": "showIncludes", @@ -1075,6 +1212,36 @@ "SemicolonAppendable" ] }, + { + "name": "AdditionalBMIDirectories", + "switch": "ifcSearchDir", + "comment": "Additional BMI Directories", + "value": "", + "flags": [ + "UserValue", + "SemicolonAppendable" + ] + }, + { + "name": "AdditionalModuleDependencies", + "switch": "reference", + "comment": "Additional Module Dependencies", + "value": "", + "flags": [ + "UserValue", + "SemicolonAppendable" + ] + }, + { + "name": "AdditionalHeaderUnitDependencies", + "switch": "headerUnit", + "comment": "Additional Header Unit Dependencies", + "value": "", + "flags": [ + "UserValue", + "SemicolonAppendable" + ] + }, { "name": "PreprocessorDefinitions", "switch": "D", @@ -1095,6 +1262,26 @@ "SemicolonAppendable" ] }, + { + "name": "StdIfcDirectory", + "switch": "stdIfcDir", + "comment": "", + "value": "", + "flags": [ + "UserValue", + "SemicolonAppendable" + ] + }, + { + "name": "ExternalDirectoriesEnv", + "switch": "external:env:", + "comment": "External Directories Environment Variables", + "value": "", + "flags": [ + "UserValue", + "SemicolonAppendable" + ] + }, { "name": "DisableSpecificWarnings", "switch": "wd", @@ -1210,6 +1397,24 @@ "UserValue" ] }, + { + "name": "ModuleOutputFile", + "switch": "ifcOutput", + "comment": "Module Output File Name", + "value": "", + "flags": [ + "UserValue" + ] + }, + { + "name": "ModuleDependenciesFile", + "switch": "sourceDependencies:directives", + "comment": "Module Dependencies File Name", + "value": "", + "flags": [ + "UserFollowing" + ] + }, { "name": "ObjectFileName", "switch": "Fo", @@ -1238,6 +1443,15 @@ "UserRequired" ] }, + { + "name": "SourceDependenciesFile", + "switch": "sourceDependencies", + "comment": "Source Dependencies File Name", + "value": "", + "flags": [ + "UserFollowing" + ] + }, { "name": "BrowseInformationFile", "switch": "FR", -- cgit v1.2.1