summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2016-01-20 00:35:05 +0000
committerRich Felker <dalias@aerifal.cx>2016-01-20 00:35:05 +0000
commitcb1875eb4ff755fe6c5d1909f64fc4be1ee396ab (patch)
tree254b868756229957d618c13c98a2663b30779d35 /src
parent9514e70c60649ea13c25e1ac1e944cee7c82c9a7 (diff)
downloadmusl-cb1875eb4ff755fe6c5d1909f64fc4be1ee396ab.tar.gz
musl-cb1875eb4ff755fe6c5d1909f64fc4be1ee396ab.tar.bz2
musl-cb1875eb4ff755fe6c5d1909f64fc4be1ee396ab.tar.xz
musl-cb1875eb4ff755fe6c5d1909f64fc4be1ee396ab.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/string/arm/memcpy.c3
-rw-r--r--src/string/arm/memcpy_le.S (renamed from src/string/armel/memcpy.s)4
-rw-r--r--src/string/armel/memcpy.sub1
-rw-r--r--src/string/armhf/memcpy.sub1
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