Author: ab Date: Thu Dec 15 12:14:27 2016 New Revision: 289839 URL: http://llvm.org/viewvc/llvm-project?rev=289839&view=rev Log: [Driver] Bump default x86 cpu to Penryn when targeting macosx10.12+.
10.12 dropped support for all pre-Penryn Macs. Modified: cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/test/Driver/clang-translation.c Modified: cfe/trunk/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=289839&r1=289838&r2=289839&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Tools.cpp (original) +++ cfe/trunk/lib/Driver/Tools.cpp Thu Dec 15 12:14:27 2016 @@ -2015,6 +2015,11 @@ static const char *getX86TargetCPU(const if (Triple.isOSDarwin()) { if (Triple.getArchName() == "x86_64h") return "core-avx2"; + // macosx10.12 drops support for all pre-Penryn Macs. + // Simulators can still run on 10.11 though, like Xcode. + if (Triple.isMacOSX() && !Triple.isOSVersionLT(10, 12)) + return "penryn"; + // The oldest x86_64 Macs have core2/Merom; the oldest x86 Macs have Yonah. return Is64Bit ? "core2" : "yonah"; } Modified: cfe/trunk/test/Driver/clang-translation.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/clang-translation.c?rev=289839&r1=289838&r2=289839&view=diff ============================================================================== --- cfe/trunk/test/Driver/clang-translation.c (original) +++ cfe/trunk/test/Driver/clang-translation.c Thu Dec 15 12:14:27 2016 @@ -11,19 +11,36 @@ // I386: "hidden" // I386: "-o" // I386: clang-translation + // RUN: %clang -target i386-apple-darwin9 -### -S %s -o %t.s 2>&1 | \ // RUN: FileCheck -check-prefix=YONAH %s +// RUN: %clang -target i386-apple-macosx10.11 -### -S %s -o %t.s 2>&1 | \ +// RUN: FileCheck -check-prefix=YONAH %s // YONAH: "-target-cpu" // YONAH: "yonah" + // RUN: %clang -target x86_64-apple-darwin9 -### -S %s -o %t.s 2>&1 | \ // RUN: FileCheck -check-prefix=CORE2 %s +// RUN: %clang -target x86_64-apple-macosx10.11 -### -S %s -o %t.s 2>&1 | \ +// RUN: FileCheck -check-prefix=CORE2 %s // CORE2: "-target-cpu" // CORE2: "core2" + // RUN: %clang -target x86_64h-apple-darwin -### -S %s -o %t.s 2>&1 | \ // RUN: FileCheck -check-prefix=AVX2 %s +// RUN: %clang -target x86_64h-apple-macosx10.12 -### -S %s -o %t.s 2>&1 | \ +// RUN: FileCheck -check-prefix=AVX2 %s // AVX2: "-target-cpu" // AVX2: "core-avx2" +// RUN: %clang -target i386-apple-macosx10.12 -### -S %s -o %t.s 2>&1 | \ +// RUN: FileCheck -check-prefix=PENRYN %s +// RUN: %clang -target x86_64-apple-macosx10.12 -### -S %s -o %t.s 2>&1 | \ +// RUN: FileCheck -check-prefix=PENRYN %s +// PENRYN: "-target-cpu" +// PENRYN: "penryn" + + // RUN: %clang -target x86_64-apple-darwin10 -### -S %s -arch armv7 2>&1 | \ // RUN: FileCheck -check-prefix=ARMV7_DEFAULT %s // ARMV7_DEFAULT: clang _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits