Module Name: src
Committed By: matt
Date: Thu Sep 5 05:16:08 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/gen: divsi3.S udivsi3.S
Log Message:
Use __ARM_EABI__ and new __UNWIND_TABLES__ to decide when to use .cfi ops
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/gen/divsi3.S
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/arch/arm/gen/udivsi3.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/gen/divsi3.S
diff -u src/common/lib/libc/arch/arm/gen/divsi3.S:1.8 src/common/lib/libc/arch/arm/gen/divsi3.S:1.9
--- src/common/lib/libc/arch/arm/gen/divsi3.S:1.8 Thu Aug 22 19:25:00 2013
+++ src/common/lib/libc/arch/arm/gen/divsi3.S Thu Sep 5 05:16:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: divsi3.S,v 1.8 2013/08/22 19:25:00 matt Exp $ */
+/* $NetBSD: divsi3.S,v 1.9 2013/09/05 05:16:08 matt Exp $ */
/*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -29,19 +29,19 @@ ENTRY(__divsi3)
#elif !defined(__thumb__) || defined(_ARM_ARCH_T2)
b __divide
#else
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
.fnstart
.cfi_startproc
#endif
push {r4, lr}
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
.cfi_def_cfa_offset 8
.cfi_offset 14, -4
.cfi_offset 4, -8
#endif
bl __divide
pop {r4, pc}
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
.cfi_endproc
.fnend
#endif
Index: src/common/lib/libc/arch/arm/gen/udivsi3.S
diff -u src/common/lib/libc/arch/arm/gen/udivsi3.S:1.4 src/common/lib/libc/arch/arm/gen/udivsi3.S:1.5
--- src/common/lib/libc/arch/arm/gen/udivsi3.S:1.4 Thu Aug 22 19:25:00 2013
+++ src/common/lib/libc/arch/arm/gen/udivsi3.S Thu Sep 5 05:16:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udivsi3.S,v 1.4 2013/08/22 19:25:00 matt Exp $ */
+/* $NetBSD: udivsi3.S,v 1.5 2013/09/05 05:16:08 matt Exp $ */
/*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
@@ -29,12 +29,12 @@ ENTRY(__udivsi3)
#elif !defined(__thumb__) || defined(_ARM_ARCH_T2)
b __udivide
#else
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
.fnstart
.cfi_startproc
#endif
push {r4, lr}
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
.save {r4, lr}
.cfi_def_cfa_offset 8
.cfi_offset 14, -4
@@ -42,7 +42,7 @@ ENTRY(__udivsi3)
#endif
bl __udivide
pop {r4, pc}
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
.cfi_endproc
.fnend
#endif
