[llvm] r270184 - Target: move enum back into MC

[Saleem Abdulrasool via llvm-commits]

Author: compnerd
Date: Fri May 20 00:13:35 2016
New Revision: 270184

URL: http://llvm.org/viewvc/llvm-project?rev=270184&view=rev
Log:
Target: move enum back into MC

Move the enumeration back to avoid the layering violation.  Should repair the
modules build.

Modified:
    llvm/trunk/include/llvm/MC/MCAsmInfo.h
    llvm/trunk/include/llvm/Target/TargetOptions.h

Modified: llvm/trunk/include/llvm/MC/MCAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAsmInfo.h?rev=270184&r1=270183&r2=270184&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCAsmInfo.h (original)
+++ llvm/trunk/include/llvm/MC/MCAsmInfo.h Fri May 20 00:13:35 2016
@@ -16,7 +16,6 @@
 #ifndef LLVM_MC_MCASMINFO_H
 #define LLVM_MC_MCASMINFO_H
 
-#include "llvm/Target/TargetOptions.h"
 #include "llvm/MC/MCDirectives.h"
 #include "llvm/MC/MCDwarf.h"
 #include <cassert>
@@ -42,6 +41,14 @@ enum class EncodingType {
 };
 }
 
+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
+};
+
 namespace LCOMM {
 enum LCOMMType { NoAlignment, ByteAlignment, Log2Alignment };
 }

Modified: llvm/trunk/include/llvm/Target/TargetOptions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetOptions.h?rev=270184&r1=270183&r2=270184&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Target/TargetOptions.h (original)
+++ llvm/trunk/include/llvm/Target/TargetOptions.h Fri May 20 00:13:35 2016
@@ -17,6 +17,7 @@
 
 #include "llvm/Target/TargetRecip.h"
 #include "llvm/MC/MCTargetOptions.h"
+#include "llvm/MC/MCAsmInfo.h"
 
 namespace llvm {
   class MachineFunction;
@@ -88,14 +89,6 @@ namespace llvm {
     SCE       // Tune debug info for SCE targets (e.g. PS4).
   };
 
-  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
-  };
-
   class TargetOptions {
   public:
     TargetOptions()