Skip to content

Commit 894927b

Browse files
brad0brad0
authored
[Driver] Group together linker options using addAllArgs (#68349)
1 parent dcf9d94 commit 894927b

File tree

9 files changed

+18
-29
lines changed

9 files changed

+18
-29
lines changed

‎clang/lib/Driver/ToolChains/FreeBSD.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,9 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
262262

263263
Args.AddAllArgs(CmdArgs, options::OPT_L);
264264
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
265-
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
266-
Args.AddAllArgs(CmdArgs, options::OPT_s);
267-
Args.AddAllArgs(CmdArgs, options::OPT_t);
268-
Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);
269-
Args.AddAllArgs(CmdArgs, options::OPT_r);
265+
Args.addAllArgs(CmdArgs,
266+
{options::OPT_T_Group, options::OPT_s, options::OPT_t,
267+
options::OPT_Z_Flag, options::OPT_r});
270268

271269
if (D.isUsingLTO()) {
272270
assert(!Inputs.empty() && "Must have at least one input.");

‎clang/lib/Driver/ToolChains/Fuchsia.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ void fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA,
133133
}
134134
}
135135

136-
Args.AddAllArgs(CmdArgs, options::OPT_L);
137-
Args.AddAllArgs(CmdArgs, options::OPT_u);
136+
Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_u});
138137

139138
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
140139

‎clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
530530
ToolChain.addFastMathRuntimeIfAvailable(Args, CmdArgs);
531531
}
532532

533-
Args.AddAllArgs(CmdArgs, options::OPT_L);
534-
Args.AddAllArgs(CmdArgs, options::OPT_u);
533+
Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_u});
535534

536535
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
537536

‎clang/lib/Driver/ToolChains/NaCl.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,7 @@ void nacltools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
120120
CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
121121
}
122122

123-
Args.AddAllArgs(CmdArgs, options::OPT_L);
124-
Args.AddAllArgs(CmdArgs, options::OPT_u);
123+
Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_u});
125124

126125
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
127126

‎clang/lib/Driver/ToolChains/NetBSD.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,9 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
266266
}
267267
}
268268

269-
Args.AddAllArgs(CmdArgs, options::OPT_L);
270-
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
271-
Args.AddAllArgs(CmdArgs, options::OPT_s);
272-
Args.AddAllArgs(CmdArgs, options::OPT_t);
273-
Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);
274-
Args.AddAllArgs(CmdArgs, options::OPT_r);
269+
Args.addAllArgs(CmdArgs,
270+
{options::OPT_L, options::OPT_T_Group, options::OPT_s,
271+
options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
275272

276273
bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
277274
bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);

‎clang/lib/Driver/ToolChains/PS4CPU.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,9 @@ void tools::PScpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
208208
CmdArgs.push_back("--lto=full");
209209
}
210210

211-
Args.AddAllArgs(CmdArgs, options::OPT_L);
212-
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
213-
Args.AddAllArgs(CmdArgs, options::OPT_s);
214-
Args.AddAllArgs(CmdArgs, options::OPT_t);
215-
Args.AddAllArgs(CmdArgs, options::OPT_r);
211+
Args.addAllArgs(CmdArgs,
212+
{options::OPT_L, options::OPT_T_Group, options::OPT_s,
213+
options::OPT_t, options::OPT_r});
216214

217215
if (Args.hasArg(options::OPT_Z_Xlinker__no_demangle))
218216
CmdArgs.push_back("--no-demangle");

‎clang/lib/Driver/ToolChains/RISCVToolchain.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ void RISCV::Linker::ConstructJob(Compilation &C, const JobAction &JA,
190190

191191
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
192192

193-
Args.AddAllArgs(CmdArgs, options::OPT_L);
194-
Args.AddAllArgs(CmdArgs, options::OPT_u);
193+
Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_u});
194+
195195
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
196196
Args.addAllArgs(CmdArgs,
197197
{options::OPT_T_Group, options::OPT_s, options::OPT_t,

‎clang/lib/Driver/ToolChains/WebAssembly.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ void wasm::Linker::ConstructJob(Compilation &C, const JobAction &JA,
7373
if (Args.hasArg(options::OPT_s))
7474
CmdArgs.push_back("--strip-all");
7575

76-
Args.AddAllArgs(CmdArgs, options::OPT_L);
77-
Args.AddAllArgs(CmdArgs, options::OPT_u);
76+
Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_u});
77+
7878
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
7979

8080
bool IsCommand = true;

‎clang/lib/Driver/ToolChains/ZOS.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,9 @@ void zos::Linker::ConstructJob(Compilation &C, const JobAction &JA,
156156
CmdArgs.push_back("/dev/null");
157157
}
158158

159-
Args.AddAllArgs(CmdArgs, options::OPT_u);
160-
161159
// Add archive library search paths.
162-
Args.AddAllArgs(CmdArgs, options::OPT_L);
160+
Args.addAllArgs(CmdArgs, {options::OPT_L, options::OPT_u});
161+
163162
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
164163

165164
// Specify linker input file(s)

0 commit comments

Comments
 (0)