diff --git a/compiler-rt/lib/scudo/standalone/CMakeLists.txt b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
index ad4a5e303267ed7c8531debc5d9b02e25ed7ff6a..bcd93d69b7c9a9a4deba7210a84e64a6d2a09ca0 100644
--- a/compiler-rt/lib/scudo/standalone/CMakeLists.txt
+++ b/compiler-rt/lib/scudo/standalone/CMakeLists.txt
@@ -135,7 +135,7 @@ if (COMPILER_RT_HAS_GWP_ASAN)
   add_dependencies(scudo_standalone gwp_asan)
   list(APPEND SCUDO_OBJECT_LIBS
        RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler
-       RTGwpAsanOptionsParser)
+       RTGwpAsanOptionsParser RTSanitizerCommon RTSanitizerCommonLibc)
 
   append_list_if(COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG -fno-omit-frame-pointer
                                                          -mno-omit-leaf-frame-pointer
diff --git a/compiler-rt/test/hwasan/TestCases/double-free.c b/compiler-rt/test/hwasan/TestCases/double-free.c
index 6d177fdef702909896f6904e3e9addd61da315f7..e16619d6ac0074cfc9a623c991807d280ce68c43 100644
--- a/compiler-rt/test/hwasan/TestCases/double-free.c
+++ b/compiler-rt/test/hwasan/TestCases/double-free.c
@@ -11,14 +11,14 @@ int main() {
   char * volatile x = (char*)malloc(40);
   free(x);
   free(x);
-  // CHECK: ERROR: HWAddressSanitizer: invalid-free on address {{.*}} at pc {{[0x]+}}[[PC:.*]] on thread T{{[0-9]+}}
+  // CHECK: ERROR: HWAddressSanitizer: invalid-free on address {{.*}} at pc {{[0x]+}}[[PC:.*]] on thread {{.*}}
   // CHECK: tags: [[PTR_TAG:..]]/[[MEM_TAG:..]] (ptr/mem)
   // CHECK: #0 {{[0x]+}}{{.*}}[[PC]]
   // If we instrument using calls (default on x86), free is not the top frame
   // of the fault. With TCO the free frame can be replaced with the interceptor.
   // CHECK: in {{.*}}free
   // CHECK: freed by thread {{.*}} here:
-  // CHECK: previously allocated here:
+  // CHECK: previously allocated by thread {{.*}} here:
   // CHECK: Memory tags around the buggy address (one tag corresponds to 16 bytes):
   // CHECK: =>{{.*}}[[MEM_TAG]]
   fprintf(stderr, "DONE\n");
diff --git a/compiler-rt/test/hwasan/TestCases/realloc-after-free.c b/compiler-rt/test/hwasan/TestCases/realloc-after-free.c
index c4bc48c9ccda2440c45c4ab5e2887f9074991d6f..ab0b92d39f699f16a6ef6fd6997f6dfdb9327ee2 100644
--- a/compiler-rt/test/hwasan/TestCases/realloc-after-free.c
+++ b/compiler-rt/test/hwasan/TestCases/realloc-after-free.c
@@ -19,7 +19,7 @@ int main(int argc, char **argv) {
 // CHECK: ERROR: HWAddressSanitizer: invalid-free on address
 // CHECK: tags: [[PTR_TAG:..]]/[[MEM_TAG:..]] (ptr/mem)
 // CHECK: freed by thread {{.*}} here:
-// CHECK: previously allocated here:
+// CHECK: previously allocated by thread {{.*}} here:
 // CHECK: Memory tags around the buggy address (one tag corresponds to 16 bytes):
 // CHECK: =>{{.*}}[[MEM_TAG]]
   fprintf(stderr, "DONE\n");
diff --git a/compiler-rt/test/hwasan/TestCases/tag_in_free.c b/compiler-rt/test/hwasan/TestCases/tag_in_free.c
index 51e8d015d36ed7ba33c77a1230a75cc91bea00b2..edf3956cf00983f8cd2fbfebb45236aa6dc1a4de 100644
--- a/compiler-rt/test/hwasan/TestCases/tag_in_free.c
+++ b/compiler-rt/test/hwasan/TestCases/tag_in_free.c
@@ -40,8 +40,8 @@ int main() {
 #ifdef FREE
   // FREE: READ of size 1 at
   // FREE: is located 0 bytes inside of 10-byte region
-  // FREE: freed by thread T0 here:
-  // FREE: previously allocated here:
+  // FREE: freed by thread {{.*}} here:
+  // FREE: previously allocated by thread {{.*}} here:
   char volatile y = p[0];
 #endif
 
diff --git a/compiler-rt/test/hwasan/TestCases/use-after-free.c b/compiler-rt/test/hwasan/TestCases/use-after-free.c
index 94a8939162d0d29d435a1b7bfe9d5a484391f103..655674f86c0cd178382301593a496f21d6df0947 100644
--- a/compiler-rt/test/hwasan/TestCases/use-after-free.c
+++ b/compiler-rt/test/hwasan/TestCases/use-after-free.c
@@ -35,7 +35,7 @@ int main() {
   // CHECK: #0 {{.*}} in {{.*}}free{{.*}} {{.*}}hwasan_allocation_functions.cpp
   // CHECK: #1 {{.*}} in main {{.*}}use-after-free.c:[[@LINE-19]]
 
-  // CHECK: previously allocated here:
+  // CHECK: previously allocated by thread {{.*}} here:
   // CHECK: #0 {{.*}} in {{.*}}malloc{{.*}} {{.*}}hwasan_allocation_functions.cpp
   // CHECK: #1 {{.*}} in main {{.*}}use-after-free.c:[[@LINE-24]]
   // CHECK: Memory tags around the buggy address (one tag corresponds to 16 bytes):
diff --git a/compiler-rt/test/tsan/tls_race.cpp b/compiler-rt/test/tsan/tls_race.cpp
index 0821680d0aaefa566189e1f19f109fee436588ed..a8d6143f38783f575aafbc8e9ff694bf90ba0c30 100644
--- a/compiler-rt/test/tsan/tls_race.cpp
+++ b/compiler-rt/test/tsan/tls_race.cpp
@@ -25,4 +25,4 @@ int main() {
 // CHECK-NetBSD:   Location is TLS of main thread.
 // CHECK-Darwin:   Location is heap block of size 4
 // OHOS_LOCAL
-// CHECK-OHOS:   Location is heap block of size
+// CHECK-OHOS:   Location is TLS of main thread.
diff --git a/compiler-rt/test/tsan/tls_race2.cpp b/compiler-rt/test/tsan/tls_race2.cpp
index b05547e6643fbc5f4513cc93ec6eae28a9d474e8..02b789075025ef4aa82a1099adc6a534b840df4b 100644
--- a/compiler-rt/test/tsan/tls_race2.cpp
+++ b/compiler-rt/test/tsan/tls_race2.cpp
@@ -34,5 +34,5 @@ int main() {
 // CHECK-NetBSD:   Location is TLS of thread T1.
 // CHECK-Darwin:   Location is heap block of size 4
 // OHOS_LOCAL
-// CHECK-OHOS:   Location is heap block of size
+// CHECK-OHOS:   Location is TLS of thread T1.
 // CHECK: DONE