From: jwlemke <jwlemke@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 23 Jun 2015 17:45:18 +0000 (+0000)
Subject: 2015-06-23  James Lemke  <jwlemke@codesourcery.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58ddcdad095a1ebd98cfe8d520e4acab71a006ab;p=thirdparty%2Fgcc.git

2015-06-23  James Lemke  <jwlemke@codesourcery.com>

	libgcc/config/arm/
	* lib1funcs.S (aeabi_idiv0, aeabi_ldiv0): Add CFI entries.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224854 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 8a1b257b153e..956038854ec3 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-23  James Lemke  <jwlemke@codesourcery.com>
+
+	libgcc/config/arm/
+	* lib1funcs.S (aeabi_idiv0, aeabi_ldiv0): Add CFI entries.
+
 2015-05-27  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* Makefile.in (CRTSTUFF_CFLAGS): Add $(NO_PIE_CFLAGS).
diff --git a/libgcc/config/arm/lib1funcs.S b/libgcc/config/arm/lib1funcs.S
index e43d9a6c43bb..252efcbd5385 100644
--- a/libgcc/config/arm/lib1funcs.S
+++ b/libgcc/config/arm/lib1funcs.S
@@ -1336,23 +1336,30 @@ LSYM(Lover12):
 #define SIGFPE	8
 
 #ifdef __ARM_EABI__
+	cfi_start	__aeabi_ldiv0, LSYM(Lend_aeabi_ldiv0)
 	WEAK aeabi_idiv0
 	WEAK aeabi_ldiv0
 	ARM_FUNC_START aeabi_idiv0
 	ARM_FUNC_START aeabi_ldiv0
+	do_push	{r1, lr}
+98:	cfi_push 98b - __aeabi_ldiv0, 0xe, -0x4, 0x8
 #else
+	cfi_start	__div0, LSYM(Lend_div0)
 	ARM_FUNC_START div0
+	do_push	{r1, lr}
+98:	cfi_push 98b - __div0, 0xe, -0x4, 0x8
 #endif
 
-	do_push	{r1, lr}
 	mov	r0, #SIGFPE
 	bl	SYM(raise) __PLT__
-	RETLDM	r1
+	RETLDM	r1 unwind=98b
 
 #ifdef __ARM_EABI__
+	cfi_end	LSYM(Lend_aeabi_ldiv0)
 	FUNC_END aeabi_ldiv0
 	FUNC_END aeabi_idiv0
 #else
+	cfi_end	LSYM(Lend_div0)
 	FUNC_END div0
 #endif