Index: llvm/utils/gn/build/driver_executable.gni
===================================================================
--- llvm/utils/gn/build/driver_executable.gni
+++ llvm/utils/gn/build/driver_executable.gni
@@ -6,7 +6,7 @@
   tool_name = string_replace(target_name, "-", "_")
 
   write_cmake_config("${tool_name}-driver") {
-    input = "//llvm/cmake/driver-template.cpp.in"
+    input = "//llvm/cmake/modules/driver-template.cpp.in"
     output = "$target_gen_dir/${tool_name}-driver.cpp"
     values = [ "TOOL_NAME=$tool_name" ]
   }
Index: utils/bazel/llvm-project-overlay/clang/BUILD.bazel
===================================================================
--- utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+++ utils/bazel/llvm-project-overlay/clang/BUILD.bazel
@@ -1928,7 +1928,7 @@
 
 template_rule(
     name = "clang_main",
-    src = "//llvm:cmake/driver-template.cpp.in",
+    src = "//llvm:cmake/modules/driver-template.cpp.in",
     out = "clang_main.cpp",
     substitutions = {
         "@TOOL_NAME@": "clang"
Index: utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
===================================================================
--- utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -2587,7 +2587,7 @@
 
 template_rule(
     name = "dsymutil_main",
-    src = "cmake/driver-template.cpp.in",
+    src = "cmake/modules/driver-template.cpp.in",
     out = "dsymutil_main.cpp",
     substitutions = {
         "@TOOL_NAME@": "dsymutil"
@@ -2691,7 +2691,7 @@
 
 template_rule(
     name = "ar_main",
-    src = "cmake/driver-template.cpp.in",
+    src = "cmake/modules/driver-template.cpp.in",
     out = "ar_main.cpp",
     substitutions = {
         "@TOOL_NAME@": "llvm_ar"
@@ -2893,7 +2893,7 @@
 
 template_rule(
     name = "cxxfilt_main",
-    src = "cmake/driver-template.cpp.in",
+    src = "cmake/modules/driver-template.cpp.in",
     out = "cxxfilt_main.cpp",
     substitutions = {
         "@TOOL_NAME@": "llvm_cxxfilt"
@@ -3436,7 +3436,7 @@
 
 template_rule(
     name = "objcopy_main",
-    src = "cmake/driver-template.cpp.in",
+    src = "cmake/modules/driver-template.cpp.in",
     out = "objcopy_main.cpp",
     substitutions = {
         "@TOOL_NAME@": "llvm_objcopy"