diff --git a/library/compiler-builtins/.travis.yml b/library/compiler-builtins/.travis.yml
index 5496bb291315..d4a1319c7b6e 100644
--- a/library/compiler-builtins/.travis.yml
+++ b/library/compiler-builtins/.travis.yml
@@ -34,6 +34,8 @@ matrix:
       os: linux
     - env: TARGET=thumbv7em-none-eabi
       os: linux
+    - env: TARGET=thumbv7em-none-eabihf
+      os: linux
     - env: TARGET=thumbv7m-none-eabi
       os: linux
     - env: TARGET=x86_64-apple-darwin
diff --git a/library/compiler-builtins/ci/env.sh b/library/compiler-builtins/ci/env.sh
index feeac221389b..6275107b55c6 100644
--- a/library/compiler-builtins/ci/env.sh
+++ b/library/compiler-builtins/ci/env.sh
@@ -32,7 +32,7 @@ if [[ $TARGET != $HOST && ! $TARGET =~ ^i.86- ]]; then
             # `int main() { return 0; }`
             RUN_TESTS=n
             ;;
-        thumbv*-none-eabi)
+        thumbv*-none-eabi*)
             CARGO=xargo
             GCC_TRIPLE=arm-none-eabi
             # Bare metal targets. No `std` or `test` crates for these targets.
diff --git a/library/compiler-builtins/thumbv7em-none-eabihf.json b/library/compiler-builtins/thumbv7em-none-eabihf.json
new file mode 100644
index 000000000000..bb0b87eb41f6
--- /dev/null
+++ b/library/compiler-builtins/thumbv7em-none-eabihf.json
@@ -0,0 +1,9 @@
+{
+    "arch": "arm",
+    "data-layout": "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64",
+    "features": "+vfp4",
+    "llvm-target": "thumbv7em-none-eabihf",
+    "os": "none",
+    "target-endian": "little",
+    "target-pointer-width": "32"
+}