From 5399988ba7d9906878c5f5b6d9390e3595a6e915 Mon Sep 17 00:00:00 2001
From: Ben Cheng <bccheng@google.com>
Date: Mon, 14 Apr 2014 21:15:30 -0700
Subject: [4.9] Add stack unwinding directives for __aeabi_idiv0 in libgcc.a

See e85b9ca2afe8edbb9fa99c6ce2cc4e52dce18c21

Change-Id: Ic62d25125387a48412c99fbb16e509b79091559d
---
 gcc-4.9/libgcc/config/arm/lib1funcs.S | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'gcc-4.9/libgcc/config')

diff --git a/gcc-4.9/libgcc/config/arm/lib1funcs.S b/gcc-4.9/libgcc/config/arm/lib1funcs.S
index b617137e2..762b0ec4f 100644
--- a/gcc-4.9/libgcc/config/arm/lib1funcs.S
+++ b/gcc-4.9/libgcc/config/arm/lib1funcs.S
@@ -1326,10 +1326,16 @@ LSYM(Lover12):
 	ARM_FUNC_START div0
 #endif
 
+	/* ANDROID LOCAL BEGIN */
+	/* Adding stack unwinding directives to debug divide-by-0 errors */
+	.fnstart
+	.save   {r1, lr}
 	do_push	{r1, lr}
 	mov	r0, #SIGFPE
 	bl	SYM(raise) __PLT__
 	RETLDM	r1
+	.fnend
+	/* ANDROID LOCAL END */
 
 #ifdef __ARM_EABI__
 	FUNC_END aeabi_ldiv0
-- 
cgit v1.2.3