diff options
author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
---|---|---|
committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/libgcc/config/arm/lib1funcs.S | |
parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/libgcc/config/arm/lib1funcs.S')
-rw-r--r-- | gcc-4.9/libgcc/config/arm/lib1funcs.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc-4.9/libgcc/config/arm/lib1funcs.S b/gcc-4.9/libgcc/config/arm/lib1funcs.S index 762b0ec4f..de7b40252 100644 --- a/gcc-4.9/libgcc/config/arm/lib1funcs.S +++ b/gcc-4.9/libgcc/config/arm/lib1funcs.S @@ -1326,16 +1326,20 @@ LSYM(Lover12): ARM_FUNC_START div0 #endif +#if defined (__ANDROID__) /* ANDROID LOCAL BEGIN */ /* Adding stack unwinding directives to debug divide-by-0 errors */ .fnstart .save {r1, lr} +#endif do_push {r1, lr} mov r0, #SIGFPE bl SYM(raise) __PLT__ RETLDM r1 +#if defined (__ANDROID__) .fnend /* ANDROID LOCAL END */ +#endif #ifdef __ARM_EABI__ FUNC_END aeabi_ldiv0 |