MC: Move ExceptionHandling enum to Support

[arsenm]

Similar to b596726, we need
to use this in RuntimeLibcalls to compute the set of library
calls.

[arsenm]

• RuntimeLibcalls: Pass in exception handling type #144696
• MC: Move ExceptionHandling enum to Support #144692 👈 (View in Graphite)
• RuntimeLibcalls: Pass in FloatABI and EABI type #144691 : 1 other dependent PR (#144705 )
• main

This stack of pull requests is managed by Graphite. Learn more about stacking.

[llvmbot]

@llvm/pr-subscribers-llvm-support

Author: Matt Arsenault (arsenm)

Changes

Similar to b596726, we need
to use this in RuntimeLibcalls to compute the set of library
calls.

---

Full diff: https://github.com/llvm/llvm-project/pull/144692.diff

2 Files Affected:

• (modified) llvm/include/llvm/MC/MCTargetOptions.h (+1-12)
• (modified) llvm/include/llvm/Support/CodeGen.h (+12)

diff --git a/llvm/include/llvm/MC/MCTargetOptions.h b/llvm/include/llvm/MC/MCTargetOptions.h
index 3ee21d9cda4b7..d95adf92b9a83 100644
--- a/llvm/include/llvm/MC/MCTargetOptions.h
+++ b/llvm/include/llvm/MC/MCTargetOptions.h
@@ -10,6 +10,7 @@
 #define LLVM_MC_MCTARGETOPTIONS_H
 
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/Support/CodeGen.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Compression.h"
 #include <string>
@@ -17,18 +18,6 @@
 
 namespace llvm {
 
-enum class ExceptionHandling {
-  None,     ///< No exception support
-  DwarfCFI, ///< DWARF-like instruction based exceptions
-  SjLj,     ///< setjmp/longjmp based exceptions
-  ARM,      ///< ARM EHABI
-  WinEH,    ///< Windows Exception Handling
-  Wasm,     ///< WebAssembly Exception Handling
-  AIX,      ///< AIX Exception Handling
-  ZOS,      ///< z/OS MVS Exception Handling. Very similar to DwarfCFI, but the PPA1
-            ///< is used instead of an .eh_frame section.
-};
-
 enum class EmitDwarfUnwindType {
   Always,          // Always emit dwarf unwind
   NoCompactUnwind, // Only emit if compact unwind isn't available
diff --git a/llvm/include/llvm/Support/CodeGen.h b/llvm/include/llvm/Support/CodeGen.h
index 90733b50385a9..cd1f9167b996d 100644
--- a/llvm/include/llvm/Support/CodeGen.h
+++ b/llvm/include/llvm/Support/CodeGen.h
@@ -50,6 +50,18 @@ namespace llvm {
     };
   }
 
+  enum class ExceptionHandling {
+    None,     ///< No exception support
+    DwarfCFI, ///< DWARF-like instruction based exceptions
+    SjLj,     ///< setjmp/longjmp based exceptions
+    ARM,      ///< ARM EHABI
+    WinEH,    ///< Windows Exception Handling
+    Wasm,     ///< WebAssembly Exception Handling
+    AIX,      ///< AIX Exception Handling
+    ZOS, ///< z/OS MVS Exception Handling. Very similar to DwarfCFI, but the
+         ///< PPA1 is used instead of an .eh_frame section.
+  };
+
   namespace FloatABI {
   enum ABIType {
     Default, // Target-specific (either soft or hard depending on triple, etc).

[nikic]

LGTM

[arsenm]

Merge activity

• Jun 19, 9:57 AM UTC: A user started a stack merge that includes this pull request via Graphite.
• Jun 19, 10:03 AM UTC: Graphite rebased this pull request as part of a merge.
• Jun 19, 10:05 AM UTC: @arsenm merged this pull request with Graphite.