From 9067a3006ea2f84395ab23a1dd30191387312e0c Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 17 Dec 2016 19:39:28 -0500 Subject: 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. --- src/string/arm/memcpy.c | 2 +- src/string/arm/memcpy_le.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/string/arm/memcpy.c b/src/string/arm/memcpy.c index 041614f4..f703c9bd 100644 --- 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 4db48445..9cfbcb2a 100644 --- 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 -- cgit v1.2.1