diff --git a/third_party/llvm-16.0/Android.bp b/third_party/llvm-16.0/Android.bp
index b2832f8..02c015c 100644
--- a/third_party/llvm-16.0/Android.bp
+++ b/third_party/llvm-16.0/Android.bp
@@ -1533,5 +1533,6 @@
 
     srcs: [
         "llvm/lib/Analysis/RegionPrinter.cpp",
+        "llvm/lib/MC/MCDisassembler/MCDisassembler.cpp",
     ],
 }
diff --git a/third_party/llvm-16.0/BUILD.gn b/third_party/llvm-16.0/BUILD.gn
index 13f5cc3..f5bde40 100644
--- a/third_party/llvm-16.0/BUILD.gn
+++ b/third_party/llvm-16.0/BUILD.gn
@@ -158,6 +158,10 @@
 
   ]
 
+  if (is_debug) {
+    deps += [ ":swiftshader_llvm_debug" ]
+  }
+
   if (current_cpu == "arm64") {
     deps += [ ":swiftshader_llvm_aarch64" ]
   } else if (current_cpu == "arm") {
@@ -1270,6 +1274,13 @@
 }
 
 
+swiftshader_llvm_source_set("swiftshader_llvm_debug") {
+  sources = [
+    "llvm/lib/Analysis/RegionPrinter.cpp",
+    "llvm/lib/MC/MCDisassembler/MCDisassembler.cpp",
+  ]
+}
+
 swiftshader_llvm_source_set("swiftshader_llvm_aarch64") {
   sources = [
     "llvm/lib/CodeGen/MultiHazardRecognizer.cpp",
diff --git a/third_party/llvm-16.0/scripts/generate_build_files.py b/third_party/llvm-16.0/scripts/generate_build_files.py
index f6690a6..2e4dc73 100755
--- a/third_party/llvm-16.0/scripts/generate_build_files.py
+++ b/third_party/llvm-16.0/scripts/generate_build_files.py
@@ -361,6 +361,7 @@
 
 files_llvm_debug = [
     "/lib/Analysis/RegionPrinter.cpp",
+    "/lib/MC/MCDisassembler/MCDisassembler.cpp",
 ]
 
 files_to_add_back_for_llvm_arm = [
@@ -496,6 +497,7 @@
     'files_Mips' : format_file_list_for_build_gn(files_Mips),
     'files_PowerPC' : format_file_list_for_build_gn(files_PowerPC),
     'files_RISCV' : format_file_list_for_build_gn(files_RISCV),
+    'files_llvm_debug': format_file_list_for_build_gn(files_llvm_debug),
 }
 with open(BUILD_GN_TEMPLATE_PATH, 'r') as f:
     build_gn_template = CustomTemplate(f.read())
diff --git a/third_party/llvm-16.0/scripts/template_BUILD.gn b/third_party/llvm-16.0/scripts/template_BUILD.gn
index 72c21f5..3131470 100644
--- a/third_party/llvm-16.0/scripts/template_BUILD.gn
+++ b/third_party/llvm-16.0/scripts/template_BUILD.gn
@@ -156,6 +156,10 @@
 %$%llvm_deps
   ]
 
+  if (is_debug) {
+    deps += [ ":swiftshader_llvm_debug" ]
+  }
+
   if (current_cpu == "arm64") {
     deps += [ ":swiftshader_llvm_aarch64" ]
   } else if (current_cpu == "arm") {
@@ -186,6 +190,12 @@
 # split out into their own source_set.
 %$%llvm_source_sets
 
+swiftshader_llvm_source_set("swiftshader_llvm_debug") {
+  sources = [
+%$%files_llvm_debug
+  ]
+}
+
 swiftshader_llvm_source_set("swiftshader_llvm_aarch64") {
   sources = [
 %$%files_AArch64