summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/lib
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-12-27 14:38:15 +0000
committerdim <dim@FreeBSD.org>2014-12-27 14:38:15 +0000
commit2d8ca6e6535f56f472be2c7e790429576cf0dd3a (patch)
treef094f05f198362629fc9a71a5dc255a70d1e9cf2 /contrib/llvm/lib
parent0d4784e66c1d6aac646fdbfe8d5cfb67779fe189 (diff)
downloadFreeBSD-src-2d8ca6e6535f56f472be2c7e790429576cf0dd3a.zip
FreeBSD-src-2d8ca6e6535f56f472be2c7e790429576cf0dd3a.tar.gz
Pull in r213890 from upstream llvm trunk (by Jörg Sonnenberger):
Use the same .eh_frame encoding for 32bit PPC as on i386. This fixes DT_TEXTREL errors when linking C++ objects using exceptions on PowerPC.
Diffstat (limited to 'contrib/llvm/lib')
-rw-r--r--contrib/llvm/lib/MC/MCObjectFileInfo.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/llvm/lib/MC/MCObjectFileInfo.cpp b/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
index d490ef3..6b16caa 100644
--- a/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
+++ b/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
@@ -287,6 +287,7 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) {
if (Ctx->getAsmInfo()->getExceptionHandlingType() == ExceptionHandling::ARM)
break;
// Fallthrough if not using EHABI
+ case Triple::ppc:
case Triple::x86:
PersonalityEncoding = (RelocM == Reloc::PIC_)
? dwarf::DW_EH_PE_indirect | dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4
OpenPOWER on IntegriCloud