From owner-svn-src-projects@FreeBSD.ORG Sat Dec 27 14:38:16 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE682B4F; Sat, 27 Dec 2014 14:38:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BACCA66734; Sat, 27 Dec 2014 14:38:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBREcGBg017872; Sat, 27 Dec 2014 14:38:16 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBREcGmb017871; Sat, 27 Dec 2014 14:38:16 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412271438.sBREcGmb017871@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 27 Dec 2014 14:38:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276300 - projects/clang350-import/contrib/llvm/lib/MC X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Dec 2014 14:38:16 -0000 Author: dim Date: Sat Dec 27 14:38:15 2014 New Revision: 276300 URL: https://svnweb.freebsd.org/changeset/base/276300 Log: 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. Modified: projects/clang350-import/contrib/llvm/lib/MC/MCObjectFileInfo.cpp Modified: projects/clang350-import/contrib/llvm/lib/MC/MCObjectFileInfo.cpp ============================================================================== --- projects/clang350-import/contrib/llvm/lib/MC/MCObjectFileInfo.cpp Sat Dec 27 14:26:18 2014 (r276299) +++ projects/clang350-import/contrib/llvm/lib/MC/MCObjectFileInfo.cpp Sat Dec 27 14:38:15 2014 (r276300) @@ -287,6 +287,7 @@ void MCObjectFileInfo::InitELFMCObjectFi 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