Remove assembler wmemmove(). The compiler turns our C wmemmove() into one shift instruction and a branch, which is plenty for a function no-one uses anyway. Why don't I just leave this alone, since we already have it? Because I'm looking at finishing the project of "switch to arm-optimized-routines" and getting rid of our assembler here, and Arm agrees that this isn't worth having optimized assembler for in their optimized assembler project, judging by its absence. Test: treehugger Change-Id: I985801241a8cbd7dbda51a447946affb1402effb
diff --git a/libc/Android.bp b/libc/Android.bp index 6042929..15825d6 100644 --- a/libc/Android.bp +++ b/libc/Android.bp
@@ -363,11 +363,6 @@ "upstream-freebsd/lib/libc/string/wmemset.c", ], arch: { - arm64: { - exclude_srcs: [ - "upstream-freebsd/lib/libc/string/wmemmove.c", - ], - }, x86: { exclude_srcs: [ "upstream-freebsd/lib/libc/string/wcschr.c", @@ -903,7 +898,6 @@ "arch-arm64/generic/bionic/memcpy.S", "arch-arm64/generic/bionic/memmove.S", "arch-arm64/generic/bionic/memset.S", - "arch-arm64/generic/bionic/wmemmove.S", "arch-arm64/bionic/__bionic_clone.S", "arch-arm64/bionic/_exit_with_stack_teardown.S",
diff --git a/libc/arch-arm64/generic/bionic/wmemmove.S b/libc/arch-arm64/generic/bionic/wmemmove.S deleted file mode 100644 index b130530..0000000 --- a/libc/arch-arm64/generic/bionic/wmemmove.S +++ /dev/null
@@ -1,32 +0,0 @@ -/* Copyright (c) 2014, Linaro Limited - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Linaro nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#define WMEMMOVE -#include "memmove.S" -#undef WMEMMOVE - -NOTE_GNU_PROPERTY()