correct LANGOPT / ensure LangOptions.fixed.def is used

Stephen Gutekanst · Stephen Gutekanst · commit 28ba3bc9908d · 2023-12-02T13:06:09.000-07:00
Signed-off-by: Stephen Gutekanst &lt;stephen@hexops.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
