Merge "Copy the M_THREAD_DISABLE_MEM_INIT constant value into malloc.h."
diff --git a/libc/Android.bp b/libc/Android.bp
index 49b75c1..a761e3b 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -62,6 +62,8 @@
cppflags: [],
include_dirs: [
"bionic/libc/async_safe/include",
+ // For android_filesystem_config.h.
+ "system/core/libcutils/include",
],
header_libs: [
diff --git a/libc/platform/bionic/mte_kernel.h b/libc/platform/bionic/mte_kernel.h
index e8ef2a5..d81480a 100644
--- a/libc/platform/bionic/mte_kernel.h
+++ b/libc/platform/bionic/mte_kernel.h
@@ -54,4 +54,6 @@
#define PTRACE_PEEKMTETAGS 33
#define PTRACE_POKEMTETAGS 34
+#define NT_ARM_TAGGED_ADDR_CTRL 0x409
+
#endif
diff --git a/linker/Android.bp b/linker/Android.bp
index 08b2c7b..a51b73f 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -39,6 +39,9 @@
"linker_wrapper.cpp",
],
arch: {
+ arm64: {
+ srcs: ["arch/arm64/begin.S"],
+ },
x86_64: {
srcs: ["arch/x86_64/begin.S"],
},
diff --git a/tests/Android.bp b/tests/Android.bp
index 586ef34..8760256 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -44,6 +44,7 @@
// For glibc.
"-D__STDC_LIMIT_MACROS",
],
+ header_libs: ["libcutils_headers"],
// Ensure that the tests exercise shadow call stack support and
// the hint space PAC/BTI instructions.
arch: {
diff --git a/tests/utils.h b/tests/utils.h
index c1b7f65..acd8bc6 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -78,13 +78,8 @@
static inline bool running_with_native_bridge() {
#if defined(__BIONIC__)
-#if defined(__arm__)
- static const prop_info* pi = __system_property_find("ro.dalvik.vm.isa.arm");
+ static const prop_info* pi = __system_property_find("ro.dalvik.vm.isa." ABI_STRING);
return pi != nullptr;
-#elif defined(__aarch64__)
- static const prop_info* pi = __system_property_find("ro.dalvik.vm.isa.arm64");
- return pi != nullptr;
-#endif
#endif
return false;
}
diff --git a/tools/versioner/src/Driver.cpp b/tools/versioner/src/Driver.cpp
index 184c3d4..adf93c3 100644
--- a/tools/versioner/src/Driver.cpp
+++ b/tools/versioner/src/Driver.cpp
@@ -42,6 +42,7 @@
#include <llvm/ADT/SmallVector.h>
#include <llvm/ADT/StringRef.h>
#include <llvm/Option/Option.h>
+#include <llvm/Support/Host.h>
#include <llvm/Support/VirtualFileSystem.h>
#include "Arch.h"