diff --git a/third_party/llvm-10.0/BUILD.gn b/third_party/llvm-10.0/BUILD.gn
index a41f21b..a346088 100644
--- a/third_party/llvm-10.0/BUILD.gn
+++ b/third_party/llvm-10.0/BUILD.gn
@@ -133,6 +133,7 @@
 
   deps = [
     ":swiftshader_llvm_most",
+    ":swiftshader_llvm_debuginfo",
     ":swiftshader_llvm_support",
     ":swiftshader_llvm_transforms_scalar",
   ]
@@ -490,49 +491,6 @@
     "llvm/lib/CodeGen/WasmEHPrepare.cpp",
     "llvm/lib/CodeGen/WinEHPrepare.cpp",
     "llvm/lib/CodeGen/XRayInstrumentation.cpp",
-    "llvm/lib/DebugInfo/CodeView/CVTypeVisitor.cpp",
-    "llvm/lib/DebugInfo/CodeView/CodeViewError.cpp",
-    "llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp",
-    "llvm/lib/DebugInfo/CodeView/ContinuationRecordBuilder.cpp",
-    "llvm/lib/DebugInfo/CodeView/EnumTables.cpp",
-    "llvm/lib/DebugInfo/CodeView/GlobalTypeTableBuilder.cpp",
-    "llvm/lib/DebugInfo/CodeView/Line.cpp",
-    "llvm/lib/DebugInfo/CodeView/RecordName.cpp",
-    "llvm/lib/DebugInfo/CodeView/RecordSerialization.cpp",
-    "llvm/lib/DebugInfo/CodeView/SimpleTypeSerializer.cpp",
-    "llvm/lib/DebugInfo/CodeView/SymbolRecordMapping.cpp",
-    "llvm/lib/DebugInfo/CodeView/TypeHashing.cpp",
-    "llvm/lib/DebugInfo/CodeView/TypeIndex.cpp",
-    "llvm/lib/DebugInfo/CodeView/TypeIndexDiscovery.cpp",
-    "llvm/lib/DebugInfo/CodeView/TypeRecordMapping.cpp",
-    "llvm/lib/DebugInfo/CodeView/TypeTableCollection.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFAddressRange.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFContext.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugAddr.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDebugRnglists.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFDie.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFGdbIndex.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFListTable.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp",
-    "llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp",
     "llvm/lib/Demangle/ItaniumDemangle.cpp",
     "llvm/lib/ExecutionEngine/ExecutionEngine.cpp",
     "llvm/lib/ExecutionEngine/Orc/CompileUtils.cpp",
@@ -829,6 +787,54 @@
   ]
 }
 
+swiftshader_llvm_source_set("swiftshader_llvm_debuginfo") {
+  sources = [
+    "llvm/lib/DebugInfo/CodeView/CVTypeVisitor.cpp",
+    "llvm/lib/DebugInfo/CodeView/CodeViewError.cpp",
+    "llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp",
+    "llvm/lib/DebugInfo/CodeView/ContinuationRecordBuilder.cpp",
+    "llvm/lib/DebugInfo/CodeView/EnumTables.cpp",
+    "llvm/lib/DebugInfo/CodeView/GlobalTypeTableBuilder.cpp",
+    "llvm/lib/DebugInfo/CodeView/Line.cpp",
+    "llvm/lib/DebugInfo/CodeView/RecordName.cpp",
+    "llvm/lib/DebugInfo/CodeView/RecordSerialization.cpp",
+    "llvm/lib/DebugInfo/CodeView/SimpleTypeSerializer.cpp",
+    "llvm/lib/DebugInfo/CodeView/SymbolRecordMapping.cpp",
+    "llvm/lib/DebugInfo/CodeView/TypeHashing.cpp",
+    "llvm/lib/DebugInfo/CodeView/TypeIndex.cpp",
+    "llvm/lib/DebugInfo/CodeView/TypeIndexDiscovery.cpp",
+    "llvm/lib/DebugInfo/CodeView/TypeRecordMapping.cpp",
+    "llvm/lib/DebugInfo/CodeView/TypeTableCollection.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFAddressRange.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFContext.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugAddr.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugFrame.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugLine.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugLoc.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugPubTable.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDebugRnglists.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFDie.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFGdbIndex.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFListTable.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp",
+    "llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp",
+  ]
+}
+
 swiftshader_llvm_source_set("swiftshader_llvm_support") {
   sources = [
     "llvm/lib/Support/AArch64TargetParser.cpp",