summaryrefslogtreecommitdiff
path: root/lib/MC
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2014-06-22 22:00:56 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2014-06-22 22:00:56 +0000
commit9124b45918e0b59c37604ea4bb033aaa691a168d (patch)
treeacbc239c4792eab712639ce01a95c26a42ee2066 /lib/MC
parentddf2a7902a428fd4c8234f4989698f1e0fa19c79 (diff)
downloadllvm-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/MC')
-rw-r--r--lib/MC/MCObjectFileInfo.cpp15
-rw-r--r--lib/MC/MCStreamer.cpp2
2 files changed, 5 insertions, 12 deletions
diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
index 971b1a6e40..b76aaa4723 100644
--- a/lib/MC/MCObjectFileInfo.cpp
+++ b/lib/MC/MCObjectFileInfo.cpp
@@ -650,16 +650,11 @@ void MCObjectFileInfo::InitCOFFMCObjectFileInfo(Triple T) {
// though it contains relocatable pointers. In PIC mode, this is probably a
// big runtime hit for C++ apps. Either the contents of the LSDA need to be
// adjusted or this should be a data section.
- assert(T.isOSWindows() && "Windows is the only supported COFF target");
- if (T.getArch() == Triple::x86_64) {
- // On Windows 64 with SEH, the LSDA is emitted into the .xdata section
- LSDASection = 0;
- } else {
- LSDASection = Ctx->getCOFFSection(".gcc_except_table",
- COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
- COFF::IMAGE_SCN_MEM_READ,
- SectionKind::getReadOnly());
- }
+ LSDASection =
+ Ctx->getCOFFSection(".gcc_except_table",
+ COFF::IMAGE_SCN_CNT_INITIALIZED_DATA |
+ COFF::IMAGE_SCN_MEM_READ,
+ SectionKind::getReadOnly());
// Debug info.
COFFDebugSymbolsSection =
diff --git a/lib/MC/MCStreamer.cpp b/lib/MC/MCStreamer.cpp
index 2a6097a7b4..7dccf0d751 100644
--- a/lib/MC/MCStreamer.cpp
+++ b/lib/MC/MCStreamer.cpp
@@ -526,8 +526,6 @@ void MCStreamer::EmitWin64EHSetFrame(unsigned Register, unsigned Offset) {
report_fatal_error("Frame register and offset already specified!");
if (Offset & 0x0F)
report_fatal_error("Misaligned frame pointer offset!");
- if (Offset > 240)
- report_fatal_error("Frame offset must be less than or equal to 240!");
MCSymbol *Label = getContext().CreateTempSymbol();
MCWin64EHInstruction Inst(Win64EH::UOP_SetFPReg, Label, Register, Offset);
EmitLabel(Label);