r308436 - Revert "[mips] Teach the driver to accept -m(no-)gpopt."
Simon Dardis via cfe-commits
cfe-commits at lists.llvm.org
Wed Jul 19 04:11:02 PDT 2017
Author: sdardis
Date: Wed Jul 19 04:11:02 2017
New Revision: 308436
URL: http://llvm.org/viewvc/llvm-project?rev=308436&view=rev
Log:
Revert "[mips] Teach the driver to accept -m(no-)gpopt."
Revert r308431 and r308432, these caused broke some buildbots.
Removed:
cfe/trunk/test/Driver/mips-gpopt-warning.c
Modified:
cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
cfe/trunk/include/clang/Basic/DiagnosticGroups.td
cfe/trunk/include/clang/Driver/Options.td
cfe/trunk/lib/Driver/ToolChains/Clang.cpp
cfe/trunk/test/Driver/mips-features.c
Modified: cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td?rev=308436&r1=308435&r2=308436&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticDriverKinds.td Wed Jul 19 04:11:02 2017
@@ -279,10 +279,6 @@ def warn_target_unsupported_nanlegacy :
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_unable_to_find_directory_expected : Warning<
"unable to find %0 directory, expected to be in '%1'">,
Modified: cfe/trunk/include/clang/Basic/DiagnosticGroups.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticGroups.td?rev=308436&r1=308435&r2=308436&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticGroups.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticGroups.td Wed Jul 19 04:11:02 2017
@@ -61,7 +61,6 @@ def DoublePromotion : DiagGroup<"double-
def EnumTooLarge : DiagGroup<"enum-too-large">;
def UnsupportedNan : DiagGroup<"unsupported-nan">;
def UnsupportedCB : DiagGroup<"unsupported-cb">;
-def UnsupportedGPOpt : DiagGroup<"unsupported-gpopt">;
def NonLiteralNullConversion : DiagGroup<"non-literal-null-conversion">;
def NullConversion : DiagGroup<"null-conversion">;
def ImplicitConversionFloatingPointToBool :
Modified: cfe/trunk/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=308436&r1=308435&r2=308436&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Wed Jul 19 04:11:02 2017
@@ -2035,12 +2035,6 @@ def mfp64 : Flag<["-"], "mfp64">, Group<
HelpText<"Use 64-bit floating point registers (MIPS only)">;
def mfp32 : Flag<["-"], "mfp32">, Group<m_Group>,
HelpText<"Use 32-bit floating point registers (MIPS only)">;
-def mgpopt : Flag<["-"], "mgpopt">, Group<m_Group>,
- HelpText<"Use GP relative accesses for symbols known to be in a small"
- " data section (MIPS)">;
-def mno_gpopt : Flag<["-"], "mno-gpopt">, Group<m_Group>,
- HelpText<"Do not use GP relative accesses for symbols known to be in a small"
- " data section (MIPS)">;
def mnan_EQ : Joined<["-"], "mnan=">, Group<m_Group>;
def mabicalls : Flag<["-"], "mabicalls">, Group<m_Group>,
HelpText<"Enable SVR4-style position-independent code (Mips only)">;
Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=308436&r1=308435&r2=308436&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Wed Jul 19 04:11:02 2017
@@ -1462,32 +1462,6 @@ void Clang::AddMIPSTargetArgs(const ArgL
A->claim();
}
- Arg *GPOpt = Args.getLastArg(options::OPT_mgpopt, options::OPT_mno_gpopt);
- Arg *ABICalls = Args.getLastArg(options::OPT_mabicalls, options::OPT_mno_abicalls);
-
- // -mabicalls is the default for many MIPS environments, even with -fno-pic.
- // -mgpopt is the default for static, -fno-pic environments but these two
- // options conflict. We want to be certain that -mno-abicalls -mgpopt is
- // the only case where -mllvm -mgpopt is passed.
- // NOTE: We need a warning here or in the backend to warn when -mgpopt is
- // passed explicitly when compiling something with -mabicalls
- // (implictly) in affect. Currently the warning is in the backend.
- bool NoABICalls =
- ABICalls && ABICalls->getOption().matches(options::OPT_mno_abicalls);
- bool WantGPOpt = GPOpt && GPOpt->getOption().matches(options::OPT_mgpopt);
- if (NoABICalls && (!GPOpt || WantGPOpt)) {
- CmdArgs.push_back("-mllvm");
- CmdArgs.push_back("-mgpopt=1");
- } else {
- CmdArgs.push_back("-mllvm");
- CmdArgs.push_back("-mgpopt=0");
- if ((!ABICalls || (!NoABICalls && ABICalls)) && (!GPOpt || WantGPOpt))
- D.Diag(diag::warn_drv_unsupported_gpopt) << (ABICalls ? 0 : 1);
- }
-
- if (GPOpt)
- GPOpt->claim();
-
if (Arg *A = Args.getLastArg(options::OPT_mcompact_branches_EQ)) {
StringRef Val = StringRef(A->getValue());
if (mips::hasCompactBranches(CPUName)) {
Modified: cfe/trunk/test/Driver/mips-features.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mips-features.c?rev=308436&r1=308435&r2=308436&view=diff
==============================================================================
--- cfe/trunk/test/Driver/mips-features.c (original)
+++ cfe/trunk/test/Driver/mips-features.c Wed Jul 19 04:11:02 2017
@@ -10,31 +10,6 @@
// RUN: | FileCheck --check-prefix=CHECK-MNOABICALLS %s
// CHECK-MNOABICALLS: "-target-feature" "+noabicalls"
//
-// -mgpopt
-// RUN: %clang -target mips-linux-gnu -### -c %s -mno-gpopt -mgpopt 2>&1 \
-// RUN: | FileCheck --check-prefix=CHECK-MGPOPT-DEF-ABICALLS %s
-// CHECK-MGPOPT-DEF-ABICALLS-NOT: "-mllvm" "-mgpopt"
-//
-// -mabicalls -mgpopt
-// RUN: %clang -target mips-linux-gnu -### -c %s -mabicalls -mno-gpopt -mgpopt 2>&1 \
-// RUN: | FileCheck --check-prefix=CHECK-MGPOPT-EXPLICIT-ABICALLS %s
-// CHECK-MGPOPT-EXPLICIT-ABICALLS-NOT: "-mllvm" "-mgpopt"
-//
-// -mno-abicalls -mgpopt
-// RUN: %clang -target mips-linux-gnu -### -c %s -mno-abicalls -mno-gpopt -mgpopt 2>&1 \
-// RUN: | FileCheck --check-prefix=CHECK-MGPOPT %s
-// CHECK-MGPOPT: "-mllvm" "-mgpopt=1"
-//
-// -mno-abicalls -mno-gpopt
-// RUN: %clang -target mips-linux-gnu -### -c %s -mno-abicalls -mgpopt -mno-gpopt 2>&1 \
-// RUN: | FileCheck --check-prefix=CHECK-MNOGPOPT %s
-// CHECK-MNOGPOPT: "-mllvm" "-mgpopt=0"
-//
-// -mno-abicalls
-// RUN: %clang -target mips-linux-gnu -### -c %s -mno-abicalls 2>&1 \
-// RUN: | FileCheck --check-prefix=CHECK-MGPOPTDEF %s
-// CHECK-MGPOPTDEF: "-mllvm" "-mgpopt=1"
-//
// -mips16
// RUN: %clang -target mips-linux-gnu -### -c %s \
// RUN: -mno-mips16 -mips16 2>&1 \
Removed: cfe/trunk/test/Driver/mips-gpopt-warning.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/mips-gpopt-warning.c?rev=308435&view=auto
==============================================================================
--- cfe/trunk/test/Driver/mips-gpopt-warning.c (original)
+++ cfe/trunk/test/Driver/mips-gpopt-warning.c (removed)
@@ -1,6 +0,0 @@
-// REQUIRES: mips-registered-target
-// RUN: %clang -### -c -target mips-mti-elf %s -mgpopt 2>&1 | FileCheck -check-prefix=IMPLICIT %s
-// IMPLICIT: warning: ignoring '-mgpopt' option as it cannot be used with the implicit usage of-mabicalls
-
-// RUN: %clang -### -c -target mips-mti-elf %s -mgpopt -mabicalls 2>&1 | FileCheck -check-prefix=EXPLICIT %s
-// EXPLICIT: warning: ignoring '-mgpopt' option as it cannot be used with -mabicalls
More information about the cfe-commits
mailing list