diff --git a/gematria/llvm/llvm_architecture_support.cc b/gematria/llvm/llvm_architecture_support.cc
index c115e8a4..d89fe1bc 100644
--- a/gematria/llvm/llvm_architecture_support.cc
+++ b/gematria/llvm/llvm_architecture_support.cc
@@ -62,8 +62,8 @@ LlvmArchitectureSupport::FromTriple(std::string_view llvm_triple,
   std::string lookup_error;
   // TODO(ondrasej): Remove the std::string() conversion once it's no longer
   // needed.
-  const llvm::Target* const llvm_target =
-      llvm::TargetRegistry::lookupTarget(llvm_triple, lookup_error);
+  const llvm::Target* const llvm_target = llvm::TargetRegistry::lookupTarget(
+      llvm::Triple(llvm::StringRef(llvm_triple)), lookup_error);
   if (llvm_target == nullptr) {
     return llvm::make_error<llvm::StringError>(
         llvm::errc::not_supported,
diff --git a/llvm_cm/tools/llvm-cm/llvm-cm.cpp b/llvm_cm/tools/llvm-cm/llvm-cm.cpp
index 5593ca34..bcb2ff28 100644
--- a/llvm_cm/tools/llvm-cm/llvm-cm.cpp
+++ b/llvm_cm/tools/llvm-cm/llvm-cm.cpp
@@ -465,9 +465,9 @@ int main(int argc, char *argv[]) {
 
   // Start setting up the disassembler.
   std::string Error;
-  const Target *TheTarget = TargetRegistry::lookupTarget(TripleName, Error);
-  exitIf(!TheTarget, Error);
   llvm::Triple TargetTriple(TripleName);
+  const Target *TheTarget = TargetRegistry::lookupTarget(TargetTriple, Error);
+  exitIf(!TheTarget, Error);
 
   std::unique_ptr<MCRegisterInfo> MRI(TheTarget->createMCRegInfo(TargetTriple));
   assert(MRI && "Unable to create target register info!");