From 61e4023f772c8d2cbd7bd68ccdded124257efc7c Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Tue, 20 Aug 2013 21:35:24 +0000
Subject: [PATCH] If compiling standalone with Thumb, use the thumb version
 instead of the naive version.

---
 common/lib/libc/arch/arm/string/strcpy.S  | 6 +++++-
 common/lib/libc/arch/arm/string/strlcpy.S | 6 +++++-
 common/lib/libc/arch/arm/string/strncpy.S | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/lib/libc/arch/arm/string/strcpy.S b/common/lib/libc/arch/arm/string/strcpy.S
index d8c92bf46ff2..9585c97a1612 100644
--- a/common/lib/libc/arch/arm/string/strcpy.S
+++ b/common/lib/libc/arch/arm/string/strcpy.S
@@ -1,7 +1,11 @@
-/* $NetBSD: strcpy.S,v 1.4 2013/01/10 02:13:49 matt Exp $ */
+/* $NetBSD: strcpy.S,v 1.5 2013/08/20 21:35:24 matt Exp $ */
 
 #if defined(_STANDALONE)
+#ifdef __thumb__
+#include "strcpy_thumb.S"
+#else
 #include "strcpy_naive.S"
+#endif
 #else
 #include "strcpy_arm.S"
 #endif
diff --git a/common/lib/libc/arch/arm/string/strlcpy.S b/common/lib/libc/arch/arm/string/strlcpy.S
index fa903d6934bb..83708ac4b9e1 100644
--- a/common/lib/libc/arch/arm/string/strlcpy.S
+++ b/common/lib/libc/arch/arm/string/strlcpy.S
@@ -1,9 +1,13 @@
-/* $NetBSD: strlcpy.S,v 1.4 2013/01/10 06:52:35 matt Exp $ */
+/* $NetBSD: strlcpy.S,v 1.5 2013/08/20 21:35:24 matt Exp $ */
 
 #define STRLCPY
 
 #if defined(_STANDALONE)
+#if defined(__thumb__)
+#include "strcpy_thumb.S"
+#else
 #include "strcpy_naive.S"
+#endif
 #else
 #include "strcpy_arm.S"
 #endif
diff --git a/common/lib/libc/arch/arm/string/strncpy.S b/common/lib/libc/arch/arm/string/strncpy.S
index 3059e7eec7db..dc3465e0494b 100644
--- a/common/lib/libc/arch/arm/string/strncpy.S
+++ b/common/lib/libc/arch/arm/string/strncpy.S
@@ -1,9 +1,13 @@
-/* $NetBSD: strncpy.S,v 1.2 2013/01/10 02:13:49 matt Exp $ */
+/* $NetBSD: strncpy.S,v 1.3 2013/08/20 21:35:24 matt Exp $ */
 
 #define STRNCPY
 
 #if defined(_STANDALONE)
+#if defined(__thumb__)
+#include "strcpy_thumb.S"
+#else
 #include "strcpy_naive.S"
+#endif
 #else
 #include "strcpy_arm.S"
 #endif