diff options
Diffstat (limited to 'clang/lib/Frontend')
| -rw-r--r-- | clang/lib/Frontend/CompilerInvocation.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 6e47b37..d711df0 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1274,9 +1274,7 @@ static void initOption(AnalyzerOptions::ConfigTable &Config, Diags->Report(diag::err_analyzer_config_invalid_input) << Name << "a positive"; - auto Default = PositiveAnalyzerOption::create(DefaultVal); - assert(Default.has_value()); - OptionField = Default.value(); + OptionField = DefaultVal; } static void parseAnalyzerConfigs(AnalyzerOptions &AnOpts, diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index 29723b5..8eba766 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -1507,6 +1507,11 @@ static void InitializePredefinedMacros(const TargetInfo &TI, // ELF targets define __ELF__ if (TI.getTriple().isOSBinFormatELF()) Builder.defineMacro("__ELF__"); + else if (TI.getTriple().isAppleMachO()) + // Apple MachO targets define __MACH__ even when not using DarwinTargetInfo. + // Hurd will also define this in some circumstances, but that's done in + // HurdTargetInfo. Windows targets don't define this. + Builder.defineMacro("__MACH__"); // Target OS macro definitions. if (PPOpts.DefineTargetOSMacros) { |