diff options
| author | Kai Nacke <kai.nacke@redstar.de> | 2013-07-08 04:43:23 +0000 |
|---|---|---|
| committer | Kai Nacke <kai.nacke@redstar.de> | 2013-07-08 04:43:23 +0000 |
| commit | 113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2 (patch) | |
| tree | 2f6df2330d1b1ea926f448127aacd819806c82e3 | |
| parent | 04b84c2f92b8c9cf863853eca33f47f9fbd80fd1 (diff) | |
| download | llvm-113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2.tar.gz llvm-113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2.tar.bz2 llvm-113d32cea868bd1749b4cdc8d1e52d9dccb8b5a2.tar.xz | |
Revert: Emit personality function and Dwarf EH data for Win64 SEH.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185788 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/AsmPrinter/Win64Exception.cpp | 12 | ||||
| -rw-r--r-- | lib/MC/MCObjectFileInfo.cpp | 15 |
2 files changed, 14 insertions, 13 deletions
diff --git a/lib/CodeGen/AsmPrinter/Win64Exception.cpp b/lib/CodeGen/AsmPrinter/Win64Exception.cpp index 99d53b9cee..156101286b 100644 --- a/lib/CodeGen/AsmPrinter/Win64Exception.cpp +++ b/lib/CodeGen/AsmPrinter/Win64Exception.cpp @@ -78,9 +78,9 @@ void Win64Exception::BeginFunction(const MachineFunction *MF) { if (!shouldEmitPersonality) return; - const MCSymbol *PersHandlerSym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang, - MMI); - Asm->OutStreamer.EmitWin64EHHandler(PersHandlerSym, true, true); + MCSymbol *GCCHandlerSym = + Asm->GetExternalSymbolSymbol("_GCC_specific_handler"); + Asm->OutStreamer.EmitWin64EHHandler(GCCHandlerSym, true, true); Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("eh_func_begin", Asm->getFunctionNumber())); @@ -99,8 +99,14 @@ void Win64Exception::EndFunction() { MMI->TidyLandingPads(); if (shouldEmitPersonality) { + const TargetLoweringObjectFile &TLOF = Asm->getObjFileLowering(); + const Function *Per = MMI->getPersonalities()[MMI->getPersonalityIndex()]; + const MCSymbol *Sym = TLOF.getCFIPersonalitySymbol(Per, Asm->Mang, MMI); + Asm->OutStreamer.PushSection(); Asm->OutStreamer.EmitWin64EHHandlerData(); + Asm->OutStreamer.EmitValue(MCSymbolRefExpr::Create(Sym, Asm->OutContext), + 4); EmitExceptionTable(); Asm->OutStreamer.PopSection(); } diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp index 1be20c34a1..96b62f19d9 100644 --- a/lib/MC/MCObjectFileInfo.cpp +++ b/lib/MC/MCObjectFileInfo.cpp @@ -547,16 +547,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. - if (T.getOS() == Triple::Win32) { - // On Windows 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. DwarfAbbrevSection = |