diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -436,6 +436,19 @@
     ],
 )
 
+cc_library(
+    name = "Debuginfod",
+    srcs = glob([
+        "lib/Debuginfod/*.cpp",
+        "lib/Debuginfod/*.h",
+    ]),
+    hdrs = glob(["include/llvm/Debuginfod/*.h"]),
+    copts = llvm_copts,
+    deps = [
+        ":Support",
+    ],
+)
+
 cc_library(
     name = "Symbolize",
     srcs = glob([
@@ -449,6 +462,7 @@
         ":DebugInfo",
         ":DebugInfoDWARF",
         ":DebugInfoPDB",
+        ":Debuginfod",
         ":Demangle",
         ":Object",
         ":Support",
@@ -3690,6 +3704,7 @@
     deps = [
         ":DebugInfoDWARF",
         ":DebugInfoPDB",
+        ":Debuginfod",
         ":Object",
         ":Option",
         ":Support",
diff --git a/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/unittests/BUILD.bazel
@@ -199,6 +199,22 @@
     ],
 )
 
+cc_test(
+    name = "debuginfod_tests",
+    size = "medium",
+    srcs = glob(
+        ["Debuginfod/*.cpp"],
+        allow_empty = False,
+    ),
+    deps = [
+        "//llvm:Debuginfod",
+        "//llvm:Support",
+        "//llvm:TestingSupport",
+        "//llvm:gtest",
+        "//llvm:gtest_main",
+    ],
+)
+
 cc_test(
     name = "execution_engine_tests",
     size = "small",