Author: Brad Smith Date: 2020-08-18T12:42:42+02:00 New Revision: c89e9d67721ab2bdbb25656bc2da2a52c1116917
URL: https://github.com/llvm/llvm-project/commit/c89e9d67721ab2bdbb25656bc2da2a52c1116917 DIFF: https://github.com/llvm/llvm-project/commit/c89e9d67721ab2bdbb25656bc2da2a52c1116917.diff LOG: Change the default target CPU for OpenBSD/i386 to i586 (cherry picked from commit cd5ab56bc406c3f9a6f593f98c63dafb53547ab1) Added: Modified: clang/lib/Driver/ToolChains/Arch/X86.cpp clang/test/Driver/openbsd.c Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Arch/X86.cpp b/clang/lib/Driver/ToolChains/Arch/X86.cpp index 2cc44c09917f..6b82abec6f65 100644 --- a/clang/lib/Driver/ToolChains/Arch/X86.cpp +++ b/clang/lib/Driver/ToolChains/Arch/X86.cpp @@ -93,13 +93,13 @@ const char *x86::getX86TargetCPU(const ArgList &Args, return "x86-64"; switch (Triple.getOS()) { - case llvm::Triple::FreeBSD: - return "i686"; case llvm::Triple::NetBSD: - case llvm::Triple::OpenBSD: return "i486"; case llvm::Triple::Haiku: + case llvm::Triple::OpenBSD: return "i586"; + case llvm::Triple::FreeBSD: + return "i686"; default: // Fallback to p4. return "pentium4"; diff --git a/clang/test/Driver/openbsd.c b/clang/test/Driver/openbsd.c index 51a5b4380f45..e17d05dc76da 100644 --- a/clang/test/Driver/openbsd.c +++ b/clang/test/Driver/openbsd.c @@ -14,6 +14,11 @@ // CHECK-PG: clang{{.*}}" "-cc1" "-triple" "i686-pc-openbsd" // CHECK-PG: ld{{.*}}" "-e" "__start" "--eh-frame-hdr" "-Bdynamic" "-dynamic-linker" "{{.*}}ld.so" "-nopie" "-o" "a.out" "{{.*}}gcrt0.o" "{{.*}}crtbegin.o" "{{.*}}.o" "-lcompiler_rt" "-lpthread_p" "-lc_p" "-lcompiler_rt" "{{.*}}crtend.o" +// Check CPU type for i386 +// RUN: %clang -target i386-unknown-openbsd -### -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-i386-CPU %s +// CHECK-i386-CPU: "-target-cpu" "i586" + // Check CPU type for MIPS64 // RUN: %clang -target mips64-unknown-openbsd -### -c %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK-MIPS64-CPU %s _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
