Module Name:    src
Committed By:   matt
Date:           Tue Aug 20 08:08:59 UTC 2013

Modified Files:
        src/common/lib/libc/arch/arm/string: strnlen.S

Log Message:
Use the arm versions of strnlen if compiling thumb2


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/string/strnlen.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/strnlen.S
diff -u src/common/lib/libc/arch/arm/string/strnlen.S:1.2 src/common/lib/libc/arch/arm/string/strnlen.S:1.3
--- src/common/lib/libc/arch/arm/string/strnlen.S:1.2	Mon Aug 19 01:08:29 2013
+++ src/common/lib/libc/arch/arm/string/strnlen.S	Tue Aug 20 08:08:59 2013
@@ -1,8 +1,10 @@
-/* $NetBSD: strnlen.S,v 1.2 2013/08/19 01:08:29 matt Exp $ */
+/* $NetBSD: strnlen.S,v 1.3 2013/08/20 08:08:59 matt Exp $ */
+
+#include <arm/cdefs.h>		/* for _ARM_ARCH_T2 */
 
 #define	STRNLEN
 
-#if defined(_STANDALONE) || defined(__thumb__)
+#if defined(_STANDALONE) || (defined(__thumb__) && !defined(_ARM_ARCH_T2))
 #include "strlen_naive.S"
 #else
 #include "strlen_arm.S"

Reply via email to