diff --git a/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/develop/headers/.keep b/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/develop/headers/.keep
new file mode 100644
diff --git a/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/develop/lib/crti.o b/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/develop/lib/crti.o
new file mode 100644
diff --git a/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/develop/lib/crtn.o b/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/develop/lib/crtn.o
new file mode 100644
diff --git a/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/lib/.keep b/clang/test/Driver/Inputs/basic_haiku_tree/boot/system/lib/.keep
new file mode 100644
diff --git a/clang/test/Driver/haiku.c b/clang/test/Driver/haiku.c
new file mode 100644
--- /dev/null
+++ b/clang/test/Driver/haiku.c
@@ -0,0 +1,18 @@
+// RUN: %clang -no-canonical-prefixes -target x86_64-unknown-haiku \
+// RUN: --sysroot=%S/Inputs/basic_haiku_tree %s -### 2>&1 \
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-X86_64 %s
+// RUN: %clang -no-canonical-prefixes -target i586-pc-haiku \
+// RUN: --sysroot=%S/Inputs/basic_haiku_tree %s -### 2>&1 \
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-X86 %s
+// RUN: %clang -no-canonical-prefixes -target riscv64-unknown-haiku \
+// RUN: --sysroot=%S/Inputs/basic_haiku_tree %s -### 2>&1 \
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-RV64 %s
+
+// CHECK: {{.*}}clang{{[a-zA-Z\-]*}}" "-cc1"
+// CHECK-X86: "-triple" "i586-pc-haiku"
+// CHECK-X86_64: "-triple" "x86_64-unknown-haiku"
+// CHECK-RV64: "-triple" "riscv64-unknown-haiku"
+
+// CHECK: {{.*}}gcc{{[a-zA-Z\-]*}}"
+// CHECK-X86: "-m32"
+// CHECK-X86_64: "-m64"
diff --git a/clang/test/Driver/haiku.cpp b/clang/test/Driver/haiku.cpp
new file mode 100644
--- /dev/null
+++ b/clang/test/Driver/haiku.cpp
@@ -0,0 +1,19 @@
+// RUN: %clangxx -no-canonical-prefixes -target i586-pc-haiku \
+// RUN: --sysroot=%S/Inputs/basic_haiku_tree %s -### -stdlib=platform 2>&1 \
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-X86 %s
+// RUN: %clangxx -no-canonical-prefixes -target x86_64-unknown-haiku \
+// RUN: --sysroot=%S/Inputs/basic_haiku_tree %s -### -stdlib=platform 2>&1 \
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-X86_64 %s
+// RUN: %clangxx -no-canonical-prefixes -target riscv64-unknown-haiku \
+// RUN: --sysroot=%S/Inputs/basic_haiku_tree %s -### -stdlib=platform 2>&1 \
+// RUN: | FileCheck --check-prefixes=CHECK,CHECK-RV64 %s
+
+// CHECK: {{.*}}clang{{[a-zA-Z\-]*}}" "-cc1"
+// CHECK-X86: "-triple" "i586-pc-haiku"
+// CHECK-X86_64: "-triple" "x86_64-unknown-haiku"
+// CHECK-RV64: "-triple" "riscv64-unknown-haiku"
+// CHECK: "-isysroot" "[[SYSROOT:[^"]+]]"
+
+// CHECK: {{.*}}g++{{[a-zA-Z\-]*}}"
+// CHECK-X86: "-m32"
+// CHECK-X86_64: "-m64"