From cb1875eb4ff755fe6c5d1909f64fc4be1ee396ab Mon Sep 17 00:00:00 2001
From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 20 Jan 2016 00:35:05 +0000
Subject: [PATCH] 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.
---
 src/string/arm/memcpy.c                        | 3 +++
 src/string/{armel/memcpy.s => arm/memcpy_le.S} | 4 ++++
 src/string/armel/memcpy.sub                    | 1 -
 src/string/armhf/memcpy.sub                    | 1 -
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 src/string/arm/memcpy.c
 rename src/string/{armel/memcpy.s => arm/memcpy_le.S} (99%)
 delete mode 100644 src/string/armel/memcpy.sub
 delete mode 100644 src/string/armhf/memcpy.sub

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
similarity index 99%
rename from src/string/armel/memcpy.s
rename to 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
-- 
2.20.1