[driver][mips] Adjust target triple accordingly to provided ABI name

[atanasyan]

Summary

Explicitly selected MIPS ABI using the -mabi option implies corresponding target triple. For 'O32' ABI it's a 32-bit target triple like mips-linux-gnu. For 'N32' and 'N64' ABIs it's a 64-bit target triple like mips64-linux-gnu. This patch adjusts target triple accordingly these rules like we do for pseudo-target flags '-m64', '-m32' etc already.

[atanasyan]

Ping?

[rnk]

Should --target=mipsZZZ -mabi=n64 be meaningful? What does clang --target=i686-linux-gnu -m64 do? If this matches that, then let's do it.

I think each listed reviewer is currently at CppCon, hence the delay.

[atanasyan]

In D52290#1245222, @rnk wrote:

Should --target=mipsZZZ -mabi=n64 be meaningful? What does clang --target=i686-linux-gnu -m64 do? If this matches that, then let's do it.

Thanks. Initially I thought that providing different target triple and -mabi option explicitly is an error. But now I see that it's better and consistent with other targets to adjust a target triple accordingly to -mabi options in any (implicit/explicit) case. I will update the patch soon.

[atanasyan]

Always adjust target triple (explicitly and implicitly provided) accordingly to ABI name.

[rnk]

lib/Driver/Driver.cpp

492 ↗

(On Diff #167091)

We should emit a diagnostic for invalid -mabi=values.

[atanasyan]

lib/Driver/Driver.cpp

492 ↗

(On Diff #167091)

We already do that:

$ clang -target mips-linux-gnu -c test.c -mabi=xxx
error: unknown target ABI 'xxx'

[rnk]

Lgtm, thanks!

[atanasyan]

Thanks for review.

[MaskRay]

cfe/trunk/lib/Driver/Driver.cpp

486

getLastArg claims the option for non-mips architecture and makes other architectures silently accept unknown -mabi=. This was fixed by D134671.

cfe/trunk/lib/Driver/Driver.cpp

if (Args.hasFlag(options::OPT_miamcu, options::OPT_mno_iamcu, false)) {
     Target.setArchName("i586");
     Target.setEnvironment(llvm::Triple::UnknownEnvironment);
     Target.setEnvironmentName("");
     Target.setOS(llvm::Triple::ELFIAMCU);
     Target.setVendor(llvm::Triple::UnknownVendor);
     Target.setVendorName("intel");
   }
 
+  // If target is MIPS adjust the target triple
+  // accordingly to provided ABI name.
+  A = Args.getLastArg(options::OPT_mabi_EQ);
+  if (A && Target.isMIPS())
+    Target = llvm::StringSwitch<llvm::Triple>(A->getValue())
+                 .Case("32", Target.get32BitArchVariant())
+                 .Case("n32", Target.get64BitArchVariant())
+                 .Case("64", Target.get64BitArchVariant())
+                 .Default(Target);
+
   return Target;
 }
 
 // Parse the LTO options and record the type of LTO compilation
 // based on which -f(no-)?lto(=.*)? option occurs last.
 void Driver::setLTOMode(const llvm::opt::ArgList &Args) {
   LTOMode = LTOK_None;
   if (!Args.hasFlag(options::OPT_flto, options::OPT_flto_EQ,

cfe/trunk/test/Driver/mips-abi.c

 // RUN:        -march=mips32 2>&1 \
 // RUN:   | FileCheck -check-prefix=MIPS-ARCH-6432 %s
 // MIPS-ARCH-6432: error: ABI 'n64' is not supported on CPU 'mips32'
 //
 // RUN: not %clang -target mips-linux-gnu -c %s \
 // RUN:        -march=unknown 2>&1 \
 // RUN:   | FileCheck -check-prefix=MIPS-ARCH-UNKNOWN %s
 // MIPS-ARCH-UNKNOWN: error: unknown target CPU 'unknown'
+
+// Check adjusting of target triple accordingly to `-mabi` option.
+// RUN: %clang -target mips64-linux-gnu -mabi=32 -### %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=TARGET-O32 %s
+// TARGET-O32: "-triple" "mips-unknown-linux-gnu"
+// TARGET-O32: "-target-cpu" "mips32r2"
+// TARGET-O32: "-target-abi" "o32"
+// TARGET-O32: ld{{.*}}"
+// TARGET-O32: "-m" "elf32btsmip"
+
+// RUN: %clang -target mips-linux-gnu -mabi=n32 -### %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=TARGET-N32 %s
+// TARGET-N32: "-triple" "mips64-unknown-linux-gnu"
+// TARGET-N32: "-target-cpu" "mips64r2"
+// TARGET-N32: "-target-abi" "n32"
+// TARGET-N32: ld{{.*}}"
+// TARGET-N32: "-m" "elf32btsmipn32"
+
+// RUN: %clang -target mips-linux-gnu -mabi=64 -### %s 2>&1 \
+// RUN:   | FileCheck -check-prefix=TARGET-N64 %s
+// TARGET-N64: "-triple" "mips64-unknown-linux-gnu"
+// TARGET-N64: "-target-cpu" "mips64r2"
+// TARGET-N64: "-target-abi" "n64"
+// TARGET-N64: ld{{.*}}"
+// TARGET-N64: "-m" "elf64btsmip"