[ARM] Prevent DSP and SIM32 being set for v6m

[samparker]

Summary

My previous change (rL340911) set the two features for architectures >= 6, which wrongly includes v6m. Now set to >= 6 and not Cortex-M.

[dmgreen]

LGTM, Thanks

lib/Basic/Targets/ARM.cpp

666

Maybe always put the CPUProfile first? so
(CPUProfile != "M" && ArchVersion >= 6) || (CPUProfile == "M" && DSP)
Up to you.

lib/Basic/Targets/ARM.cpp

void ARMTargetInfo::getTargetDefines(const LangOptions &Opts,
   if (isThumb()) {
     Builder.defineMacro("__THUMBEL__");
     Builder.defineMacro("__thumb__");
     if (supportsThumb2())
       Builder.defineMacro("__thumb2__");
   }
 
   // ACLE 6.4.9 32-bit SIMD instructions
-  if (ArchVersion >= 6 || (CPUProfile == "M" && DSP))
+  if ((CPUProfile != "M" && ArchVersion >= 6) || (CPUProfile == "M" && DSP))
     Builder.defineMacro("__ARM_FEATURE_SIMD32", "1");
 
   // ACLE 6.4.10 Hardware Integer Divide
   if (((HWDiv & HWDivThumb) && isThumb()) ||
       ((HWDiv & HWDivARM) && !isThumb())) {
     Builder.defineMacro("__ARM_FEATURE_IDIV", "1");
     Builder.defineMacro("__ARM_ARCH_EXT_IDIV__", "1");
   }

test/Preprocessor/arm-acle-6.4.c

 // CHECK-V7M:     __ARM_ARCH_PROFILE 'M'
 // CHECK-V7M:     __ARM_FEATURE_CLZ 1
 // CHECK-V7M:     __ARM_FEATURE_IDIV 1
 // CHECK-V7M:     __ARM_FEATURE_LDREX 0x7
 // CHECK-V7M:     __ARM_FEATURE_QBIT 1
 // CHECK-V7M:     __ARM_FEATURE_SAT 1
 // CHECK-V7M:     __ARM_FEATURE_UNALIGNED 1
 
+// RUN: %clang -target arm-none-linux-eabi -march=armv7-m -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-NODSP
 // RUN: %clang -target arm-none-linux-eabi -march=armv7e-m -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-DSP
+// RUN: %clang --target=arm-arm-none-eabi -mcpu=cortex-m3 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-NODSP
 // RUN: %clang --target=arm-arm-none-eabi -mcpu=cortex-m4 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-DSP
 // RUN: %clang --target=arm-arm-none-eabi -mcpu=cortex-m7 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-DSP
+// RUN: %clang --target=arm-arm-none-eabi -mcpu=cortex-m0plus -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-NODSP
+// RUN: %clang --target=arm-arm-none-eabi -mcpu=cortex-m23 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-NODSP
 // RUN: %clang --target=arm-arm-none-eabi -mcpu=cortex-m33 -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-DSP
 // RUN: %clang --target=arm-arm-none-eabi -march=armv8m.main+dsp -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-M-DSP
 
 // CHECK-M-DSP: __ARM_FEATURE_DSP 1
 // CHECK-M-DSP: __ARM_FEATURE_SIMD32 1
 
+// CHECK-M-NODSP-NOT: __ARM_FEATURE_DSP 1
+// CHECK-M-NODSP-NOT: __ARM_FEATURE_SIMD32 1
+
 // RUN: %clang -target arm-none-linux-eabi -march=armv8-a -x c -E -dM %s -o - | FileCheck %s -check-prefix CHECK-V8A
 
 // CHECK-V8A: __ARM_ARCH 8
 // CHECK-V8A: __ARM_ARCH_ISA_ARM 1
 // CHECK-V8A: __ARM_ARCH_ISA_THUMB 2
 // CHECK-V8A: __ARM_ARCH_PROFILE 'A'
 // CHECK-V8A: __ARM_FEATURE_CLZ 1
 // CHECK-V8A: __ARM_FEATURE_DSP 1
 // CHECK-V8A: __ARM_FEATURE_IDIV 1
 // CHECK-V8A: __ARM_FEATURE_LDREX 0xf
 // CHECK-V8A: __ARM_FEATURE_QBIT 1
 // CHECK-V8A: __ARM_FEATURE_SAT 1
 // CHECK-V8A: __ARM_FEATURE_SIMD32 1
 // CHECK-V8A: __ARM_FEATURE_UNALIGNED 1