Index: contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c
===================================================================
--- contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c
+++ contrib/llvm-project/compiler-rt/lib/builtins/clear_cache.c
@@ -130,7 +130,10 @@
     __asm __volatile("dsb ish");
   }
   __asm __volatile("isb sy");
-#elif defined(__powerpc64__)
+#elif defined(__powerpc__)
+  // Newer CPUs have a bigger line size made of multiple blocks, so the
+  // following value is a minimal common denominator for what used to be
+  // a single block cache line and is therefore inneficient.
   const size_t line_size = 32;
   const size_t len = (uintptr_t)end - (uintptr_t)start;
 
Index: lib/libclang_rt/Makefile
===================================================================
--- lib/libclang_rt/Makefile
+++ lib/libclang_rt/Makefile
@@ -35,6 +35,8 @@
 SUBDIR+=	asan-preinit
 SUBDIR+=	asan_cxx
 SUBDIR+=	asan_dynamic
+SUBDIR+=	stats
+SUBDIR+=	stats_client
 SUBDIR+=	ubsan_minimal
 SUBDIR+=	ubsan_standalone
 SUBDIR+=	ubsan_standalone_cxx