From owner-svn-src-all@FreeBSD.ORG  Mon Aug 25 18:45:15 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D69A0E34;
 Mon, 25 Aug 2014 18:45:15 +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 C1C613D70;
 Mon, 25 Aug 2014 18:45:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PIjFbJ064949;
 Mon, 25 Aug 2014 18:45:15 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PIjFvx064948;
 Mon, 25 Aug 2014 18:45:15 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201408251845.s7PIjFvx064948@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 25 Aug 2014 18:45:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270606 - stable/10/contrib/gcc/config/arm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Aug 2014 18:45:16 -0000

Author: ian
Date: Mon Aug 25 18:45:15 2014
New Revision: 270606
URL: http://svnweb.freebsd.org/changeset/base/270606

Log:
  MFC r268994: C++ exception/unwind handling fix
  
    Add FreeBSD to the list of environments that needs to handle R_ARM_TARGET2
    relocations in unwind data as pc-relative indirect references.
  
  Note that the commit log for r269792 incorrectly claims that it includes
  this change, but I apparently fumbled it somehow, so this is the real MFC.

Modified:
  stable/10/contrib/gcc/config/arm/unwind-arm.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/gcc/config/arm/unwind-arm.h
==============================================================================
--- stable/10/contrib/gcc/config/arm/unwind-arm.h	Mon Aug 25 18:34:23 2014	(r270605)
+++ stable/10/contrib/gcc/config/arm/unwind-arm.h	Mon Aug 25 18:45:15 2014	(r270606)
@@ -232,7 +232,7 @@ extern "C" {
       if (!tmp)
 	return 0;
 
-#if defined(linux) || defined(__NetBSD__)
+#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__)
       /* Pc-relative indirect.  */
       tmp += ptr;
       tmp = *(_Unwind_Word *) tmp;