Index: include/llvm/Support/TargetParser.h
===================================================================
--- include/llvm/Support/TargetParser.h
+++ include/llvm/Support/TargetParser.h
@@ -18,6 +18,7 @@
 // FIXME: vector is used because that's what clang uses for subtarget feature
 // lists, but SmallVector would probably be better
 #include <vector>
+#include "llvm/ADT/StringMap.h"
 
 namespace llvm {
   class StringRef;
@@ -181,11 +182,14 @@
   static     unsigned getFPUNeonSupportLevel(unsigned FPUKind);
   static     unsigned getFPURestriction(unsigned FPUKind);
   static     unsigned getDefaultFPU(StringRef CPU);
+  static     unsigned getDefaultExtensions(StringRef CPU);
   // FIXME: This should be moved to TargetTuple once it exists
   static       bool   getFPUFeatures(unsigned FPUKind,
                                      std::vector<const char*> &Features);
   static       bool   getHWDivFeatures(unsigned HWDivKind,
                                        std::vector<const char*> &Features);
+  static       bool   getExtensionFeatures(unsigned Extensions,
+                                           llvm::StringMap<bool> &Features);
   static const char * getArchName(unsigned ArchKind);
   static   unsigned   getArchAttr(unsigned ArchKind);
   static const char * getCPUAttr(unsigned ArchKind);
Index: lib/Basic/Targets.cpp
===================================================================
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -4449,37 +4449,21 @@
 
   // FIXME: This should be based on Arch attributes, not CPU names.
   void getDefaultFeatures(llvm::StringMap<bool> &Features) const override {
-    if (CPU == "arm1136jf-s" || CPU == "arm1176jzf-s" || CPU == "mpcore")
-      Features["vfp2"] = true;
-    else if (CPU == "cortex-a8" || CPU == "cortex-a9") {
-      Features["vfp3"] = true;
-      Features["neon"] = true;
-    }
-    else if (CPU == "cortex-a5") {
-      Features["vfp4"] = true;
-      Features["neon"] = true;
-    } else if (CPU == "swift" || CPU == "cortex-a7" ||
-               CPU == "cortex-a12" || CPU == "cortex-a15" ||
-               CPU == "cortex-a17" || CPU == "krait") {
-      Features["vfp4"] = true;
-      Features["neon"] = true;
-      Features["hwdiv"] = true;
-      Features["hwdiv-arm"] = true;
-    } else if (CPU == "cyclone" || CPU == "cortex-a53" || CPU == "cortex-a57" ||
-               CPU == "cortex-a72") {
-      Features["fp-armv8"] = true;
-      Features["neon"] = true;
-      Features["hwdiv"] = true;
-      Features["hwdiv-arm"] = true;
-      Features["crc"] = true;
-      Features["crypto"] = true;
-    } else if (CPU == "cortex-r5" || CPU == "cortex-r7" || ArchVersion == 8) {
-      Features["hwdiv"] = true;
-      Features["hwdiv-arm"] = true;
-    } else if (CPU == "cortex-m3" || CPU == "cortex-m4" || CPU == "cortex-m7" ||
-               CPU == "sc300" || CPU == "cortex-r4" || CPU == "cortex-r4f") {
-      Features["hwdiv"] = true;
+
+    // get default FPU features
+    std::vector<const char*> FPUFeatures;
+    unsigned FPUKind = llvm::ARMTargetParser::getDefaultFPU(CPU);
+    llvm::ARMTargetParser::getFPUFeatures(FPUKind, FPUFeatures);
+
+    for (const char *Feature : FPUFeatures) {
+      if (Feature[0] == '+')
+        Features[Feature+1] = true;
     }
+
+    // get default arch extensions
+    unsigned DefaultExtensions = 
+                    llvm::ARMTargetParser::getDefaultExtensions(CPU);
+    llvm::ARMTargetParser::getExtensionFeatures(DefaultExtensions, Features);
   }
 
   bool handleTargetFeatures(std::vector<std::string> &Features,
@@ -4523,6 +4507,8 @@
         Crypto = 1;
       } else if (Feature == "+fp-only-sp") {
         HW_FP_remove |= HW_FP_DP | HW_FP_HP;
+      } else if (Feature == "+fp16") {
+        HW_FP |= HW_FP_HP;
       }
     }
     HW_FP &= ~HW_FP_remove;
Index: lib/Support/TargetParser.cpp
===================================================================
--- lib/Support/TargetParser.cpp
+++ lib/Support/TargetParser.cpp
@@ -121,6 +121,8 @@
   { "crypto",    ARM::AEK_CRYPTO },
   { "fp",        ARM::AEK_FP },
   { "idiv",     (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV) },
+  { "hwdiv-arm", ARM::AEK_HWDIVARM },
+  { "hwdiv",     ARM::AEK_HWDIV },
   { "mp",        ARM::AEK_MP },
   { "simd",      ARM::AEK_SIMD },
   { "sec",       ARM::AEK_SEC },
@@ -153,93 +155,94 @@
   const char *Name;
   ARM::ArchKind ArchID;
   ARM::FPUKind DefaultFPU;
+  unsigned DefaultExtensions;
   bool Default; // is $Name the default CPU for $ArchID ?
 } CPUNames[] = {
-  { "arm2",          ARM::AK_ARMV2,    ARM::FK_NONE,       true },
-  { "arm3",          ARM::AK_ARMV2A,   ARM::FK_NONE,       true },
-  { "arm6",          ARM::AK_ARMV3,    ARM::FK_NONE,       true },
-  { "arm7m",         ARM::AK_ARMV3M,   ARM::FK_NONE,       true },
-  { "arm8",          ARM::AK_ARMV4,    ARM::FK_NONE,       false },
-  { "arm810",        ARM::AK_ARMV4,    ARM::FK_NONE,       false },
-  { "strongarm",     ARM::AK_ARMV4,    ARM::FK_NONE,       true },
-  { "strongarm110",  ARM::AK_ARMV4,    ARM::FK_NONE,       false },
-  { "strongarm1100", ARM::AK_ARMV4,    ARM::FK_NONE,       false },
-  { "strongarm1110", ARM::AK_ARMV4,    ARM::FK_NONE,       false },
-  { "arm7tdmi",      ARM::AK_ARMV4T,   ARM::FK_NONE,       true },
-  { "arm7tdmi-s",    ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm710t",       ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm720t",       ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm9",          ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm9tdmi",      ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm920",        ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm920t",       ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm922t",       ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm9312",       ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm940t",       ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "ep9312",        ARM::AK_ARMV4T,   ARM::FK_NONE,       false },
-  { "arm10tdmi",     ARM::AK_ARMV5T,   ARM::FK_NONE,       true },
-  { "arm1020t",      ARM::AK_ARMV5T,   ARM::FK_NONE,       false },
-  { "arm9e",         ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "arm946e-s",     ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "arm966e-s",     ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "arm968e-s",     ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "arm10e",        ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "arm1020e",      ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "arm1022e",      ARM::AK_ARMV5TE,  ARM::FK_NONE,       true },
-  { "iwmmxt",        ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "xscale",        ARM::AK_ARMV5TE,  ARM::FK_NONE,       false },
-  { "arm926ej-s",    ARM::AK_ARMV5TEJ, ARM::FK_NONE,       true },
-  { "arm1136jf-s",   ARM::AK_ARMV6,    ARM::FK_VFPV2,      true },
-  { "arm1176j-s",    ARM::AK_ARMV6K,   ARM::FK_NONE,       false },
-  { "arm1176jz-s",   ARM::AK_ARMV6K,   ARM::FK_NONE,       false },
-  { "mpcore",        ARM::AK_ARMV6K,   ARM::FK_VFPV2,      false },
-  { "mpcorenovfp",   ARM::AK_ARMV6K,   ARM::FK_NONE,       false },
-  { "arm1176jzf-s",  ARM::AK_ARMV6K,   ARM::FK_VFPV2,      true },
-  { "arm1176jzf-s",  ARM::AK_ARMV6Z,   ARM::FK_VFPV2,      true },
-  { "arm1176jzf-s",  ARM::AK_ARMV6ZK,  ARM::FK_VFPV2,      true },
-  { "arm1156t2-s",   ARM::AK_ARMV6T2,  ARM::FK_NONE,       true },
-  { "arm1156t2f-s",  ARM::AK_ARMV6T2,  ARM::FK_VFPV2,      false },
-  { "cortex-m0",     ARM::AK_ARMV6M,   ARM::FK_NONE,       true },
-  { "cortex-m0plus", ARM::AK_ARMV6M,   ARM::FK_NONE,       false },
-  { "cortex-m1",     ARM::AK_ARMV6M,   ARM::FK_NONE,       false },
-  { "sc000",         ARM::AK_ARMV6M,   ARM::FK_NONE,       false },
-  { "cortex-a5",     ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, false },
-  { "cortex-a7",     ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, false },
-  { "cortex-a8",     ARM::AK_ARMV7A,   ARM::FK_NEON,       true },
-  { "cortex-a9",     ARM::AK_ARMV7A,   ARM::FK_NEON_FP16,  false },
-  { "cortex-a12",    ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, false },
-  { "cortex-a15",    ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, false },
-  { "cortex-a17",    ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, false },
-  { "krait",         ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, false },
-  { "cortex-r4",     ARM::AK_ARMV7R,   ARM::FK_NONE,       true },
-  { "cortex-r4f",    ARM::AK_ARMV7R,   ARM::FK_VFPV3_D16,  false },
-  { "cortex-r5",     ARM::AK_ARMV7R,   ARM::FK_VFPV3_D16,      false },
-  { "cortex-r7",     ARM::AK_ARMV7R,   ARM::FK_VFPV3_D16_FP16, false },
-  { "sc300",         ARM::AK_ARMV7M,   ARM::FK_NONE,           false },
-  { "cortex-m3",     ARM::AK_ARMV7M,   ARM::FK_NONE,           true },
-  { "cortex-m4",     ARM::AK_ARMV7EM,  ARM::FK_FPV4_SP_D16,    true },
-  { "cortex-m7",     ARM::AK_ARMV7EM,  ARM::FK_FPV5_D16,             false },
-  { "cortex-a53",    ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, true },
-  { "cortex-a57",    ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, false },
-  { "cortex-a72",    ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, false },
-  { "cyclone",       ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, false },
-  { "generic",       ARM::AK_ARMV8_1A, ARM::FK_NEON_FP_ARMV8,        true },
+  { "arm2",          ARM::AK_ARMV2,    ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm3",          ARM::AK_ARMV2A,   ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm6",          ARM::AK_ARMV3,    ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm7m",         ARM::AK_ARMV3M,   ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm8",          ARM::AK_ARMV4,    ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm810",        ARM::AK_ARMV4,    ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "strongarm",     ARM::AK_ARMV4,    ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "strongarm110",  ARM::AK_ARMV4,    ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "strongarm1100", ARM::AK_ARMV4,    ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "strongarm1110", ARM::AK_ARMV4,    ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm7tdmi",      ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm7tdmi-s",    ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm710t",       ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm720t",       ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm9",          ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm9tdmi",      ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm920",        ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm920t",       ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm922t",       ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm9312",       ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm940t",       ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "ep9312",        ARM::AK_ARMV4T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm10tdmi",     ARM::AK_ARMV5T,   ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm1020t",      ARM::AK_ARMV5T,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm9e",         ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm946e-s",     ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm966e-s",     ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm968e-s",     ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm10e",        ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm1020e",      ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm1022e",      ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "iwmmxt",        ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "xscale",        ARM::AK_ARMV5TE,  ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm926ej-s",    ARM::AK_ARMV5TEJ, ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm1136jf-s",   ARM::AK_ARMV6,    ARM::FK_VFPV2, ARM::AEK_NONE, true },
+  { "arm1176j-s",    ARM::AK_ARMV6K,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm1176jz-s",   ARM::AK_ARMV6K,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "mpcore",        ARM::AK_ARMV6K,   ARM::FK_VFPV2, ARM::AEK_NONE, false },
+  { "mpcorenovfp",   ARM::AK_ARMV6K,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "arm1176jzf-s",  ARM::AK_ARMV6K,   ARM::FK_VFPV2, ARM::AEK_NONE, true },
+  { "arm1176jzf-s",  ARM::AK_ARMV6Z,   ARM::FK_VFPV2, ARM::AEK_NONE, true },
+  { "arm1176jzf-s",  ARM::AK_ARMV6ZK,  ARM::FK_VFPV2, ARM::AEK_NONE, true },
+  { "arm1156t2-s",   ARM::AK_ARMV6T2,  ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "arm1156t2f-s",  ARM::AK_ARMV6T2,  ARM::FK_VFPV2, ARM::AEK_NONE, false },
+  { "cortex-m0",     ARM::AK_ARMV6M,   ARM::FK_NONE,  ARM::AEK_NONE, true },
+  { "cortex-m0plus", ARM::AK_ARMV6M,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "cortex-m1",     ARM::AK_ARMV6M,   ARM::FK_NONE,  ARM::AEK_NONE, false },
+  { "sc000",         ARM::AK_ARMV6M,   ARM::FK_NONE,        ARM::AEK_NONE, false },
+  { "cortex-a5",     ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4,  ARM::AEK_NONE, false },
+  { "cortex-a7",     ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), false },
+  { "cortex-a8",     ARM::AK_ARMV7A,   ARM::FK_NEON,        ARM::AEK_NONE, true },
+  { "cortex-a9",     ARM::AK_ARMV7A,   ARM::FK_NEON_FP16,   ARM::AEK_NONE, false },
+  { "cortex-a12",    ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), false },
+  { "cortex-a15",    ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), false },
+  { "cortex-a17",    ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), false },
+  { "krait",         ARM::AK_ARMV7A,   ARM::FK_NEON_VFPV4, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), false },
+  { "cortex-r4",     ARM::AK_ARMV7R,   ARM::FK_NONE,        ARM::AEK_HWDIV, true },
+  { "cortex-r4f",    ARM::AK_ARMV7R,   ARM::FK_VFPV3_D16,   ARM::AEK_HWDIV, false },
+  { "cortex-r5",     ARM::AK_ARMV7R,   ARM::FK_VFPV3_D16,      (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), false },
+  { "cortex-r7",     ARM::AK_ARMV7R,   ARM::FK_VFPV3_D16_FP16, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), false },
+  { "sc300",         ARM::AK_ARMV7M,   ARM::FK_NONE,            ARM::AEK_HWDIV, false },
+  { "cortex-m3",     ARM::AK_ARMV7M,   ARM::FK_NONE,            ARM::AEK_HWDIV, true },
+  { "cortex-m4",     ARM::AK_ARMV7EM,  ARM::FK_FPV4_SP_D16,     ARM::AEK_HWDIV, true },
+  { "cortex-m7",     ARM::AK_ARMV7EM,  ARM::FK_FPV5_D16,              ARM::AEK_HWDIV, false },
+  { "cortex-a53",    ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV | ARM::AEK_CRC), true },
+  { "cortex-a57",    ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV | ARM::AEK_CRC), false },
+  { "cortex-a72",    ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV | ARM::AEK_CRC), false },
+  { "cyclone",       ARM::AK_ARMV8A,   ARM::FK_CRYPTO_NEON_FP_ARMV8, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV | ARM::AEK_CRC), false },
+  { "generic",       ARM::AK_ARMV8_1A, ARM::FK_NEON_FP_ARMV8,        (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), true },
   // Non-standard Arch names.
-  { "iwmmxt",        ARM::AK_IWMMXT,   ARM::FK_NONE,       true },
-  { "xscale",        ARM::AK_XSCALE,   ARM::FK_NONE,       true },
-  { "arm10tdmi",     ARM::AK_ARMV5,    ARM::FK_NONE,       true },
-  { "arm1022e",      ARM::AK_ARMV5E,   ARM::FK_NONE,       true },
-  { "arm1136j-s",    ARM::AK_ARMV6J,   ARM::FK_NONE,       true },
-  { "arm1136jz-s",   ARM::AK_ARMV6J,   ARM::FK_NONE,       false },
-  { "cortex-m0",     ARM::AK_ARMV6SM,  ARM::FK_NONE,       true },
-  { "arm1176jzf-s",  ARM::AK_ARMV6HL,  ARM::FK_VFPV2,      true },
-  { "cortex-a8",     ARM::AK_ARMV7,    ARM::FK_NEON,       true },
-  { "cortex-a8",     ARM::AK_ARMV7L,   ARM::FK_NEON,       true },
-  { "cortex-a8",     ARM::AK_ARMV7HL,  ARM::FK_NEON,       true },
-  { "cortex-m4",     ARM::AK_ARMV7EM,  ARM::FK_NONE,       true },
-  { "swift",         ARM::AK_ARMV7S,   ARM::FK_NEON_VFPV4, true },
+  { "iwmmxt",        ARM::AK_IWMMXT,   ARM::FK_NONE,  ARM::AEK_NONE,  true },
+  { "xscale",        ARM::AK_XSCALE,   ARM::FK_NONE,  ARM::AEK_NONE,  true },
+  { "arm10tdmi",     ARM::AK_ARMV5,    ARM::FK_NONE,  ARM::AEK_NONE,  true },
+  { "arm1022e",      ARM::AK_ARMV5E,   ARM::FK_NONE,  ARM::AEK_NONE,  true },
+  { "arm1136j-s",    ARM::AK_ARMV6J,   ARM::FK_NONE,  ARM::AEK_NONE,  true },
+  { "arm1136jz-s",   ARM::AK_ARMV6J,   ARM::FK_NONE,  ARM::AEK_NONE,  false },
+  { "cortex-m0",     ARM::AK_ARMV6SM,  ARM::FK_NONE,  ARM::AEK_NONE,  true },
+  { "arm1176jzf-s",  ARM::AK_ARMV6HL,  ARM::FK_VFPV2, ARM::AEK_NONE,  true },
+  { "cortex-a8",     ARM::AK_ARMV7,    ARM::FK_NEON,  ARM::AEK_NONE,  true },
+  { "cortex-a8",     ARM::AK_ARMV7L,   ARM::FK_NEON,  ARM::AEK_NONE,  true },
+  { "cortex-a8",     ARM::AK_ARMV7HL,  ARM::FK_NEON,  ARM::AEK_NONE,  true },
+  { "cortex-m4",     ARM::AK_ARMV7EM,  ARM::FK_NONE,  ARM::AEK_HWDIV, true },
+  { "swift",         ARM::AK_ARMV7S,   ARM::FK_NEON_VFPV4, (ARM::AEK_HWDIVARM | ARM::AEK_HWDIV), true },
   // Invalid CPU
-  { "invalid",       ARM::AK_INVALID,  ARM::FK_INVALID,    true }
+  { "invalid",       ARM::AK_INVALID,  ARM::FK_INVALID,  ARM::AEK_INVALID,  true }
 };
 
 } // namespace
@@ -280,6 +283,34 @@
   return ARM::FK_INVALID;
 }
 
+unsigned ARMTargetParser::getDefaultExtensions(StringRef CPU) {
+  for (const auto C : CPUNames) {
+    if (CPU == C.Name)
+      return C.DefaultExtensions;
+  }
+  return ARM::AEK_INVALID;
+}
+
+bool ARMTargetParser::getExtensionFeatures(unsigned Extensions,
+                                           llvm::StringMap<bool> &Features) {
+
+  if (Extensions == ARM::AEK_INVALID)
+    return false;
+
+  if (Extensions & ARM::AEK_NONE)
+    return true;
+
+  for (const auto AE : ARCHExtNames) {
+    //FIXME clang currently ignores idiv
+    if (AE.Name == "idiv")
+      continue;
+    if (Extensions & AE.ID)
+      Features[AE.Name] = true;
+  }
+
+  return true;
+}
+
 bool ARMTargetParser::getHWDivFeatures(unsigned HWDivKind,
                                        std::vector<const char *> &Features) {
 
@@ -365,6 +396,7 @@
   // crypto includes neon, so we handle this similarly to FPU version.
   switch (FPUNames[FPUKind].NeonSupport) {
   case ARM::NS_Crypto:
+    Features.push_back("+neon");
     Features.push_back("+crypto");
     break;
   case ARM::NS_Neon:
Index: test/CodeGen/arm-target-features.c
===================================================================
--- test/CodeGen/arm-target-features.c
+++ test/CodeGen/arm-target-features.c
@@ -1,10 +1,13 @@
 // REQUIRES: arm-registered-target
 
 // RUN: %clang_cc1 -triple thumbv7-linux-gnueabihf -target-cpu cortex-a8 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP3
-// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-a9 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP3
 // CHECK-VFP3: "target-features"="+neon,+vfp3"
 
 
+// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-a9 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP3-FP16
+// CHECK-VFP3-FP16: "target-features"="+fp16,+neon,+vfp3"
+
+
 // RUN: %clang_cc1 -triple thumbv7-linux-gnueabihf -target-cpu cortex-a5 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP4
 // CHECK-VFP4: "target-features"="+neon,+vfp4"
 
@@ -25,13 +28,28 @@
 // CHECK-BASIC-V8: "target-features"="+crc,+crypto,+fp-armv8,+hwdiv,+hwdiv-arm,+neon"
 
 
-// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-r5 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-DIV
-// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-r7 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-DIV
-// CHECK-DIV: "target-features"="+hwdiv,+hwdiv-arm"
+// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-r5 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP3-D16-DIV
+// CHECK-VFP3-D16-DIV: "target-features"="+d16,+hwdiv,+hwdiv-arm,+vfp3"
+
+
+// RUN: %clang_cc1 -triple armv7-linux-gnueabi -target-cpu cortex-r4f -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP3-D16-THUMB-DIV
+// CHECK-VFP3-D16-THUMB-DIV: "target-features"="+d16,+hwdiv,+vfp3"
+
+
+// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-r7 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP3-D16-FP16-DIV
+// CHECK-VFP3-D16-FP16-DIV: "target-features"="+d16,+fp16,+hwdiv,+hwdiv-arm,+vfp3"
+
+
+// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-m4 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP4-D16-SP-THUMB-DIV
+// CHECK-VFP4-D16-SP-THUMB-DIV: "target-features"="+d16,+fp-only-sp,+hwdiv,+vfp4"
+
+
+// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-m7 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-VFP5-D16-THUMB-DIV
+// CHECK-VFP5-D16-THUMB-DIV: "target-features"="+d16,+fp-armv8,+hwdiv"
+
 
-// RUN: %clang_cc1 -triple armv7-linux-gnueabi -target-cpu cortex-r4 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-THUMB-DIV
+// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-r4 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-THUMB-DIV
 // RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-m3 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-THUMB-DIV
-// RUN: %clang_cc1 -triple thumbv7-linux-gnueabi -target-cpu cortex-m4 -emit-llvm -o - %s | FileCheck %s --check-prefix=CHECK-THUMB-DIV
 // CHECK-THUMB-DIV: "target-features"="+hwdiv"