[src/trunk]: src/common/lib/libc/arch/arm/string Use the arm versions of strl...

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

details:   https://anonhg.NetBSD.org/src/rev/b744196d72c3
branches:  trunk
changeset: 789484:b744196d72c3
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Aug 20 08:07:30 2013 +0000

description:
Use the arm versions of strlen/strchr/strrchr if compiling thumb2

diffstat:

 common/lib/libc/arch/arm/string/strchr.S  |  4 ++--
 common/lib/libc/arch/arm/string/strlen.S  |  6 ++++--
 common/lib/libc/arch/arm/string/strrchr.S |  4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 6c89ef997e6c -r b744196d72c3 common/lib/libc/arch/arm/string/strchr.S
--- a/common/lib/libc/arch/arm/string/strchr.S  Tue Aug 20 08:06:30 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strchr.S  Tue Aug 20 08:07:30 2013 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: strchr.S,v 1.3 2013/08/19 01:08:29 matt Exp $ */
+/* $NetBSD: strchr.S,v 1.4 2013/08/20 08:07:30 matt Exp $ */
 
 #include <machine/asm.h>
 
 STRONG_ALIAS(index, strchr)
 
-#if defined(_STANDALONE) || defined(__thumb__)
+#if defined(_STANDALONE) || (defined(__thumb__) && !defined(_ARM_ARCH_T2))
 #include "strchr_naive.S"
 #else
 #include "strchr_arm.S"
diff -r 6c89ef997e6c -r b744196d72c3 common/lib/libc/arch/arm/string/strlen.S
--- a/common/lib/libc/arch/arm/string/strlen.S  Tue Aug 20 08:06:30 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strlen.S  Tue Aug 20 08:07:30 2013 +0000
@@ -1,6 +1,8 @@
-/* $NetBSD: strlen.S,v 1.3 2013/08/19 01:08:29 matt Exp $ */
+/* $NetBSD: strlen.S,v 1.4 2013/08/20 08:07:30 matt Exp $ */
 
-#if defined(_STANDALONE) || defined(__thumb__)
+#include <arm/cdefs.h>
+
+#if defined(_STANDALONE) || (defined(__thumb__) && !defined(_ARM_ARCH_T2))
 #include "strlen_naive.S"
 #else
 #include "strlen_arm.S"
diff -r 6c89ef997e6c -r b744196d72c3 common/lib/libc/arch/arm/string/strrchr.S
--- a/common/lib/libc/arch/arm/string/strrchr.S Tue Aug 20 08:06:30 2013 +0000
+++ b/common/lib/libc/arch/arm/string/strrchr.S Tue Aug 20 08:07:30 2013 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: strrchr.S,v 1.3 2013/08/19 01:08:29 matt Exp $ */
+/* $NetBSD: strrchr.S,v 1.4 2013/08/20 08:07:30 matt Exp $ */
 
 #include <machine/asm.h>
 
 STRONG_ALIAS(rindex, strrchr)  
 
-#if defined(_STANDALONE) || defined(__thumb__)
+#if defined(_STANDALONE) || (defined(__thumb__) && !defined(_ARM_ARCH_T2))
 #include "strrchr_naive.S"
 #else
 #include "strrchr_arm.S"