commit 023e4e784041e6fb977afe119f8faace01140992
author Elliott Hughes <enh@google.com> Thu Nov 17 19:27:02 2022 +0000
committer Elliott Hughes <enh@google.com> Thu Nov 17 19:28:06 2022 +0000
tree 7795be5d52068eb820703ee8dc4f6008b5df5c1e
parent 361ab5beabde904631fcb4d3e66c006754a5470f

Move to arm-optimized-routines memset().

This one's a bit simpler, because there is only one upstream memset()
implementation.

Test: treehugger
Change-Id: I2536d0eb72adaacfa6a0e40d2bd29fc833988c16

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 53fd78e..82fc0bc 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -811,8 +811,8 @@
         arm64: {
             cflags: ["-DHAVE_ASSEMBLER___MEMCPY_CHK"],
             srcs: [
-                "arch-arm64/generic/bionic/__memcpy_chk.S",
-                "arch-arm64/generic/bionic/__memset_chk.S",
+                "arch-arm64/string/__memcpy_chk.S",
+                "arch-arm64/string/__memset_chk.S",
             ],
         },
     },
@@ -896,8 +896,6 @@
         },
         arm64: {
             srcs: [
-                "arch-arm64/generic/bionic/memset.S",
-
                 "arch-arm64/bionic/__bionic_clone.S",
                 "arch-arm64/bionic/_exit_with_stack_teardown.S",
                 "arch-arm64/bionic/setjmp.S",
@@ -905,7 +903,6 @@
                 "arch-arm64/bionic/vfork.S",
             ],
             exclude_srcs: [
-                "bionic/__memcpy_chk.cpp",
                 "bionic/strchr.cpp",
                 "bionic/strchrnul.cpp",
                 "bionic/strnlen.c",