Merge "Remove unused NetBSD reallocarr()." into main
diff --git a/libc/Android.bp b/libc/Android.bp
index 270d2d1..f13a76c 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2078,6 +2078,7 @@
// This library contains the following unresolved symbols:
// __errno
+// __x86_shared_cache_size_half (x86_64 only)
// abort
// async_safe_fatal_va_list
cc_library_static {
@@ -2097,11 +2098,33 @@
"bionic/strtol.cpp",
],
arch: {
+ arm: {
+ enabled: false,
+ },
arm64: {
srcs: [
"arch-arm64/string/__memcpy_chk.S",
],
},
+ x86: {
+ enabled: false,
+ },
+ x86_64: {
+ srcs: [
+ "arch-x86_64/string/sse2-memmove-slm.S",
+ "arch-x86_64/string/sse2-memset-slm.S",
+ "arch-x86_64/string/sse2-stpcpy-slm.S",
+ "arch-x86_64/string/sse2-stpncpy-slm.S",
+ "arch-x86_64/string/sse2-strcat-slm.S",
+ "arch-x86_64/string/sse2-strcpy-slm.S",
+ "arch-x86_64/string/sse2-strlen-slm.S",
+ "arch-x86_64/string/sse2-strncat-slm.S",
+ "arch-x86_64/string/sse2-strncpy-slm.S",
+ "arch-x86_64/string/sse4-memcmp-slm.S",
+ "arch-x86_64/string/ssse3-strcmp-slm.S",
+ "arch-x86_64/string/ssse3-strncmp-slm.S",
+ ],
+ },
},
whole_static_libs: [
"//external/llvm-libc:llvmlibc",
diff --git a/libc/upstream-openbsd/android/include/openbsd-compat.h b/libc/upstream-openbsd/android/include/openbsd-compat.h
index fa0831f..b408390 100644
--- a/libc/upstream-openbsd/android/include/openbsd-compat.h
+++ b/libc/upstream-openbsd/android/include/openbsd-compat.h
@@ -48,11 +48,6 @@
#define __LIBC_HIDDEN__ __attribute__((visibility("hidden")))
#endif
-/* OpenBSD has this in paths.h. But this directory doesn't normally exist.
- * Even when it does exist, only the 'shell' user has permissions.
- */
-#define _PATH_TMP "/data/local/tmp/"
-
__LIBC_HIDDEN__ extern char* __findenv(const char*, int, int*);
__LIBC_HIDDEN__ extern char* _mktemp(char*);