[mips] Show warning in case of mixing -mlong-calls and -mabicalls options

[atanasyan]

Summary

While we do not support -mshared / -mno-shared properly, show warning and ignore -mlong-calls option in case of implicitly or explicitly provided -mabicalls option.

The patch depends on D36550.

[sdardis]

include/clang/Basic/DiagnosticDriverKinds.td

296–297 ↗

(On Diff #110478)

"as it is not currently supported with "

I think is better, as we currently don't support mixing the options but could do in the future.

[atanasyan]

• Addressed review comments.

[sdardis]

test/Driver/mips-longcalls-warning.c

1 ↗

(On Diff #110478)

Can you put this in test/Driver/mips-abicalls-warning.c from the other patch? I'd prefer to keep all the abicalls warnings together rather than separate tests based on the feature the conflict with.

[atanasyan]

test/Driver/mips-longcalls-warning.c

1 ↗

(On Diff #110478)

Can you put this in test/Driver/mips-abicalls-warning.c from the other patch?

I can, but in that case it's probably better to join both patches because that patch loses its test.

[sdardis]

LGTM.

test/Driver/mips-longcalls-warning.c

1 ↗

(On Diff #110478)

You can do it as an NFC change afterward both commits in that case.

[atanasyan]

test/Driver/mips-longcalls-warning.c

1 ↗

(On Diff #110478)

OK. Thanks for review.

cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td

def warn_target_unsupported_nanlegacy : Warning<
   InGroup<UnsupportedNan>;
 def warn_target_unsupported_compact_branches : Warning<
   "ignoring '-mcompact-branches=' option because the '%0' architecture does not"
   " support it">, InGroup<UnsupportedCB>;
 def warn_drv_unsupported_gpopt : Warning<
   "ignoring '-mgpopt' option as it cannot be used with %select{|the implicit"
   " usage of }0-mabicalls">,
   InGroup<UnsupportedGPOpt>;
+def warn_drv_unsupported_longcalls : Warning<
+  "ignoring '-mlong-calls' option as it is not currently supported with "
+  "%select{|the implicit usage of }0-mabicalls">,
+  InGroup<OptionIgnored>;
 def warn_drv_unsupported_abicalls : Warning<
   "ignoring '-mabicalls' option as it cannot be used with "
   "non position-independent code and the N64 ABI">,
   InGroup<OptionIgnored>;
 
 def warn_drv_unable_to_find_directory_expected : Warning<
   "unable to find %0 directory, expected to be in '%1'">,
   InGroup<InvalidOrNonExistentDirectory>, DefaultIgnore;

cfe/trunk/lib/Driver/ToolChains/Arch/Mips.cpp

if (UseAbiCalls && IsN64 && NonPIC) {
     UseAbiCalls = false;
   }
 
   if (!UseAbiCalls)
     Features.push_back("+noabicalls");
   else
     Features.push_back("-noabicalls");
 
+  if (Arg *A = Args.getLastArg(options::OPT_mlong_calls,
+                               options::OPT_mno_long_calls)) {
+    if (A->getOption().matches(options::OPT_mno_long_calls))
+      Features.push_back("-long-calls");
+    else if (!UseAbiCalls)
+      Features.push_back("+long-calls");
+    else
+      D.Diag(diag::warn_drv_unsupported_longcalls) << (ABICallsArg ? 0 : 1);
+  }
+
   mips::FloatABI FloatABI = mips::getMipsFloatABI(D, Args);
   if (FloatABI == mips::FloatABI::Soft) {
     // FIXME: Note, this is a hack. We need to pass the selected float
     // mode to the MipsTargetInfoBase to define appropriate macros there.
     // Now it is the only method.
     Features.push_back("+soft-float");
   }
 
if (Arg *A = Args.getLastArg(options::OPT_mfp32, options::OPT_mfpxx,
     Features.push_back("+nooddspreg");
   } else if (mips::isFP64ADefault(Triple, CPUName)) {
     Features.push_back("+fp64");
     Features.push_back("+nooddspreg");
   }
 
   AddTargetFeature(Args, Features, options::OPT_mno_odd_spreg,
                    options::OPT_modd_spreg, "nooddspreg");
-  AddTargetFeature(Args, Features, options::OPT_mlong_calls,
-                   options::OPT_mno_long_calls, "long-calls");
   AddTargetFeature(Args, Features, options::OPT_mmt, options::OPT_mno_mt, "mt");
 }
 
 mips::NanEncoding mips::getSupportedNanEncoding(StringRef &CPU) {
   // Strictly speaking, mips32r2 and mips64r2 are NanLegacy-only since Nan2008
   // was first introduced in Release 3. However, other compilers have
   // traditionally allowed it for Release 2 so we should do the same.
   return (NanEncoding)llvm::StringSwitch<int>(CPU)

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

 //
 // -msingle-float -mfpxx (IMG)
 // RUN: %clang -target mips-img-linux-gnu -### -c %s -msingle-float -mfpxx 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-IMG-SINGLEFLOAT-FPXX %s
 // CHECK-IMG-SINGLEFLOAT-FPXX: "-target-feature" "+single-float"
 // CHECK-IMG-SINGLEFLOAT-FPXX: "-target-feature" "+fpxx"
 
 // -mlong-call
-// RUN: %clang -target mips-img-linux-gnu -### -c %s -mlong-calls 2>&1 \
+// RUN: %clang -target mips-img-linux-gnu -### -c %s \
+// RUN:        -mno-abicalls -mlong-calls 2>&1 \
 // RUN:   | FileCheck --check-prefix=LONG-CALLS-ON %s
-// RUN: %clang -target mips-img-linux-gnu -### -c %s -mno-long-calls 2>&1 \
+// RUN: %clang -target mips-img-linux-gnu -### -c %s \
+// RUN:        -mno-abicalls -mno-long-calls 2>&1 \
 // RUN:   | FileCheck --check-prefix=LONG-CALLS-OFF %s
 // RUN: %clang -target mips-img-linux-gnu -### -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=LONG-CALLS-DEF %s
+// RUN: %clang -target mips-img-linux-gnu -### -c %s -mlong-calls 2>&1 \
+// RUN:   | FileCheck --check-prefix=LONG-CALLS-DEF %s
 // LONG-CALLS-ON: "-target-feature" "+long-calls"
 // LONG-CALLS-OFF: "-target-feature" "-long-calls"
 // LONG-CALLS-DEF-NOT: "long-calls"

cfe/trunk/test/Driver/mips-longcalls-warning.c

+// REQUIRES: mips-registered-target
+// RUN: %clang -### -c -target mips-mti-elf -mlong-calls %s 2>&1 | FileCheck -check-prefix=IMPLICIT %s
+// IMPLICIT: warning: ignoring '-mlong-calls' option as it is not currently supported with the implicit usage of -mabicalls
+
+// RUN: %clang -### -c -target mips-mti-elf -mlong-calls -mabicalls %s 2>&1 | FileCheck -check-prefix=EXPLICIT %s
+// EXPLICIT: warning: ignoring '-mlong-calls' option as it is not currently supported with -mabicalls