Fix exceptions mismatch.

mono · Oct 27, 2024 · 6f26cfb · 6f26cfb
1 parent 5e6fd48
commit 6f26cfb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
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
@@ -48,6 +48,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/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(
@@ -373,8 +374,8 @@ private void SetupArguments(TargetPlatform targetPlatform)
                     break;
             }
 
-            if (!EnableRTTI)
-                AddArguments("-fno-rtti");
+            AddArguments(EnableRTTI ? "-frtti" : "-fno-rtti");
+            AddArguments(EnableExceptions ? "-fexceptions" : "-fno-exceptions");
         }
 
         internal string BuiltinsDirBasePath