[src/trunk]: src/common/lib/libc/arch/arm Use __ARM_EABI__ and new __UNWIND_T...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15742d37fcd4
branches:  trunk
changeset: 789725:15742d37fcd4
user:      matt <matt%NetBSD.org@localhost>
date:      Thu Sep 05 05:15:47 2013 +0000

description:
Use __ARM_EABI__ and new __UNWIND_TABLES__ to decide when to use .cfi ops

diffstat:

 common/lib/libc/arch/arm/gen/divsi3.S         |  8 ++++----
 common/lib/libc/arch/arm/gen/udivsi3.S        |  8 ++++----
 common/lib/libc/arch/arm/string/strcat_arm.S  |  6 +++---
 common/lib/libc/arch/arm/string/strlcat_arm.S |  8 ++++----
 common/lib/libc/arch/arm/string/strlen_arm.S  |  8 ++++----
 5 files changed, 19 insertions(+), 19 deletions(-)

diffs (161 lines):

diff -r 4f9a6d1d3162 -r 15742d37fcd4 common/lib/libc/arch/arm/gen/divsi3.S
--- a/common/lib/libc/arch/arm/gen/divsi3.S     Thu Sep 05 00:28:11 2013 +0000
+++ b/common/lib/libc/arch/arm/gen/divsi3.S     Thu Sep 05 05:15:47 2013 +0000
@@ -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 @@
 #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
diff -r 4f9a6d1d3162 -r 15742d37fcd4 common/lib/libc/arch/arm/gen/udivsi3.S
--- a/common/lib/libc/arch/arm/gen/udivsi3.S    Thu Sep 05 00:28:11 2013 +0000
+++ b/common/lib/libc/arch/arm/gen/udivsi3.S    Thu Sep 05 05:15:47 2013 +0000
@@ -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 @@
 #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 @@
 #endif
        bl      __udivide
        pop     {r4, pc}
-#ifdef __ARM_EABI__
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .cfi_endproc
        .fnend
 #endif
diff -r 4f9a6d1d3162 -r 15742d37fcd4 common/lib/libc/arch/arm/string/strcat_arm.S
--- a/common/lib/libc/arch/arm/string/strcat_arm.S      Thu Sep 05 00:28:11 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strcat_arm.S      Thu Sep 05 05:15:47 2013 +0000
@@ -33,12 +33,12 @@
  * Implementation of strcat using strlen/strcpy.
  */
 ENTRY(strcat)
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .fnstart
        .cfi_startproc
 #endif
        push    {r3-r5, lr}             /* save registers */
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .save   {r3-r5, lr}
        .cfi_def_cfa_offset 16
        .cfi_offset 14, -4
@@ -58,7 +58,7 @@
 
        mov     r0, r4                  /* restore dst as return value */
        pop     {r3-r5, pc}             /* restore registers */
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .cfi_endproc
        .fnend
 #endif
diff -r 4f9a6d1d3162 -r 15742d37fcd4 common/lib/libc/arch/arm/string/strlcat_arm.S
--- a/common/lib/libc/arch/arm/string/strlcat_arm.S     Thu Sep 05 00:28:11 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strlcat_arm.S     Thu Sep 05 05:15:47 2013 +0000
@@ -29,16 +29,16 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strlcat_arm.S,v 1.4 2013/08/22 19:25:00 matt Exp $")
+RCSID("$NetBSD: strlcat_arm.S,v 1.5 2013/09/05 05:15:47 matt Exp $")
 
 /* LINTSTUB: size_t strlcat(char *, const char *, size_t) */
 ENTRY(strlcat)
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .fnstart
        .cfi_startproc
 #endif
        push    {r4-r6, lr}
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .save   {r4-r6, lr}
        .cfi_def_cfa_offset 16
        .cfi_offset 14, -4
@@ -60,7 +60,7 @@
        bl      PLT_SYM(strlcpy)        /* attempt to copy src */
        adds    r0, r0, r5              /* add remaining to strlcpy return */
        pop     {r4-r6, pc}             /* restore registers and return */
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .cfi_endproc
        .fnend
 #endif
diff -r 4f9a6d1d3162 -r 15742d37fcd4 common/lib/libc/arch/arm/string/strlen_arm.S
--- a/common/lib/libc/arch/arm/string/strlen_arm.S      Thu Sep 05 00:28:11 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strlen_arm.S      Thu Sep 05 05:15:47 2013 +0000
@@ -29,7 +29,7 @@
 
 #include <machine/asm.h>
 
-RCSID("$NetBSD: strlen_arm.S,v 1.7 2013/08/22 19:25:00 matt Exp $")
+RCSID("$NetBSD: strlen_arm.S,v 1.8 2013/09/05 05:15:47 matt Exp $")
 
 #if defined(__thumb__) && !defined(_ARM_ARCH_T2)
 #error Only Thumb2 or ARM supported
@@ -55,13 +55,13 @@
 
        .text
 ENTRY(FUNCNAME)
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .fnstart
        .cfi_startproc
 #endif
 #ifdef STRNLEN
        push    {r4,r5}                 /* save some registers */
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .save   {r4,r5}
        .cfi_def_cfa_offset 8
        .cfi_offset 5, -4
@@ -173,7 +173,7 @@
        pop     {r4, r5}                /* restore registers */
        RET                             /* return */
 #endif
-#if defined(__ARM_EABI__) && (!defined(_KERNEL) && !defined(_STANDALONE))    
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
        .cfi_endproc
        .fnend
 #endif