From 425d737b36727ca68cb77ff01d6aad8b150044ee Mon Sep 17 00:00:00 2001
From: Matthew Gretton-Dann <matthew.gretton-dann@arm.com>
Date: Wed, 16 Nov 2011 18:02:12 +0000
Subject: [PATCH] lib1funcs.asm (udivsi3): Add support for divide functions.

2011-11-16  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>

	* config/arm/lib1funcs.asm (udivsi3): Add support for divide
	functions.
	(aeabi_uidivmod): Likewise.
	(umodsi3): Likewise.
	(divsi3): Likewise.
	(aeabi_idivmod): Likewise.
	(modsi3): Likewise.

From-SVN: r181419
---
 libgcc/ChangeLog              | 10 +++++
 libgcc/config/arm/lib1funcs.S | 70 +++++++++++++++++++++++++++++++++--
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 403f19edd1b..57fcc540019 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-16  Matthew Gretton-Dann  <matthew.gretton-dann@arm.com>
+
+	* config/arm/lib1funcs.asm (udivsi3): Add support for divide
+	functions.
+	(aeabi_uidivmod): Likewise.	
+	(umodsi3): Likewise.
+	(divsi3): Likewise.
+	(aeabi_idivmod): Likewise.
+	(modsi3): Likewise.
+
 2011-11-16  Tristan Gingold  <gingold@adacore.com>
 
 	* config/alpha/qrnnd.S: Use specific pseudos for VMS.
diff --git a/libgcc/config/arm/lib1funcs.S b/libgcc/config/arm/lib1funcs.S
index 2e76c01df4b..094d79afad6 100644
--- a/libgcc/config/arm/lib1funcs.S
+++ b/libgcc/config/arm/lib1funcs.S
@@ -951,6 +951,17 @@ LSYM(udivsi3_skip_div0_test):
 	pop	{ work }
 	RET
 
+#elif defined(__ARM_ARCH_EXT_IDIV__)
+
+	ARM_FUNC_START udivsi3
+	ARM_FUNC_ALIAS aeabi_uidiv udivsi3
+
+	cmp	r1, #0
+	beq	LSYM(Ldiv0)
+
+	udiv	r0, r0, r1
+	RET
+
 #else /* ARM version/Thumb-2.  */
 
 	ARM_FUNC_START udivsi3
@@ -997,6 +1008,14 @@ FUNC_START aeabi_uidivmod
 	mul	r2, r0
 	sub	r1, r1, r2
 	bx	r3
+#elif defined(__ARM_ARCH_EXT_IDIV__)
+ARM_FUNC_START aeabi_uidivmod
+	cmp	r1, #0
+	beq	LSYM(Ldiv0)
+	mov     r2, r0 
+	udiv	r0, r0, r1
+	mls     r1, r0, r1, r2
+	RET
 #else
 ARM_FUNC_START aeabi_uidivmod
 	cmp	r1, #0
@@ -1014,9 +1033,19 @@ ARM_FUNC_START aeabi_uidivmod
 /* ------------------------------------------------------------------------ */
 #ifdef L_umodsi3
 
-	FUNC_START umodsi3
+#ifdef __ARM_ARCH_EXT_IDIV__
 
-#ifdef __thumb__
+	ARM_FUNC_START umodsi3
+
+	cmp	r1, #0
+	beq	LSYM(Ldiv0)
+	udiv	r2, r0, r1
+	mls     r0, r1, r2, r0
+	RET
+
+#elif defined(__thumb__)
+
+	FUNC_START umodsi3
 
 	cmp	divisor, #0
 	beq	LSYM(Ldiv0)
@@ -1035,6 +1064,8 @@ LSYM(Lover10):
 	
 #else  /* ARM version.  */
 	
+	FUNC_START umodsi3
+
 	subs	r2, r1, #1			@ compare divisor with 1
 	bcc	LSYM(Ldiv0)
 	cmpne	r0, r1				@ compare dividend with divisor
@@ -1091,6 +1122,16 @@ LSYM(Lover12):
 	pop	{ work }
 	RET
 
+#elif defined(__ARM_ARCH_EXT_IDIV__)
+
+	ARM_FUNC_START divsi3
+	ARM_FUNC_ALIAS aeabi_idiv divsi3
+
+	cmp 	r1, #0
+	beq	LSYM(Ldiv0)
+	sdiv	r0, r0, r1
+	RET
+
 #else /* ARM/Thumb-2 version.  */
 	
 	ARM_FUNC_START divsi3	
@@ -1153,6 +1194,14 @@ FUNC_START aeabi_idivmod
 	mul	r2, r0
 	sub	r1, r1, r2
 	bx	r3
+#elif defined(__ARM_ARCH_EXT_IDIV__)
+ARM_FUNC_START aeabi_idivmod
+	cmp 	r1, #0
+	beq	LSYM(Ldiv0)
+	mov     r2, r0
+	sdiv	r0, r0, r1
+	mls     r1, r0, r1, r2
+	RET
 #else
 ARM_FUNC_START aeabi_idivmod
 	cmp	r1, #0
@@ -1170,9 +1219,20 @@ ARM_FUNC_START aeabi_idivmod
 /* ------------------------------------------------------------------------ */
 #ifdef L_modsi3
 
-	FUNC_START modsi3
+#if defined(__ARM_ARCH_EXT_IDIV__)
 
-#ifdef __thumb__
+	ARM_FUNC_START modsi3
+
+	cmp	r1, #0
+	beq	LSYM(Ldiv0)
+
+	sdiv	r2, r0, r1
+	mls     r0, r1, r2, r0
+	RET
+
+#elif defined(__thumb__)
+
+	FUNC_START modsi3
 
 	mov	curbit, #1
 	cmp	divisor, #0
@@ -1204,6 +1264,8 @@ LSYM(Lover12):
 
 #else /* ARM version.  */
 	
+	FUNC_START modsi3
+
 	cmp	r1, #0
 	beq	LSYM(Ldiv0)
 	rsbmi	r1, r1, #0			@ loops below use unsigned.