Module Name: src
Committed By: matt
Date: Thu Sep 5 05:15:47 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: strcat_arm.S strlcat_arm.S
strlen_arm.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.4 -r1.5 src/common/lib/libc/arch/arm/string/strcat_arm.S \
src/common/lib/libc/arch/arm/string/strlcat_arm.S
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/string/strlen_arm.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/string/strcat_arm.S
diff -u src/common/lib/libc/arch/arm/string/strcat_arm.S:1.4 src/common/lib/libc/arch/arm/string/strcat_arm.S:1.5
--- src/common/lib/libc/arch/arm/string/strcat_arm.S:1.4 Thu Aug 22 19:25:00 2013
+++ src/common/lib/libc/arch/arm/string/strcat_arm.S Thu Sep 5 05:15:47 2013
@@ -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 @@ ENTRY(strcat)
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
Index: src/common/lib/libc/arch/arm/string/strlcat_arm.S
diff -u src/common/lib/libc/arch/arm/string/strlcat_arm.S:1.4 src/common/lib/libc/arch/arm/string/strlcat_arm.S:1.5
--- src/common/lib/libc/arch/arm/string/strlcat_arm.S:1.4 Thu Aug 22 19:25:00 2013
+++ src/common/lib/libc/arch/arm/string/strlcat_arm.S Thu Sep 5 05:15:47 2013
@@ -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 @@ ENTRY(strlcat)
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
Index: src/common/lib/libc/arch/arm/string/strlen_arm.S
diff -u src/common/lib/libc/arch/arm/string/strlen_arm.S:1.7 src/common/lib/libc/arch/arm/string/strlen_arm.S:1.8
--- src/common/lib/libc/arch/arm/string/strlen_arm.S:1.7 Thu Aug 22 19:25:00 2013
+++ src/common/lib/libc/arch/arm/string/strlen_arm.S Thu Sep 5 05:15:47 2013
@@ -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 @@ RCSID("$NetBSD: strlen_arm.S,v 1.7 2013/
.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 @@ ENTRY(FUNCNAME)
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
