From 28ba3bc9908d6f1df94c3f7e8cff1dda5fcec3bd Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sat, 2 Dec 2023 13:06:09 -0700 Subject: [PATCH] correct LANGOPT / ensure LangOptions.fixed.def is used Signed-off-by: Stephen Gutekanst --- tools/clang/include/clang/Basic/LangOptions.h | 6 ------ tools/clang/lib/AST/DeclarationName.cpp | 6 ------ tools/clang/lib/AST/TemplateBase.cpp | 6 ------ tools/clang/lib/AST/TemplateName.cpp | 6 ------ tools/clang/lib/Basic/LangOptions.cpp | 6 ------ tools/clang/lib/Format/Format.cpp | 6 ------ tools/clang/lib/Frontend/ASTUnit.cpp | 6 ------ tools/clang/lib/Frontend/CompilerInvocation.cpp | 6 ------ tools/clang/lib/Lex/Lexer.cpp | 6 ------ tools/clang/lib/Lex/ModuleMap.cpp | 6 ------ tools/clang/lib/Serialization/ASTReader.cpp | 6 ------ tools/clang/tools/libclang/Indexing.cpp | 6 ------ 12 files changed, 72 deletions(-) diff --git a/tools/clang/include/clang/Basic/LangOptions.h b/tools/clang/include/clang/Basic/LangOptions.h index b723000f6d..101445f978 100644 --- a/tools/clang/include/clang/Basic/LangOptions.h +++ b/tools/clang/include/clang/Basic/LangOptions.h @@ -15,12 +15,6 @@ #ifndef LLVM_CLANG_BASIC_LANGOPTIONS_H #define LLVM_CLANG_BASIC_LANGOPTIONS_H -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/Basic/CommentOptions.h" #include "clang/Basic/LLVM.h" #include "clang/Basic/ObjCRuntime.h" diff --git a/tools/clang/lib/AST/DeclarationName.cpp b/tools/clang/lib/AST/DeclarationName.cpp index ba0460f6cc..4a90275497 100644 --- a/tools/clang/lib/AST/DeclarationName.cpp +++ b/tools/clang/lib/AST/DeclarationName.cpp @@ -12,12 +12,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/AST/ASTContext.h" #include "clang/AST/Decl.h" #include "clang/AST/DeclarationName.h" diff --git a/tools/clang/lib/AST/TemplateBase.cpp b/tools/clang/lib/AST/TemplateBase.cpp index 928b875853..5deb1166a0 100644 --- a/tools/clang/lib/AST/TemplateBase.cpp +++ b/tools/clang/lib/AST/TemplateBase.cpp @@ -12,12 +12,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/AST/TemplateBase.h" #include "clang/AST/ASTContext.h" #include "clang/AST/DeclBase.h" diff --git a/tools/clang/lib/AST/TemplateName.cpp b/tools/clang/lib/AST/TemplateName.cpp index 1d264147bf..f50acb28a1 100644 --- a/tools/clang/lib/AST/TemplateName.cpp +++ b/tools/clang/lib/AST/TemplateName.cpp @@ -11,12 +11,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/AST/TemplateName.h" #include "clang/AST/DeclTemplate.h" #include "clang/AST/NestedNameSpecifier.h" diff --git a/tools/clang/lib/Basic/LangOptions.cpp b/tools/clang/lib/Basic/LangOptions.cpp index 1a56172aba..87d207400e 100644 --- a/tools/clang/lib/Basic/LangOptions.cpp +++ b/tools/clang/lib/Basic/LangOptions.cpp @@ -11,12 +11,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/Basic/LangOptions.h" // // /////////////////////////////////////////////////////////////////////////////// diff --git a/tools/clang/lib/Format/Format.cpp b/tools/clang/lib/Format/Format.cpp index 973fa66bb6..7d556c9f0f 100644 --- a/tools/clang/lib/Format/Format.cpp +++ b/tools/clang/lib/Format/Format.cpp @@ -13,12 +13,6 @@ /// //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "ContinuationIndenter.h" #include "TokenAnnotator.h" #include "UnwrappedLineFormatter.h" diff --git a/tools/clang/lib/Frontend/ASTUnit.cpp b/tools/clang/lib/Frontend/ASTUnit.cpp index a096d78a92..8f3cb93002 100644 --- a/tools/clang/lib/Frontend/ASTUnit.cpp +++ b/tools/clang/lib/Frontend/ASTUnit.cpp @@ -11,12 +11,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/Frontend/ASTUnit.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" diff --git a/tools/clang/lib/Frontend/CompilerInvocation.cpp b/tools/clang/lib/Frontend/CompilerInvocation.cpp index 2ea7b0307a..b814a7b465 100644 --- a/tools/clang/lib/Frontend/CompilerInvocation.cpp +++ b/tools/clang/lib/Frontend/CompilerInvocation.cpp @@ -7,12 +7,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/Frontend/CompilerInvocation.h" #include "clang/Basic/FileManager.h" #include "clang/Basic/Version.h" diff --git a/tools/clang/lib/Lex/Lexer.cpp b/tools/clang/lib/Lex/Lexer.cpp index 32cf10dfa8..089e76b78b 100644 --- a/tools/clang/lib/Lex/Lexer.cpp +++ b/tools/clang/lib/Lex/Lexer.cpp @@ -11,12 +11,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/Lex/Lexer.h" #include "UnicodeCharSets.h" #include "clang/Basic/CharInfo.h" diff --git a/tools/clang/lib/Lex/ModuleMap.cpp b/tools/clang/lib/Lex/ModuleMap.cpp index 175bc89f54..9915fe9154 100644 --- a/tools/clang/lib/Lex/ModuleMap.cpp +++ b/tools/clang/lib/Lex/ModuleMap.cpp @@ -12,12 +12,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/Lex/ModuleMap.h" #include "clang/Basic/CharInfo.h" #include "clang/Basic/Diagnostic.h" diff --git a/tools/clang/lib/Serialization/ASTReader.cpp b/tools/clang/lib/Serialization/ASTReader.cpp index 52c5321a1d..7f9bb26734 100644 --- a/tools/clang/lib/Serialization/ASTReader.cpp +++ b/tools/clang/lib/Serialization/ASTReader.cpp @@ -11,12 +11,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "clang/Serialization/ASTReader.h" #include "ASTCommon.h" #include "ASTReaderInternals.h" diff --git a/tools/clang/tools/libclang/Indexing.cpp b/tools/clang/tools/libclang/Indexing.cpp index 910d4cc5c7..731f46e66b 100644 --- a/tools/clang/tools/libclang/Indexing.cpp +++ b/tools/clang/tools/libclang/Indexing.cpp @@ -7,12 +7,6 @@ // //===----------------------------------------------------------------------===// -// Mach change start -#ifndef MS_SUPPORT_VARIABLE_LANGOPTS -#define MS_SUPPORT_VARIABLE_LANGOPTS -#endif // MS_SUPPORT_VARIABLE_LANGOPTS -// Mach change end - #include "IndexingContext.h" #include "CIndexDiagnostic.h" #include "CIndexer.h"