diff options
| -rw-r--r-- | lib/CodeGen/AsmPrinter/DwarfException.cpp | 3 | ||||
| -rw-r--r-- | lib/Target/TargetLoweringObjectFile.cpp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/CodeGen/AsmPrinter/DwarfException.cpp b/lib/CodeGen/AsmPrinter/DwarfException.cpp index d6000e66f0..ebe54102d6 100644 --- a/lib/CodeGen/AsmPrinter/DwarfException.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfException.cpp @@ -906,7 +906,8 @@ void DwarfException::EmitExceptionTable() { const GlobalVariable *TI = *I; if (TI) { - if (TTypeFormat == dwarf::DW_EH_PE_absptr) { + if (TTypeFormat == dwarf::DW_EH_PE_absptr || + TI->getLinkage() == GlobalValue::InternalLinkage) { // Print out the unadorned name of the type info. PrintRelDirective(); O << Asm->Mang->getMangledName(TI); diff --git a/lib/Target/TargetLoweringObjectFile.cpp b/lib/Target/TargetLoweringObjectFile.cpp index 4ee6b92b91..b49164aa17 100644 --- a/lib/Target/TargetLoweringObjectFile.cpp +++ b/lib/Target/TargetLoweringObjectFile.cpp @@ -782,14 +782,8 @@ void TargetLoweringObjectFileMachO::Initialize(MCContext &Ctx, } // Exception Handling. -#if 1 - LSDASection = getMachOSection("__DATA", "__gcc_except_tab", 0, - SectionKind::getDataRel()); -#else - // FIXME: This is causing failures in the CINT2006 SPEC benchmarks. LSDASection = getMachOSection("__TEXT", "__gcc_except_tab", 0, SectionKind::getReadOnly()); -#endif EHFrameSection = getMachOSection("__TEXT", "__eh_frame", MCSectionMachO::S_COALESCED | |