diff options
| -rw-r--r-- | clang/lib/Driver/ToolChains/Arch/X86.cpp | 6 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/Darwin.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Driver/clang-translation.c | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/clang/lib/Driver/ToolChains/Arch/X86.cpp b/clang/lib/Driver/ToolChains/Arch/X86.cpp index bc707857d8f..45648945d5e 100644 --- a/clang/lib/Driver/ToolChains/Arch/X86.cpp +++ b/clang/lib/Driver/ToolChains/Arch/X86.cpp @@ -23,12 +23,8 @@ using namespace llvm::opt; const char *x86::getX86TargetCPU(const ArgList &Args, const llvm::Triple &Triple) { if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_march_EQ)) { - if (StringRef(A->getValue()) != "native") { - if (Triple.isOSDarwin() && Triple.getArchName() == "x86_64h") - return "core-avx2"; - + if (StringRef(A->getValue()) != "native") return A->getValue(); - } // FIXME: Reject attempts to use -march=native unless the target matches // the host. diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 0cc187ab475..4e306fd960e 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -2017,12 +2017,8 @@ DerivedArgList *MachO::TranslateArgs(const DerivedArgList &Args, else if (Name == "pentIIm3") DAL->AddJoinedArg(nullptr, MArch, "pentium2"); - else if (Name == "x86_64") + else if (Name == "x86_64" || Name == "x86_64h") DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_m64)); - else if (Name == "x86_64h") { - DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_m64)); - DAL->AddJoinedArg(nullptr, MArch, "x86_64h"); - } else if (Name == "arm") DAL->AddJoinedArg(nullptr, MArch, "armv4t"); diff --git a/clang/test/Driver/clang-translation.c b/clang/test/Driver/clang-translation.c index ed24ae27fbb..4360ea44aeb 100644 --- a/clang/test/Driver/clang-translation.c +++ b/clang/test/Driver/clang-translation.c @@ -33,6 +33,11 @@ // AVX2: "-target-cpu" // AVX2: "core-avx2" +// RUN: %clang -target x86_64h-apple-darwin -march=skx -### %s -o /dev/null 2>&1 | \ +// RUN: FileCheck -check-prefix=X8664HSKX %s +// X8664HSKX: "-target-cpu" +// X8664HSKX: "skx" + // 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 | \ |
