aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9/libgcc/config/arm
diff options
context:
space:
mode:
Diffstat (limited to 'gcc-4.9/libgcc/config/arm')
-rw-r--r--gcc-4.9/libgcc/config/arm/bpabi-lib.h4
-rw-r--r--gcc-4.9/libgcc/config/arm/lib1funcs.S4
-rw-r--r--gcc-4.9/libgcc/config/arm/sfp-machine.h8
3 files changed, 12 insertions, 4 deletions
diff --git a/gcc-4.9/libgcc/config/arm/bpabi-lib.h b/gcc-4.9/libgcc/config/arm/bpabi-lib.h
index 193cc5604..d6e779690 100644
--- a/gcc-4.9/libgcc/config/arm/bpabi-lib.h
+++ b/gcc-4.9/libgcc/config/arm/bpabi-lib.h
@@ -14,6 +14,10 @@
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
License for more details.
+ Under Section 7 of GPL version 3, you are granted additional
+ permissions described in the GCC Runtime Library Exception, version
+ 3.1, as published by the Free Software Foundation.
+
You should have received a copy of the GNU General Public License and
a copy of the GCC Runtime Library Exception along with this program;
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
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
diff --git a/gcc-4.9/libgcc/config/arm/sfp-machine.h b/gcc-4.9/libgcc/config/arm/sfp-machine.h
index 4f2b15d7e..b7b5171e7 100644
--- a/gcc-4.9/libgcc/config/arm/sfp-machine.h
+++ b/gcc-4.9/libgcc/config/arm/sfp-machine.h
@@ -21,10 +21,10 @@ typedef int __gcc_CMPtype __attribute__ ((mode (__libgcc_cmp_return__)));
/* According to RTABI, QNAN is only with the most significant bit of the
significand set, and all other significand bits zero. */
-#define _FP_NANFRAC_H 0
-#define _FP_NANFRAC_S 0
-#define _FP_NANFRAC_D 0, 0
-#define _FP_NANFRAC_Q 0, 0, 0, 0
+#define _FP_NANFRAC_H _FP_QNANBIT_H
+#define _FP_NANFRAC_S _FP_QNANBIT_S
+#define _FP_NANFRAC_D _FP_QNANBIT_D, 0
+#define _FP_NANFRAC_Q _FP_QNANBIT_Q, 0, 0, 0
#define _FP_NANSIGN_H 0
#define _FP_NANSIGN_S 0
#define _FP_NANSIGN_D 0