commit 7d188ce0feda07f3e0cf6bdbe4e52efe224bb39f
author Elliott Hughes <enh@google.com> Fri Mar 04 03:12:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 04 03:12:35 2016 +0000
tree b641c58067a39ed439b3e6c76fd535402c51ccaa
parent 5f67f8ae9ded09b1eb68e54a1b3a226c35e10166
parent a80ddc8a34b913f0fdbb2c5febe61b8a9f0e6015

Merge "Fix x86-64 __memset_chk."

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 89a41cb..ca8a4d5 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -793,7 +793,6 @@
         "bionic/setjmp_cookie.cpp",
 
         "bionic/__memcpy_chk.cpp",
-        "bionic/__memset_chk.cpp",
         "bionic/__strcat_chk.cpp",
         "bionic/__strcpy_chk.cpp",
         "bionic/strchr.cpp",
@@ -825,7 +824,6 @@
             ],
             exclude_srcs: [
                 "bionic/__memcpy_chk.cpp",
-                "bionic/__memset_chk.cpp",
             ],
             cortex_a7: {
                 srcs: [
@@ -1075,7 +1073,6 @@
                 "arch-mips/string/strlen.c",
 
                 "arch-mips/bionic/__bionic_clone.S",
-                "arch-mips/bionic/bzero.S",
                 "arch-mips/bionic/cacheflush.cpp",
                 "arch-mips/bionic/_exit_with_stack_teardown.S",
                 "arch-mips/bionic/libgcc_compat.c",
@@ -1124,8 +1121,6 @@
                 "arch-x86/atom/string/sse2-wcsrchr-atom.S",
                 "arch-x86/atom/string/sse2-wcslen-atom.S",
                 "arch-x86/atom/string/sse2-wcscmp-atom.S",
-                "arch-x86/silvermont/string/sse2-bcopy-slm.S",
-                "arch-x86/silvermont/string/sse2-bzero-slm.S",
                 "arch-x86/silvermont/string/sse2-memcpy-slm.S",
                 "arch-x86/silvermont/string/sse2-memmove-slm.S",
                 "arch-x86/silvermont/string/sse2-memset-slm.S",
@@ -1151,10 +1146,8 @@
             ],
             atom: {
                 srcs: [
-                    "arch-x86/atom/string/sse2-bzero-atom.S",
                     "arch-x86/atom/string/sse2-memset-atom.S",
                     "arch-x86/atom/string/sse2-strlen-atom.S",
-                    "arch-x86/atom/string/ssse3-bcopy-atom.S",
                     "arch-x86/atom/string/ssse3-memcmp-atom.S",
                     "arch-x86/atom/string/ssse3-memcpy-atom.S",
                     "arch-x86/atom/string/ssse3-memmove-atom.S",
@@ -1164,8 +1157,6 @@
                 ],
                 exclude_srcs: [
                     "arch-x86/generic/string/memcmp.S",
-                    "arch-x86/silvermont/string/sse2-bcopy-slm.S",
-                    "arch-x86/silvermont/string/sse2-bzero-slm.S",
                     "arch-x86/silvermont/string/sse2-memcpy-slm.S",
                     "arch-x86/silvermont/string/sse2-memmove-slm.S",
                     "arch-x86/silvermont/string/sse2-memset-slm.S",