[X86] Make triple ArchName override OS for i686 and i786

[pengfei]

Summary

Fixes #61347

[craig.topper]

Did you test this? I kind of expected the triple would be normalized before this. I’m not at a computer to check.

[pengfei]

In D145857#4186957, @craig.topper wrote:

Did you test this? I kind of expected the triple would be normalized before this. I’m not at a computer to check.

No, I just tried with gdb which proves the idea here. Will add test cases.

[pengfei]

Fix typo & add tests.

[pengfei]

Fix lit failure.

[pengfei]

Only make OS override i386.

[pengfei]

Support i886 and i986.

clang/lib/Driver/ToolChains/Arch/X86.cpp

std::string x86::getX86TargetCPU(const Driver &D, const ArgList &Args,
   // On Android use targets compatible with gcc
   if (Triple.isAndroid())
     return Is64Bit ? "x86-64" : "i686";
 
   // Everything else goes to x86-64 in 64-bit mode.
   if (Is64Bit)
     return "x86-64";
 
+  StringRef ArchName = Triple.getArchName();
+
+  if (ArchName == "i386") {
     switch (Triple.getOS()) {
     case llvm::Triple::NetBSD:
       return "i486";
     case llvm::Triple::Haiku:
     case llvm::Triple::OpenBSD:
       return "i586";
     case llvm::Triple::FreeBSD:
       return "i686";
     default:
       // Fallback to p4.
       return "pentium4";
     }
   }
 
+  if (ArchName == "i786" || ArchName == "i886" || ArchName == "i986")
+    return "pentium4";
+
+  return std::string(ArchName);
+}
+
 void x86::getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple,
                                const ArgList &Args,
                                std::vector<StringRef> &Features) {
   // If -march=native, autodetect the feature list.
   if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_march_EQ)) {
     if (StringRef(A->getValue()) == "native") {
       llvm::StringMap<bool> HostFeatures;
       if (llvm::sys::getHostCPUFeatures(HostFeatures))

clang/test/Driver/cl-x86-flags.c

 
 // RUN: %clang_cl -m64 -arch:avx512 --target=i386-pc-windows -### -- 2>&1 %s | FileCheck -check-prefix=avx51264 %s
 // avx51264: invalid /arch: argument
 
 // RUN: %clang_cl -m64 -arch:AVX -tune:haswell --target=x86_64-pc-windows -### -- 2>&1 %s | FileCheck -check-prefix=tune %s
 // tune: "-target-cpu" "sandybridge"
 // tune-SAME: "-tune-cpu" "haswell"
 
+// RUN: %clang_cl --target=i686-unknown-unknown -### -- 2>&1 %s | FileCheck -check-prefix=i686 %s
+// i686: "-target-cpu" "i686"
+
+// RUN: %clang_cl --target=i786-unknown-unknown -### -- 2>&1 %s | FileCheck -check-prefix=i786 %s
+// i786: "-target-cpu" "pentium4"
+
 void f(void) {
 }

clang/test/Driver/nacl-direct.c

 // Test clang changes for NaCl Support including:
 //    include paths, library paths, emulation, default static
 //
 // RUN: %clang -### %s \
 // RUN:     --target=i686-unknown-nacl -resource-dir foo 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-I686 %s
 // CHECK-I686: "-cc1"
 // CHECK-I686-NOT: "-fno-use-init-array"
-// CHECK-I686: "-target-cpu" "pentium4"
+// CHECK-I686: "-target-cpu" "i686"
 // CHECK-I686: "-resource-dir" "foo"
 // CHECK-I686: "-internal-isystem" "foo{{/|\\\\}}include"
 // CHECK-I686: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}i686-nacl{{/|\\\\}}usr{{/|\\\\}}include"
 // CHECK-I686: "-internal-isystem" "{{.*}}{{/|\\\\}}..{{/|\\\\}}x86_64-nacl{{/|\\\\}}include"
 // CHECK-I686: as{{(.exe)?}}" "--32"
 // CHECK-I686: ld{{(.exe)?}}"
 // CHECK-I686: "--build-id"
 // CHECK-I686: "-m" "elf_i386_nacl"