Fix exceptions mismatch.

tritao · Oct 29, 2024 · 4926470 · 4926470
1 parent 62d2792
commit 4926470
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 5 deletions.
diff --git a/src/CLI/Generator.cs b/src/CLI/Generator.cs
@@ -146,6 +146,7 @@ public void Setup(Driver driver)
 
             parserOptions.UnityBuild = options.UnityBuild;
             parserOptions.EnableRTTI = options.EnableRTTI;
+            parserOptions.EnableExceptions = options.EnableExceptions;
 
             parserOptions.Setup(options.Platform ?? Platform.Host);
 

diff --git a/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp
@@ -1,6 +1,5 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
-#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>

diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp
@@ -1,6 +1,5 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
-#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>

diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp
@@ -1,6 +1,5 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
-#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>

diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp
@@ -1,6 +1,5 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
-#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>

diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp
@@ -1,6 +1,5 @@
 #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS
 #define _LIBCPP_HIDE_FROM_ABI
-#define _LIBCPP_NO_ABI_TAG
 
 #include <string>
 #include <new>

diff --git a/src/CppParser/ParserGen/ParserGen.cs b/src/CppParser/ParserGen/ParserGen.cs
@@ -49,6 +49,7 @@ public void Setup(Driver driver)
         {
             var parserOptions = driver.ParserOptions;
             parserOptions.TargetTriple = Triple;
+            parserOptions.EnableExceptions = false;
 
             var options = driver.Options;
             options.GeneratorKind = Kind;

diff --git a/src/CppParser/premake5.lua b/src/CppParser/premake5.lua
@@ -51,6 +51,8 @@ project "Std-symbols"
   language "C++"
   SetupNativeProject()
   rtti "Off"
+  exceptionhandling "Off"
+
   defines { "DLL_EXPORT" }
 
   filter { "toolset:msc*" }

diff --git a/src/Generator/Passes/SymbolsCodeGenerator.cs b/src/Generator/Passes/SymbolsCodeGenerator.cs
@@ -33,6 +33,8 @@ public override void Process()
                 WriteLine("#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS");
                 WriteLine("#define _LIBCPP_HIDE_FROM_ABI");
                 WriteLine("#define _LIBCPP_NO_ABI_TAG");
+                if (!Context.ParserOptions.EnableExceptions)
+                    WriteLine("#define _LIBCPP_HAS_NO_EXCEPTIONS");
                 NewLine();
                 WriteLine("#include <string>");
             }

diff --git a/src/Parser/ParserOptions.cs b/src/Parser/ParserOptions.cs
@@ -84,6 +84,7 @@ public ParserOptions()
                 TargetTriple.Contains("windows") || TargetTriple.Contains("msvc");
 
         public bool EnableRTTI { get; set; }
+        public bool EnableExceptions { get; set; }
         public LanguageVersion? LanguageVersion { get; set; }
 
         public void BuildForSourceFile(
@@ -375,6 +376,9 @@ private void SetupArguments(TargetPlatform targetPlatform)
 
             if (!EnableRTTI)
                 AddArguments("-fno-rtti");
+
+            if (EnableExceptions)
+                AddArguments("-fexceptions");
         }
 
         internal string BuiltinsDirBasePath