diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index 55c55bad7393..b5dc919c0536 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -69,6 +69,7 @@ llvm::Triple::ArchType darwin::getArchTypeForMachOArchName(StringRef Str) {
       .Case("nvptx64", llvm::Triple::nvptx64)
       .Case("amdil", llvm::Triple::amdil)
       .Case("spir", llvm::Triple::spir)
+      .Case("h2blb", llvm::Triple::h2blb)
       .Default(llvm::Triple::UnknownArch);
 }
 
diff --git a/clang/test/CodeGen/H2BLB/empty_hello_world.c b/clang/test/CodeGen/H2BLB/empty_hello_world.c
index 4c568b8f8884..257d3cde168e 100644
--- a/clang/test/CodeGen/H2BLB/empty_hello_world.c
+++ b/clang/test/CodeGen/H2BLB/empty_hello_world.c
@@ -1,5 +1,5 @@
 // REQUIRES: h2blb-registered-target
-// RUN: %clang --target=h2blb %s -o - -S | FileCheck %s
+// RUN: %clang --target=h2blb--darwin %s -o - -S | FileCheck %s
 
 // Check that we can connect clang from the driver (as opposed to cc1) all
 // the way to assembly code.