disable use of arm memcpy asm if building as thumb code

the thumb incompatibilities in the asm are probably only minor and
should be fixable, but for now just use the C version.

diff --git a/src/string/arm/memcpy.c b/src/string/arm/memcpy.c
index 041614f4ba3adaae3dfc31a7304846510e43162d..f703c9bdf7c7b4cb516886e6c8b39f58a76aaaa6 100644 (file)
--- a/src/string/arm/memcpy.c
+++ b/src/string/arm/memcpy.c
@@ -1,3 +1,3 @@
-#if __ARMEB__
+#if __ARMEB__ || __thumb__
 #include "../memcpy.c"
 #endif

diff --git a/src/string/arm/memcpy_le.S b/src/string/arm/memcpy_le.S
index 4db48445700b42da5b2a624645e637e031c47a54..9cfbcb2ab7887ba9f8e0f9fe9e7b4417d276a1e7 100644 (file)
--- a/src/string/arm/memcpy_le.S
+++ b/src/string/arm/memcpy_le.S
@@ -1,4 +1,4 @@
-#ifndef __ARMEB__
+#if !__ARMEB__ && !__thumb__
 
 /*
  * Copyright (C) 2008 The Android Open Source Project