commit d77cefe633bd1a107232def8b9655978b8f6fe41
author NAKAMURA Takumi <geek4civic@gmail.com> Sun Jun 22 22:00:56 2014 +0000
committer NAKAMURA Takumi <geek4civic@gmail.com> Sun Jun 22 22:00:56 2014 +0000
tree 094df9f6e776674d09e5deceae78b48f6de00371
parent ac4e8e5fcad38e749a1e151b124fd3e71c6747a6

Revert r211399, "Generate native unwind info on Win64"

It broke Legacy JIT Tests on x86_64-{mingw32|msvc}, aka Windows x64.

llvm-svn: 211480

llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp

diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
index d2e8caf..3f80343 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp
@@ -143,11 +143,8 @@
 void X86MCAsmInfoMicrosoft::anchor() { }
 
 X86MCAsmInfoMicrosoft::X86MCAsmInfoMicrosoft(const Triple &Triple) {
-  if (Triple.getArch() == Triple::x86_64) {
+  if (Triple.getArch() == Triple::x86_64)
     PrivateGlobalPrefix = ".L";
-    PointerSize = 8;
-    ExceptionsType = ExceptionHandling::Win64;
-  }
 
   AssemblerDialect = AsmWriterFlavor;
 
@@ -161,18 +158,17 @@
 void X86MCAsmInfoGNUCOFF::anchor() { }
 
 X86MCAsmInfoGNUCOFF::X86MCAsmInfoGNUCOFF(const Triple &Triple) {
-  assert(Triple.isOSWindows() && "Windows is the only supported COFF target");
   if (Triple.getArch() == Triple::x86_64) {
     PrivateGlobalPrefix = ".L";
     PointerSize = 8;
-    ExceptionsType = ExceptionHandling::Win64;
-  } else {
-    ExceptionsType = ExceptionHandling::DwarfCFI;
   }
 
   AssemblerDialect = AsmWriterFlavor;
 
   TextAlignFillValue = 0x90;
 
+  // Exceptions handling
+  ExceptionsType = ExceptionHandling::DwarfCFI;
+
   UseIntegratedAssembler = true;
 }