diff --git a/compiler-rt/lib/asan/asan_report.cpp b/compiler-rt/lib/asan/asan_report.cpp
index 2a55d6c0978d88c282ddc77f5d4708568c89b616..8ba48c51df6314bd423b7f3b9e044e0f1f0e6c0a 100644
--- a/compiler-rt/lib/asan/asan_report.cpp
+++ b/compiler-rt/lib/asan/asan_report.cpp
@@ -191,6 +191,7 @@ class ScopedInErrorReport {
       Report("ABORTING\n");
       Die();
     }
+    Report("End Asan report\n"); // OHOS_LOCAL
   }
 
   void ReportError(const ErrorDescription &description) {
diff --git a/compiler-rt/lib/asan/asan_rtl.cpp b/compiler-rt/lib/asan/asan_rtl.cpp
index 68683406314987b8520093a2c501a7b91f1e80fd..cbbdcf7914b0a149e847e753abbee8fd35cf4afb 100644
--- a/compiler-rt/lib/asan/asan_rtl.cpp
+++ b/compiler-rt/lib/asan/asan_rtl.cpp
@@ -63,6 +63,7 @@ static void AsanDie() {
         UnmapOrDie((void*)kLowShadowBeg, kHighShadowEnd - kLowShadowBeg);
     }
   }
+  Report("End Asan report (AsanDie)\n"); // OHOS_LOCAL
 }
 
 static void CheckUnwind() {
diff --git a/compiler-rt/lib/hwasan/hwasan_report.cpp b/compiler-rt/lib/hwasan/hwasan_report.cpp
index 66d3d155d409438cf6e46c59ee746fbded3fad18..a59d5fef9791c2f0f2e71d80a583b5f71876733b 100644
--- a/compiler-rt/lib/hwasan/hwasan_report.cpp
+++ b/compiler-rt/lib/hwasan/hwasan_report.cpp
@@ -56,6 +56,7 @@ class ScopedReport {
     if (common_flags()->print_module_map >= 2 ||
         (fatal && common_flags()->print_module_map))
       DumpProcessMap();
+    Report("End Hwasan report\n"); // OHOS_LOCAL
     if (fatal)
       Die();
   }
diff --git a/compiler-rt/lib/tsan/rtl/tsan_report.cpp b/compiler-rt/lib/tsan/rtl/tsan_report.cpp
index 3b0bddc33a4348245ec8a252416c854a5e13f6b5..b5481eb8b340c3367ae549d93570ebc409000642 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_report.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_report.cpp
@@ -469,6 +469,7 @@ void PrintReport(const ReportDesc *rep) {
     }
   }
   Printf("==================\n");
+  Report("End Tsan report\n"); // OHOS_LOCAL
 }
 
 #endif
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp b/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
index ff3bb33eb134f29bf35e6cc5332008d6ee543ca2..5b4c7a0e4bdb1af84e7a9e74acd4b23a92849d1a 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cpp
@@ -796,6 +796,7 @@ int Finalize(ThreadState *thr) {
     PrintMatchedSuppressions();
 
   failed = OnFinalize(failed);
+  Report("End Tsan report (Finalize)\n"); // OHOS_LOCAL
 
   return failed ? common_flags()->exitcode : 0;
 }
diff --git a/compiler-rt/lib/ubsan/ubsan_handlers.cpp b/compiler-rt/lib/ubsan/ubsan_handlers.cpp
index e201e6bba22078e3d873aeb5792b98ecd860cdaa..faafa92423bdb43e1e7f4099b6f27f4686d0f4a7 100644
--- a/compiler-rt/lib/ubsan/ubsan_handlers.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_handlers.cpp
@@ -902,6 +902,7 @@ void __ubsan::__ubsan_handle_cfi_check_fail(CFICheckFailData *Data,
     handleCFIBadIcall(Data, Value, Opts);
   else
     __ubsan_handle_cfi_bad_type(Data, Value, ValidVtable, Opts);
+  Report("End CFI report\n"); // OHOS_LOCAL
 }
 
 void __ubsan::__ubsan_handle_cfi_check_fail_abort(CFICheckFailData *Data,
diff --git a/compiler-rt/lib/ubsan/ubsan_init.cpp b/compiler-rt/lib/ubsan/ubsan_init.cpp
index 01080567331ed894bf855f01b0b3a69720c63fd6..54ff2b450519ff65310719fb1bb3f83e49f90848 100644
--- a/compiler-rt/lib/ubsan/ubsan_init.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_init.cpp
@@ -37,6 +37,7 @@ static void CommonInit() {
 static void UbsanDie() {
   if (common_flags()->print_module_map >= 1)
     DumpProcessMap();
+  Report("End CFI report (UbsanDie)\n"); // OHOS_LOCAL
 }
 
 static void CommonStandaloneInit() {
diff --git a/llvm-build/MakeLiblzma b/llvm-build/MakeLiblzma
index b78b86f3496b6b89671c28e07302c31bf3e3d67e..d3ba203c43708d9d4546865106e70c603587ed10 100644
--- a/llvm-build/MakeLiblzma
+++ b/llvm-build/MakeLiblzma
@@ -31,9 +31,9 @@ TARGET_A := liblzma.dll.a
 else
 ifeq ($(findstring darwin,$(TARGET_TRIPLE)),darwin)
 SDKROOT := $(shell xcrun --sdk macosx --show-sdk-path)
-CFLAGS := -D_7ZIP_ST -Wall -Werror -Wno-empty-body -Wno-enum-conversion -Wno-logical-op-parentheses -Wno-self-assign -fPIC
-LDFLAGS := -dynamiclib -fuse-ld=lld -Wl,-syslibroot,$(SDKROOT) -install_name @rpath/liblzma.dylib
-TARGET := liblzma.dylib
+CFLAGS := -D_7ZIP_ST -Wall -Werror -Wno-empty-body -Wno-enum-conversion -Wno-logical-op-parentheses -Wno-self-assign -fPIC -current_version 22.0 -compatibility_version 22.0
+LDFLAGS := -dynamiclib -fuse-ld=lld -Wl,-syslibroot,$(SDKROOT) -install_name @rpath/liblzma.22.0.dylib
+TARGET := liblzma.22.0.dylib
 else
 $(warning *** warning: TARGET_TRIPLE $(TARGET_TRIPLE) has not been set in rights)
 endif
diff --git a/llvm-build/build.py b/llvm-build/build.py
index 92b11a801b6b7d4e85cd2ffbd974b3b2c78d44d3..9daf1c4af43fd875c1f654f54f62d85d790ef079 100755
--- a/llvm-build/build.py
+++ b/llvm-build/build.py
@@ -672,7 +672,7 @@ class LlvmCore(BuildUtils):
                 llvm_defines['PANEL_LIBRARIES'] = ncurses_libs
 
             if self.build_config.enable_lzma_7zip:
-                llvm_defines['LIBLZMA_LIBRARIES'] = self.merge_out_path('lzma', 'lib', self.use_platform(), 'liblzma.dylib')
+                llvm_defines['LIBLZMA_LIBRARIES'] = self.merge_out_path('lzma', 'lib', self.use_platform(), 'liblzma.22.0.dylib')
 
             if self.build_config.build_libedit:
                 llvm_defines['LibEdit_LIBRARIES'] = os.path.join(self.get_prebuilts_dir('libedit'), 'lib', 'libedit.0.dylib')
@@ -1791,7 +1791,7 @@ class LlvmLibs(BuildUtils):
         self.check_call(cmd)
 
         if self.host_is_darwin():
-            shlib_ext = '.dylib'
+            shlib_ext = '.22.0.dylib'
         if self.host_is_linux():
             shlib_ext = '.so'
         lzma_file = os.path.join(liblzma_build_path, 'lib', target_triple, 'liblzma' + shlib_ext)