diff --git a/source/Host/common/HostInfoBase.cpp b/source/Host/common/HostInfoBase.cpp
index 0f4324f..9c637d8 100644
--- a/source/Host/common/HostInfoBase.cpp
+++ b/source/Host/common/HostInfoBase.cpp
@@ -403,6 +403,21 @@ HostInfoBase::ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_6
     arch_32.Clear();
     arch_64.Clear();
 
+    // Canonicalize armv7l and armv6l to their alias targets.  The 'l' is a linux addition.
+    if (triple.getOS() == llvm::Triple::Linux && triple.getArch() == llvm::Triple::arm) {
+        switch(triple.getSubArch()) {
+            default:
+                break;
+            case llvm::Triple::SubArchType::ARMSubArch_v6:
+                triple.setArchName("armv6");
+                break;
+            case llvm::Triple::SubArchType::ARMSubArch_v7:
+                triple.setArchName("armv7");
+                break;
+        }
+    }
+
+
     switch (triple.getArch())
     {
         default: