Module Name: src
Committed By: matt
Date: Tue Aug 20 08:07:30 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: strchr.S strlen.S strrchr.S
Log Message:
Use the arm versions of strlen/strchr/strrchr if compiling thumb2
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/arm/string/strchr.S \
src/common/lib/libc/arch/arm/string/strlen.S \
src/common/lib/libc/arch/arm/string/strrchr.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/strchr.S
diff -u src/common/lib/libc/arch/arm/string/strchr.S:1.3 src/common/lib/libc/arch/arm/string/strchr.S:1.4
--- src/common/lib/libc/arch/arm/string/strchr.S:1.3 Mon Aug 19 01:08:29 2013
+++ src/common/lib/libc/arch/arm/string/strchr.S Tue Aug 20 08:07:30 2013
@@ -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"
Index: src/common/lib/libc/arch/arm/string/strlen.S
diff -u src/common/lib/libc/arch/arm/string/strlen.S:1.3 src/common/lib/libc/arch/arm/string/strlen.S:1.4
--- src/common/lib/libc/arch/arm/string/strlen.S:1.3 Mon Aug 19 01:08:29 2013
+++ src/common/lib/libc/arch/arm/string/strlen.S Tue Aug 20 08:07:30 2013
@@ -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"
Index: src/common/lib/libc/arch/arm/string/strrchr.S
diff -u src/common/lib/libc/arch/arm/string/strrchr.S:1.3 src/common/lib/libc/arch/arm/string/strrchr.S:1.4
--- src/common/lib/libc/arch/arm/string/strrchr.S:1.3 Mon Aug 19 01:08:29 2013
+++ src/common/lib/libc/arch/arm/string/strrchr.S Tue Aug 20 08:07:30 2013
@@ -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"
