Merge "[MTE] use GTEST_SKIP on non-MTE hw for memtag_stack_test"
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh
index 7e49cde..12f60e5 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -43,7 +43,7 @@
ANDROID_KERNEL_BRANCH="android-mainline"
KERNEL_DIR=""
KERNEL_DOWNLOAD=0
-ARCH_LIST=("arm" "arm64" "x86")
+ARCH_LIST=("arm" "arm64" "riscv" "x86")
ANDROID_KERNEL_DIR="external/kernel-headers/original"
SKIP_GENERATION=0
VERIFY_HEADERS_ONLY=0
diff --git a/linker/linker.cpp b/linker/linker.cpp
index c6588d2..d533ac3 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1568,18 +1568,16 @@
task->set_extinfo(is_dt_needed ? nullptr : extinfo);
task->set_dt_needed(is_dt_needed);
- LD_LOG(kLogDlopen, "find_libraries(ns=%s): task=%s, is_dt_needed=%d", ns->get_name(),
- task->get_name(), is_dt_needed);
-
// Note: start from the namespace that is stored in the LoadTask. This namespace
// is different from the current namespace when the LoadTask is for a transitive
// dependency and the lib that created the LoadTask is not found in the
- // current namespace but in one of the linked namespace.
- if (!find_library_internal(const_cast<android_namespace_t*>(task->get_start_from()),
- task,
- &zip_archive_cache,
- &load_tasks,
- rtld_flags)) {
+ // current namespace but in one of the linked namespaces.
+ android_namespace_t* start_ns = const_cast<android_namespace_t*>(task->get_start_from());
+
+ LD_LOG(kLogDlopen, "find_library_internal(ns=%s@%p): task=%s, is_dt_needed=%d",
+ start_ns->get_name(), start_ns, task->get_name(), is_dt_needed);
+
+ if (!find_library_internal(start_ns, task, &zip_archive_cache, &load_tasks, rtld_flags)) {
return false;
}