diff options
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 6 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 11 | ||||
| -rw-r--r-- | clang/test/Driver/mips-features.c | 15 |
3 files changed, 32 insertions, 0 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index d28dea7b631..875903417d1 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2045,6 +2045,12 @@ def mlocal_sdata : Flag<["-"], "mlocal-sdata">, Group<m_Group>, HelpText<"Extend the -G behaviour to object local data (MIPS)">; def mno_local_sdata : Flag<["-"], "mno-local-sdata">, Group<m_Group>, HelpText<"Do not extend the -G behaviour to object local data (MIPS)">; +def mextern_sdata : Flag<["-"], "mextern-sdata">, Group<m_Group>, + HelpText<"Assume that externally defined data is in the small data if it" + " meets the -G <size> threshold (MIPS)">; +def mno_extern_sdata : Flag<["-"], "mno-extern-sdata">, Group<m_Group>, + HelpText<"Do not assume that externally defined data is in the small data if" + " it meets the -G <size> threshold (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)">; diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 8cfe61bf784..16c700106ea 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -1483,6 +1483,8 @@ void Clang::AddMIPSTargetArgs(const ArgList &Args, Arg *LocalSData = Args.getLastArg(options::OPT_mlocal_sdata, options::OPT_mno_local_sdata); + Arg *ExternSData = Args.getLastArg(options::OPT_mextern_sdata, + options::OPT_mno_extern_sdata); if (LocalSData) { CmdArgs.push_back("-mllvm"); if (LocalSData->getOption().matches(options::OPT_mlocal_sdata)) { @@ -1493,6 +1495,15 @@ void Clang::AddMIPSTargetArgs(const ArgList &Args, LocalSData->claim(); } + if (ExternSData) { + CmdArgs.push_back("-mllvm"); + if (ExternSData->getOption().matches(options::OPT_mextern_sdata)) { + CmdArgs.push_back("-mextern-sdata=1"); + } else { + CmdArgs.push_back("-mextern-sdata=0"); + } + ExternSData->claim(); + } } else if ((!ABICalls || (!NoABICalls && ABICalls)) && WantGPOpt) D.Diag(diag::warn_drv_unsupported_gpopt) << (ABICalls ? 0 : 1); diff --git a/clang/test/Driver/mips-features.c b/clang/test/Driver/mips-features.c index 4f6b05684c0..6e8f6170c90 100644 --- a/clang/test/Driver/mips-features.c +++ b/clang/test/Driver/mips-features.c @@ -50,6 +50,21 @@ // RUN: | FileCheck --check-prefix=CHECK-MLOCALSDATADEF %s // CHECK-MLOCALSDATADEF-NOT: "-mllvm" "-mlocal-sdata" // +// -mno-abicalls -mgpopt -mextern-sdata +// RUN: %clang -target mips-linux-gnu -### -c %s -mno-abicalls -mgpopt -mno-extern-sdata -mextern-sdata 2>&1 \ +// RUN: | FileCheck --check-prefix=CHECK-MEXTERNSDATA %s +// CHECK-MEXTERNSDATA: "-mllvm" "-mextern-sdata=1" +// +// -mno-abicalls -mgpopt -mno-extern-sdata +// RUN: %clang -target mips-linux-gnu -### -c %s -mno-abicalls -mgpopt -mextern-sdata -mno-extern-sdata 2>&1 \ +// RUN: | FileCheck --check-prefix=CHECK-MNOEXTERNSDATA %s +// CHECK-MNOEXTERNSDATA: "-mllvm" "-mextern-sdata=0" +// +// -mno-abicalls -mgpopt +// RUN: %clang -target mips-linux-gnu -### -c %s -mno-abicalls -mgpopt 2>&1 \ +// RUN: | FileCheck --check-prefix=CHECK-MEXTERNSDATADEF %s +// CHECK-MEXTERNSDATADEF-NOT: "-mllvm" "-mextern-sdata" +// // -mips16 // RUN: %clang -target mips-linux-gnu -### -c %s \ // RUN: -mno-mips16 -mips16 2>&1 \ |
