diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-06-22 22:00:56 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-06-22 22:00:56 +0000 |
| commit | 9124b45918e0b59c37604ea4bb033aaa691a168d (patch) | |
| tree | acbc239c4792eab712639ce01a95c26a42ee2066 /lib/Target/X86/MCTargetDesc | |
| parent | ddf2a7902a428fd4c8234f4989698f1e0fa19c79 (diff) | |
| download | llvm-9124b45918e0b59c37604ea4bb033aaa691a168d.tar.gz llvm-9124b45918e0b59c37604ea4bb033aaa691a168d.tar.bz2 llvm-9124b45918e0b59c37604ea4bb033aaa691a168d.tar.xz | |
Revert r211399, "Generate native unwind info on Win64"
It broke Legacy JIT Tests on x86_64-{mingw32|msvc}, aka Windows x64.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211480 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/MCTargetDesc')
| -rw-r--r-- | lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp b/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp index d2e8caf728..3f80343f01 100644 --- a/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp +++ b/lib/Target/X86/MCTargetDesc/X86MCAsmInfo.cpp @@ -143,11 +143,8 @@ getNonexecutableStackSection(MCContext &Ctx) const { 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 @@ X86MCAsmInfoMicrosoft::X86MCAsmInfoMicrosoft(const Triple &Triple) { 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; } |