Revert "libc: point some x86_64 function impls at llvm-libc"
Revert submission 3324477-llvm-libc-intro-baseline
Reason for revert: Droidmonitor created revert due to b/379681564. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:3324477-llvm-libc-intro-baseline
Change-Id: Ib7fa5a22826717659603fc73d6696216f439b131
diff --git a/libc/Android.bp b/libc/Android.bp
index cb38773..5ae8c4f 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -471,6 +471,7 @@
"upstream-netbsd/lib/libc/regex/regerror.c",
"upstream-netbsd/lib/libc/regex/regexec.c",
"upstream-netbsd/lib/libc/regex/regfree.c",
+ "upstream-netbsd/lib/libc/stdlib/bsearch.c",
"upstream-netbsd/lib/libc/stdlib/drand48.c",
"upstream-netbsd/lib/libc/stdlib/erand48.c",
"upstream-netbsd/lib/libc/stdlib/jrand48.c",
@@ -625,6 +626,8 @@
"upstream-openbsd/lib/libc/string/memchr.c",
"upstream-openbsd/lib/libc/string/memrchr.c",
"upstream-openbsd/lib/libc/string/stpncpy.c",
+ "upstream-openbsd/lib/libc/string/strlcat.c",
+ "upstream-openbsd/lib/libc/string/strlcpy.c",
"upstream-openbsd/lib/libc/string/strncat.c",
"upstream-openbsd/lib/libc/string/strncmp.c",
"upstream-openbsd/lib/libc/string/strncpy.c",
@@ -634,6 +637,8 @@
srcs: [
"upstream-openbsd/lib/libc/string/strcat.c",
"upstream-openbsd/lib/libc/string/stpncpy.c",
+ "upstream-openbsd/lib/libc/string/strlcat.c",
+ "upstream-openbsd/lib/libc/string/strlcpy.c",
"upstream-openbsd/lib/libc/string/strncat.c",
"upstream-openbsd/lib/libc/string/strncpy.c",
],
@@ -642,6 +647,8 @@
srcs: [
"upstream-openbsd/lib/libc/string/memrchr.c",
"upstream-openbsd/lib/libc/string/stpncpy.c",
+ "upstream-openbsd/lib/libc/string/strlcat.c",
+ "upstream-openbsd/lib/libc/string/strlcpy.c",
],
},
x86: {
@@ -651,7 +658,10 @@
},
x86_64: {
srcs: [
- // x86_64 has custom/llvm-libc implementations of all of these.
+ "upstream-openbsd/lib/libc/string/memchr.c",
+ "upstream-openbsd/lib/libc/string/memrchr.c",
+ "upstream-openbsd/lib/libc/string/strlcat.c",
+ "upstream-openbsd/lib/libc/string/strlcpy.c",
],
},
},
@@ -1173,6 +1183,8 @@
"arch-x86/string/ssse3-memcmp-atom.S",
"arch-x86/string/ssse3-strcat-atom.S",
"arch-x86/string/ssse3-strcmp-atom.S",
+ "arch-x86/string/ssse3-strlcat-atom.S",
+ "arch-x86/string/ssse3-strlcpy-atom.S",
"arch-x86/string/ssse3-strncat-atom.S",
"arch-x86/string/ssse3-strncmp-atom.S",
@@ -1203,6 +1215,11 @@
"arch-x86_64/string/sse4-memcmp-slm.S",
"arch-x86_64/string/ssse3-strcmp-slm.S",
"arch-x86_64/string/ssse3-strncmp-slm.S",
+
+ "bionic/strchr.cpp",
+ "bionic/strchrnul.cpp",
+ "bionic/strnlen.cpp",
+ "bionic/strrchr.cpp",
],
},
},
@@ -1221,7 +1238,6 @@
generated_headers: ["generated_android_ids"],
whole_static_libs: [
- "//external/llvm-libc:llvmlibc",
"libsystemproperties",
],
@@ -2149,7 +2165,6 @@
},
},
whole_static_libs: [
- "//external/llvm-libc:llvmlibc",
"libarm-optimized-routines-mem",
"libc_netbsd",
],