From owner-svn-src-head@freebsd.org  Mon Sep 25 23:50:11 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94C15E26957;
 Mon, 25 Sep 2017 23:50:11 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 5577C6DBFA;
 Mon, 25 Sep 2017 23:50:11 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8PNoAen021281;
 Mon, 25 Sep 2017 23:50:10 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8PNoAMS021280;
 Mon, 25 Sep 2017 23:50:10 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201709252350.v8PNoAMS021280@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 25 Sep 2017 23:50:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323998 - head/contrib/gcc/config/arm
X-SVN-Group: head
X-SVN-Commit-Author: ian
X-SVN-Commit-Paths: head/contrib/gcc/config/arm
X-SVN-Commit-Revision: 323998
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Sep 2017 23:50:11 -0000

Author: ian
Date: Mon Sep 25 23:50:10 2017
New Revision: 323998
URL: https://svnweb.freebsd.org/changeset/base/323998

Log:
  Fix the return value from _Unwind_Backtrace() on arm.
  
  If unwinding stops due to hitting the end of the call chain, the return
  value is supposed to be _URC_END_OF_STACK; other values indicate internal
  errors.  The return value from get_eit_entry() is now returned without
  translating it to _URC_FAILURE, so that callers can see _URC_END_OF_STACK
  when it happens.

Modified:
  head/contrib/gcc/config/arm/unwind-arm.c

Modified: head/contrib/gcc/config/arm/unwind-arm.c
==============================================================================
--- head/contrib/gcc/config/arm/unwind-arm.c	Mon Sep 25 23:24:41 2017	(r323997)
+++ head/contrib/gcc/config/arm/unwind-arm.c	Mon Sep 25 23:50:10 2017	(r323998)
@@ -773,11 +773,8 @@ __gnu_Unwind_Backtrace(_Unwind_Trace_Fn trace, void * 
   do
     {
       /* Find the entry for this routine.  */
-      if (get_eit_entry (ucbp, saved_vrs.core.r[R_PC]) != _URC_OK)
-	{
-	  code = _URC_FAILURE;
+      if ((code = get_eit_entry (ucbp, saved_vrs.core.r[R_PC])) != _URC_OK)
 	  break;
-	}
 
       /* The dwarf unwinder assumes the context structure holds things
 	 like the function and LSDA pointers.  The ARM implementation