Kaynağa Gözat

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.
Rich Felker 9 yıl önce
ebeveyn
işleme
cb1875eb4f

+ 3 - 0
src/string/arm/memcpy.c

@@ -0,0 +1,3 @@
+#if __ARMEB__
+#include "../memcpy.c"
+#endif

+ 4 - 0
src/string/armel/memcpy.s → 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

+ 0 - 1
src/string/armel/memcpy.sub

@@ -1 +0,0 @@
-memcpy.s

+ 0 - 1
src/string/armhf/memcpy.sub

@@ -1 +0,0 @@
-../armel/memcpy.s