Author: yingopq Date: 2025-04-15T17:01:36+08:00 New Revision: 1ee8fe810fab9f660b72585a782a449c8f83d8e6
URL: https://github.com/llvm/llvm-project/commit/1ee8fe810fab9f660b72585a782a449c8f83d8e6 DIFF: https://github.com/llvm/llvm-project/commit/1ee8fe810fab9f660b72585a782a449c8f83d8e6.diff LOG: [Mips] Fix clang compile error when -march=p5600 with -mmsa (#132679) When -march=p5600 with -mmsa, the result of getISARev is 0, so report error. Append p5600 to cases mips32r5. Fix #91948. Added: Modified: clang/lib/Basic/Targets/Mips.cpp clang/test/Driver/mips-abi.c Removed: ################################################################################ diff --git a/clang/lib/Basic/Targets/Mips.cpp b/clang/lib/Basic/Targets/Mips.cpp index 08f9e3c29d1ed..0bf5a062d3192 100644 --- a/clang/lib/Basic/Targets/Mips.cpp +++ b/clang/lib/Basic/Targets/Mips.cpp @@ -69,12 +69,12 @@ void MipsTargetInfo::fillValidCPUList( unsigned MipsTargetInfo::getISARev() const { return llvm::StringSwitch<unsigned>(getCPU()) - .Cases("mips32", "mips64", 1) - .Cases("mips32r2", "mips64r2", "octeon", "octeon+", 2) - .Cases("mips32r3", "mips64r3", 3) - .Cases("mips32r5", "mips64r5", 5) - .Cases("mips32r6", "mips64r6", 6) - .Default(0); + .Cases("mips32", "mips64", 1) + .Cases("mips32r2", "mips64r2", "octeon", "octeon+", 2) + .Cases("mips32r3", "mips64r3", 3) + .Cases("mips32r5", "mips64r5", "p5600", 5) + .Cases("mips32r6", "mips64r6", 6) + .Default(0); } void MipsTargetInfo::getTargetDefines(const LangOptions &Opts, diff --git a/clang/test/Driver/mips-abi.c b/clang/test/Driver/mips-abi.c index f131a07888dba..14eb890c74bc0 100644 --- a/clang/test/Driver/mips-abi.c +++ b/clang/test/Driver/mips-abi.c @@ -115,6 +115,20 @@ // MIPS-ARCH-P5600: "-target-cpu" "p5600" // MIPS-ARCH-P5600: "-target-abi" "o32" // +// RUN: %clang --target=mips-linux-gnu -### -c %s \ +// RUN: -march=p5600 -mmsa -mnan=2008 2>&1 \ +// RUN: | FileCheck -check-prefix=MIPS-ARCH-P5600-MSA %s +// MIPS-ARCH-P5600-MSA: "-target-cpu" "p5600" +// MIPS-ARCH-P5600-MSA: "-target-feature" "+msa" +// MIPS-ARCH-P5600-MSA: "-target-feature" "+fp64" +// +// RUN: %clang --target=mips-linux-gnu -### -c %s \ +// RUN: -march=p5600 -mmsa -mnan=2008 2>&1 \ +// RUN: | FileCheck -check-prefix=MIPS-ARCH-P5600-NAN2008 %s +// MIPS-ARCH-P5600-NAN2008: "-target-cpu" "p5600" +// MIPS-ARCH-P5600-NAN2008: "-target-feature" "+nan2008" +// MIPS-ARCH-P5600-NAN2008: "-target-feature" "+abs2008" +// // RUN: not %clang --target=mips-linux-gnu -c %s \ // RUN: -march=p5600 -mabi=64 2>&1 \ // RUN: | FileCheck -check-prefix=MIPS-ARCH-P5600-N64 %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
