Merge "Move dlerror out of a TLS slot and into a pthread_internal_t member."
diff --git a/libc/arch-arm/dynamic_function_dispatch.cpp b/libc/arch-arm/dynamic_function_dispatch.cpp
index 72fb41c..640f330 100644
--- a/libc/arch-arm/dynamic_function_dispatch.cpp
+++ b/libc/arch-arm/dynamic_function_dispatch.cpp
@@ -50,6 +50,7 @@
 
 static constexpr CpuVariantNames cpu_variant_names[] = {
     {"cortex-a76", kCortexA55},
+    {"kryo385", kCortexA55},
     {"cortex-a75", kCortexA55},
     {"kryo", kKryo},
     {"cortex-a73", kCortexA55},
diff --git a/tools/versioner/src/Android.bp b/tools/versioner/src/Android.bp
index 97e85f8..a78ab5d 100644
--- a/tools/versioner/src/Android.bp
+++ b/tools/versioner/src/Android.bp
@@ -3,9 +3,6 @@
 
     defaults: ["llvm-build-host-tools-defaults"],
 
-    // b/117120485 bugprone-exception-escape hangs with DeclarationDatabase.cpp
-    tidy_checks: ["-bugprone-exception-escape"],
-
     srcs: [
         "versioner.cpp",
         "Arch.cpp",