Author: sam_parker Date: Fri Sep 28 03:18:02 2018 New Revision: 343309 URL: http://llvm.org/viewvc/llvm-project?rev=343309&view=rev Log: [ARM] Prevent DSP and SIM32 being set for v6m
My previous change (rL340911) set the two features for architectures >= 6, which wrongly includes v6m. Now set to >= 6 and not Cortex-M. Differential Revision: https://reviews.llvm.org/D52644 Modified: cfe/trunk/lib/Basic/Targets/ARM.cpp cfe/trunk/test/Preprocessor/arm-acle-6.4.c Modified: cfe/trunk/lib/Basic/Targets/ARM.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets/ARM.cpp?rev=343309&r1=343308&r2=343309&view=diff ============================================================================== --- cfe/trunk/lib/Basic/Targets/ARM.cpp (original) +++ cfe/trunk/lib/Basic/Targets/ARM.cpp Fri Sep 28 03:18:02 2018 @@ -663,7 +663,7 @@ void ARMTargetInfo::getTargetDefines(con } // 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 Modified: cfe/trunk/test/Preprocessor/arm-acle-6.4.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/arm-acle-6.4.c?rev=343309&r1=343308&r2=343309&view=diff ============================================================================== --- cfe/trunk/test/Preprocessor/arm-acle-6.4.c (original) +++ cfe/trunk/test/Preprocessor/arm-acle-6.4.c Fri Sep 28 03:18:02 2018 @@ -174,15 +174,22 @@ // 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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits