default to -march=i586 on i386

llvm 9 and later take more care not to inline cmpxchg8b/cx8 with
-march=i486 instead calling __atomic_* functions.  This in turn breaks
the build of a large number of ports.

To avoid having to add a lock or conditionally building individual ports
with -march=i586 change the default so 64 bit atomics will always be
available.

ok patrick@ sthen@ deraadt@

1 files changed, 1 insertions, 1 deletions

diff --git a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp
index 495e7c0aa8d..bebcd87aad6 100644
--- a/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp
+++ b/gnu/llvm/clang/lib/Driver/ToolChains/Arch/X86.cpp
@@ -95,9 +95,9 @@ const char *x86::getX86TargetCPU(const ArgList &Args,
   switch (Triple.getOS()) {
   case llvm::Triple::FreeBSD:
   case llvm::Triple::NetBSD:
-  case llvm::Triple::OpenBSD:
     return "i486";
   case llvm::Triple::Haiku:
+  case llvm::Triple::OpenBSD:
     return "i586";
   default:
     // Fallback to p4.