diff options
| -rw-r--r-- | src/string/arm/memcpy.c | 3 | ||||
| -rw-r--r-- | src/string/arm/memcpy_le.S (renamed from src/string/armel/memcpy.s) | 4 | ||||
| -rw-r--r-- | src/string/armel/memcpy.sub | 1 | ||||
| -rw-r--r-- | src/string/armhf/memcpy.sub | 1 |
4 files changed, 7 insertions, 2 deletions
diff --git a/src/string/arm/memcpy.c b/src/string/arm/memcpy.c new file mode 100644 index 00000000..041614f4 --- /dev/null +++ b/src/string/arm/memcpy.c @@ -0,0 +1,3 @@ +#if __ARMEB__ +#include "../memcpy.c" +#endif diff --git a/src/string/armel/memcpy.s b/src/string/arm/memcpy_le.S index b16be0d6..4db48445 100644 --- a/src/string/armel/memcpy.s +++ b/src/string/arm/memcpy_le.S @@ -1,3 +1,5 @@ +#ifndef __ARMEB__ + /* * Copyright (C) 2008 The Android Open Source Project * All rights reserved. @@ -377,3 +379,5 @@ copy_last_3_and_return: add sp, sp, #28 ldmfd sp!, {r0, r4, lr} bx lr + +#endif diff --git a/src/string/armel/memcpy.sub b/src/string/armel/memcpy.sub deleted file mode 100644 index 543f583f..00000000 --- a/src/string/armel/memcpy.sub +++ /dev/null @@ -1 +0,0 @@ -memcpy.s diff --git a/src/string/armhf/memcpy.sub b/src/string/armhf/memcpy.sub deleted file mode 100644 index add0590c..00000000 --- a/src/string/armhf/memcpy.sub +++ /dev/null @@ -1 +0,0 @@ -../armel/memcpy.s |