adapt build of arm memcpy asm not to use .sub files

this depends on commit 9f5eb77992b42d484d69e879d24ef86466f20f21, which
made it possible to use a .c file for arch-specific replacements, and on
commit 2f853dd6b9a95d5b13ee8f9df762125e0588df5d, the out-of-tree build
support, which made it so that src/*/$(ARCH)/* 'replacement' files get
used even if they don't match the base name of a .c file in the parent
directory.

diff --git a/src/string/arm/memcpy.c b/src/string/arm/memcpy.c
new file mode 100644 (file)
index 0000000..041614f
--- /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
similarity index 99%
rename from src/string/armel/memcpy.s
rename to src/string/arm/memcpy_le.S
index b16be0d66d4cbaff1941489a03118ff3af4335c7..4db48445700b42da5b2a624645e637e031c47a54 100644 (file)
--- 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 (file)
index 543f583..0000000
--- 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 (file)
index add0590..0000000
--- a/src/string/armhf/memcpy.sub
+++ /dev/null
@@ -1 +0,0 @@
-../armel/memcpy.s