aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.7
diff options
context:
space:
mode:
authorBen Cheng <bccheng@google.com>2013-08-01 23:07:11 -0700
committerBen Cheng <bccheng@google.com>2013-08-01 23:07:11 -0700
commit5ea1e88a7f14a78a01d95f66e388eb15908a5225 (patch)
treee210e1892687481d469ce085fb38dc6b9ab77349 /gcc-4.7
parent15ba1ff9c0885836175afdcd03701e5a3e514ae1 (diff)
downloadtoolchain_gcc-5ea1e88a7f14a78a01d95f66e388eb15908a5225.tar.gz
toolchain_gcc-5ea1e88a7f14a78a01d95f66e388eb15908a5225.tar.bz2
toolchain_gcc-5ea1e88a7f14a78a01d95f66e388eb15908a5225.zip
[4.7] Add stack unwinding directives for __aeabi_idiv0 in libgcc.a
Change-Id: I32b4178ec6f09c08c5ecf70aabf7532e03774766
Diffstat (limited to 'gcc-4.7')
-rw-r--r--gcc-4.7/libgcc/Makefile.in2
-rw-r--r--gcc-4.7/libgcc/config/arm/lib1funcs.S6
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc-4.7/libgcc/Makefile.in b/gcc-4.7/libgcc/Makefile.in
index f38d5b4a2..dc47ab2e5 100644
--- a/gcc-4.7/libgcc/Makefile.in
+++ b/gcc-4.7/libgcc/Makefile.in
@@ -220,11 +220,13 @@ DECNUMINC =
endif
# Options to use when compiling libgcc2.a.
+# Adding -funwind-tables to debug idiv0 cases for Android
#
LIBGCC2_DEBUG_CFLAGS = -g
LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
$(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \
-fbuilding-libgcc -fno-stack-protector \
+ -funwind-tables \
$(INHIBIT_LIBC_CFLAGS)
# Additional options to use when compiling libgcc2.a.
diff --git a/gcc-4.7/libgcc/config/arm/lib1funcs.S b/gcc-4.7/libgcc/config/arm/lib1funcs.S
index 094d79afa..67918bed1 100644
--- a/gcc-4.7/libgcc/config/arm/lib1funcs.S
+++ b/gcc-4.7/libgcc/config/arm/lib1funcs.S
@@ -1323,10 +1323,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