diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
index 7ab0bb0975a4..06dfac4550c7 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp
@@ -56,10 +56,7 @@ void DwarfException::EmitCommonEHFrame(const Function *Personality,
     TD->getPointerSize() : -TD->getPointerSize();
 
   // Begin eh frame section.
-  // FIXME: THIS IS A HORRIBLE HACK.  MingW isn't specifying an EHFrame section.
-  if (const MCSection *EHFrameSec = 
-      Asm->getObjFileLowering().getEHFrameSection())
-    Asm->SwitchToSection(EHFrameSec);
+  Asm->SwitchToSection(Asm->getObjFileLowering().getEHFrameSection());
 
   if (TAI->is_EHSymbolPrivate())
     O << TAI->getPrivateGlobalPrefix();
@@ -153,10 +150,7 @@ void DwarfException::EmitEHFrame(const FunctionEHFrameInfo &EHFrameInfo) {
 
   const Function *TheFunc = EHFrameInfo.function;
   
-  // FIXME: THIS IS A HORRIBLE HACK.  MingW isn't specifying an EHFrame section.
-  if (const MCSection *EHFrameSec = 
-      Asm->getObjFileLowering().getEHFrameSection())
-    Asm->SwitchToSection(EHFrameSec);
+  Asm->SwitchToSection(Asm->getObjFileLowering().getEHFrameSection());
   
   // Externally visible entry into the functions eh frame info. If the
   // corresponding function is static, this should not be externally visible.
diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp
index 67fbc1f6ca09..84b1b93ab01b 100644
--- a/llvm/lib/Target/TargetLoweringObjectFile.cpp
+++ b/llvm/lib/Target/TargetLoweringObjectFile.cpp
@@ -963,6 +963,14 @@ void TargetLoweringObjectFileCOFF::Initialize(MCContext &Ctx,
   StaticDtorSection =
     getCOFFSection(".dtors", false, SectionKind::getDataRel());
   
+  // FIXME: We're emitting LSDA info into a readonly section on COFF, even
+  // 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.
+  LSDASection =
+    getCOFFSection(".gcc_except_table", false, SectionKind::getReadOnly());
+  EHFrameSection =
+    getCOFFSection(".eh_frame", false, SectionKind::getDataRel());
   
   // Debug info.
   // FIXME: Don't use 'directive' mode here.