From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-ports-return-3889-listarch-libc-ports=sources.redhat.com@sourceware.org>
Received: (qmail 24643 invoked by alias); 11 Mar 2013 21:31:31 -0000
Received: (qmail 24623 invoked by uid 22791); 11 Mar 2013 21:31:29 -0000
X-SWARE-Spam-Status: No, hits=-2.3 required=5.0	tests=AWL,BAYES_00
X-Spam-Check-By: sourceware.org
Received: from toast.topped-with-meat.com (HELO topped-with-meat.com) (204.197.218.159)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 11 Mar 2013 21:31:11 +0000
Received: by topped-with-meat.com (Postfix, from userid 5281)	id 7D6242C08D; Mon, 11 Mar 2013 14:31:10 -0700 (PDT)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
From: Roland McGrath <roland@hack.frob.com>
To: Joseph Myers <joseph@codesourcery.com>
CC: libc-ports@sourceware.org
Subject: [PATCH roland/arm-avoid-pc] ARM: Handle ARM_ALWAYS_BX in {add,sub}_n.S code.
Message-Id: <20130311213110.7D6242C08D@topped-with-meat.com>
Date: Mon, 11 Mar 2013 21:31:00 -0000
X-CMAE-Score: 0
X-CMAE-Analysis: v=2.1 cv=LYSvtFvi c=1 sm=1 tr=0		a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=ibv-uaDMcnoA:10		a=Z6MIti7PxpgA:10 a=kj9zAlcOel0A:10 a=hOe2yjtxAAAA:8 a=H28VVIQsQ1IA:10		a=mDV3o1hIAAAA:8 a=oLXLZaVYxDcbhAC4YMoA:9 a=CjuIK1q_8ugA:10
X-IsSubscribed: yes
Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-ports.sourceware.org>
List-Subscribe: <mailto:libc-ports-subscribe@sourceware.org>
List-Post: <mailto:libc-ports@sourceware.org>
List-Help: <mailto:libc-ports-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: libc-ports-owner@sourceware.org
X-SW-Source: 2013-03/txt/msg00101.txt.bz2

This is on the same unmerged branch, so assumes at least the first patch.

OK?


Thanks,
Roland


ports/ChangeLog.arm
	* sysdeps/arm/add_n.S: Include <arm-features.h>.
	[ARM_ALWAYS_BX]: Don't pop into pc.

--- a/ports/sysdeps/arm/add_n.S
+++ b/ports/sysdeps/arm/add_n.S
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <sysdep.h>
+#include <arm-features.h>
 
 	.syntax unified
 	.text
@@ -80,5 +81,10 @@ ENTRY (FUNC)
 
 9:
 	RETC				/* copy carry out */
+#ifndef ARM_ALWAYS_BX
 	pop	{ r4, r5, r6, r7, r8, r10, pc }
+#else
+	pop	{ r4, r5, r6, r7, r8, r10, lr }
+	bx	lr
+#endif
 END (FUNC)