diff --git a/tensorflow/compiler/aot/embedded_protocol_buffers.cc b/tensorflow/compiler/aot/embedded_protocol_buffers.cc
index 3c32d533f63..a4d5f6d239e 100644
--- a/tensorflow/compiler/aot/embedded_protocol_buffers.cc
+++ b/tensorflow/compiler/aot/embedded_protocol_buffers.cc
@@ -80,9 +80,8 @@ static StatusOr<string> CodegenModule(llvm::TargetMachine* target_machine,
   llvm::raw_svector_ostream ostream(stream_buffer);
   llvm::legacy::PassManager codegen_passes;
 
-  if (target_machine->addPassesToEmitFile(
-          codegen_passes, ostream, nullptr,
-          llvm::TargetMachine::CGFT_ObjectFile)) {
+  if (target_machine->addPassesToEmitFile(codegen_passes, ostream, nullptr,
+                                          llvm::CGFT_ObjectFile)) {
     return xla::InternalError(
         "Could not create pass pipeline to generate object file");
   }
diff --git a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
index 84616f3a37b..d7ca14ad273 100644
--- a/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
+++ b/tensorflow/compiler/xla/service/gpu/llvm_gpu_backend/gpu_backend_lib.cc
@@ -36,6 +36,7 @@ limitations under the License.
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IR/Verifier.h"
+#include "llvm/InitializePasses.h"
 #include "llvm/Linker/Linker.h"
 #include "llvm/PassRegistry.h"
 #include "llvm/Support/CommandLine.h"
@@ -225,7 +226,7 @@ string EmitModuleToPTX(Module* module, llvm::TargetMachine* target_machine) {
         llvm::Triple(module->getTargetTriple())));
 
     target_machine->addPassesToEmitFile(codegen_passes, pstream, nullptr,
-                                        llvm::TargetMachine::CGFT_AssemblyFile);
+                                        llvm::CGFT_AssemblyFile);
     codegen_passes.run(*module);
   }
 
@@ -613,7 +614,7 @@ StatusOr<std::vector<uint8>> EmitModuleToHsaco(
       new llvm::raw_fd_ostream(isabin_path, ec, llvm::sys::fs::F_Text));
   module->setDataLayout(target_machine->createDataLayout());
   target_machine->addPassesToEmitFile(codegen_passes, *isabin_fs, nullptr,
-                                      llvm::TargetMachine::CGFT_ObjectFile);
+                                      llvm::CGFT_ObjectFile);
   codegen_passes.run(*module);
   isabin_fs->flush();
 
diff --git a/third_party/mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp b/third_party/mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp
index 8c6fdf9aba0..a91c43e1e92 100644
--- a/third_party/mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp
+++ b/third_party/mlir/lib/Conversion/GPUToCUDA/ConvertKernelFuncToCubin.cpp
@@ -117,7 +117,7 @@ std::string GpuKernelToCubinPass::translateModuleToPtx(
     llvm::buffer_ostream pstream(stream);
     llvm::legacy::PassManager codegen_passes;
     target_machine.addPassesToEmitFile(codegen_passes, pstream, nullptr,
-                                       llvm::TargetMachine::CGFT_AssemblyFile);
+                                       llvm::CGFT_AssemblyFile);
     codegen_passes.run(module);
   }