Skip to content

Commit 6228122

Browse files
MaskRayMaskRay
committed
[Driver] Remove duplicate -e
-e has the LinkerInput flag (commit fcf8ada) and is rendered by AddLinkerInputs. We should remove duplicate rendering (e.g., `Args.AddAllArgs(CmdArgs, options::OPT_e)`).
1 parent fb149e4 commit 6228122

16 files changed

+27
-34
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ void ananas::Linker::ConstructJob(Compilation &C, const JobAction &JA,
101101
Args.AddAllArgs(CmdArgs, options::OPT_L);
102102
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
103103
Args.AddAllArgs(CmdArgs,
104-
{options::OPT_T_Group, options::OPT_e, options::OPT_s,
105-
options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
104+
{options::OPT_T_Group, options::OPT_s, options::OPT_t,
105+
options::OPT_Z_Flag, options::OPT_r});
106106

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,9 @@ void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
430430

431431
CmdArgs.push_back("-Bstatic");
432432

433-
Args.AddAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group,
434-
options::OPT_e, options::OPT_s, options::OPT_t,
435-
options::OPT_Z_Flag, options::OPT_r});
433+
Args.AddAllArgs(CmdArgs,
434+
{options::OPT_L, options::OPT_T_Group, options::OPT_s,
435+
options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
436436

437437
TC.AddFilePathLibArgs(Args, CmdArgs);
438438

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ void CSKY::Linker::ConstructJob(Compilation &C, const JobAction &JA,
170170
Args.AddAllArgs(CmdArgs, options::OPT_L);
171171
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
172172
Args.AddAllArgs(CmdArgs,
173-
{options::OPT_T_Group, options::OPT_e, options::OPT_s,
174-
options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
173+
{options::OPT_T_Group, options::OPT_s, options::OPT_t,
174+
options::OPT_Z_Flag, options::OPT_r});
175175

176176
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
177177

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ void cloudabi::Linker::ConstructJob(Compilation &C, const JobAction &JA,
7070
Args.AddAllArgs(CmdArgs, options::OPT_L);
7171
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
7272
Args.AddAllArgs(CmdArgs,
73-
{options::OPT_T_Group, options::OPT_e, options::OPT_s,
74-
options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
73+
{options::OPT_T_Group, options::OPT_s, options::OPT_t,
74+
options::OPT_Z_Flag, options::OPT_r});
7575

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,9 @@ void darwin::Linker::ConstructJob(Compilation &C, const JobAction &JA,
626626

627627
// It seems that the 'e' option is completely ignored for dynamic executables
628628
// (the default), and with static executables, the last one wins, as expected.
629-
Args.AddAllArgs(CmdArgs, {options::OPT_d_Flag, options::OPT_s, options::OPT_t,
630-
options::OPT_Z_Flag, options::OPT_u_Group,
631-
options::OPT_e, options::OPT_r});
629+
Args.AddAllArgs(CmdArgs,
630+
{options::OPT_d_Flag, options::OPT_s, options::OPT_t,
631+
options::OPT_Z_Flag, options::OPT_u_Group, options::OPT_r});
632632

633633
// Forward -ObjC when either -ObjC or -ObjC++ is used, to force loading
634634
// members of static archive libraries which implement Objective-C classes or

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
269269
Args.AddAllArgs(CmdArgs, options::OPT_L);
270270
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
271271
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
272-
Args.AddAllArgs(CmdArgs, options::OPT_e);
273272
Args.AddAllArgs(CmdArgs, options::OPT_s);
274273
Args.AddAllArgs(CmdArgs, options::OPT_t);
275274
Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,8 @@ constructHexagonLinkArgs(Compilation &C, const JobAction &JA,
363363

364364
CmdArgs.push_back(
365365
Args.MakeArgString(StringRef("-L") + D.SysRoot + "/usr/lib"));
366-
Args.AddAllArgs(CmdArgs,
367-
{options::OPT_T_Group, options::OPT_e, options::OPT_s,
368-
options::OPT_t, options::OPT_u_Group});
366+
Args.AddAllArgs(CmdArgs, {options::OPT_T_Group, options::OPT_s,
367+
options::OPT_t, options::OPT_u_Group});
369368
AddLinkerInputs(HTC, Inputs, Args, CmdArgs, JA);
370369

371370
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
@@ -446,9 +445,8 @@ constructHexagonLinkArgs(Compilation &C, const JobAction &JA,
446445
//----------------------------------------------------------------------------
447446
//
448447
//----------------------------------------------------------------------------
449-
Args.AddAllArgs(CmdArgs,
450-
{options::OPT_T_Group, options::OPT_e, options::OPT_s,
451-
options::OPT_t, options::OPT_u_Group});
448+
Args.AddAllArgs(CmdArgs, {options::OPT_T_Group, options::OPT_s,
449+
options::OPT_t, options::OPT_u_Group});
452450

453451
AddLinkerInputs(HTC, Inputs, Args, CmdArgs, JA);
454452

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ void msp430::Linker::ConstructJob(Compilation &C, const JobAction &JA,
280280
CmdArgs.push_back("--gc-sections");
281281

282282
Args.AddAllArgs(CmdArgs, {
283-
options::OPT_e,
284283
options::OPT_n,
285284
options::OPT_s,
286285
options::OPT_t,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ void tools::MinGW::Linker::ConstructJob(Compilation &C, const JobAction &JA,
192192
} else
193193
CmdArgs.push_back(OutputFile);
194194

195-
Args.AddAllArgs(CmdArgs, options::OPT_e);
196195
// FIXME: add -N, -n flags
197196
Args.AddLastArg(CmdArgs, options::OPT_r);
198197
Args.AddLastArg(CmdArgs, options::OPT_s);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ void tools::Myriad::Linker::ConstructJob(Compilation &C, const JobAction &JA,
161161
CmdArgs.push_back(Args.MakeArgString(TC.GetFilePath("crtbegin.o")));
162162
}
163163

164-
Args.AddAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group,
165-
options::OPT_e, options::OPT_s, options::OPT_t,
166-
options::OPT_Z_Flag, options::OPT_r});
164+
Args.AddAllArgs(CmdArgs,
165+
{options::OPT_L, options::OPT_T_Group, options::OPT_s,
166+
options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
167167

168168
TC.AddFilePathLibArgs(Args, CmdArgs);
169169

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ void netbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
256256

257257
Args.AddAllArgs(CmdArgs, options::OPT_L);
258258
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
259-
Args.AddAllArgs(CmdArgs, options::OPT_e);
260259
Args.AddAllArgs(CmdArgs, options::OPT_s);
261260
Args.AddAllArgs(CmdArgs, options::OPT_t);
262261
Args.AddAllArgs(CmdArgs, options::OPT_Z_Flag);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
196196

197197
Args.AddAllArgs(CmdArgs, options::OPT_L);
198198
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
199-
Args.AddAllArgs(CmdArgs, {options::OPT_T_Group, options::OPT_e,
200-
options::OPT_s, options::OPT_t,
201-
options::OPT_Z_Flag, options::OPT_r});
199+
Args.AddAllArgs(CmdArgs,
200+
{options::OPT_T_Group, options::OPT_s, options::OPT_t,
201+
options::OPT_Z_Flag, options::OPT_r});
202202

203203
bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
204204
bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ void tools::PScpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
206206

207207
Args.AddAllArgs(CmdArgs, options::OPT_L);
208208
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
209-
Args.AddAllArgs(CmdArgs, options::OPT_e);
210209
Args.AddAllArgs(CmdArgs, options::OPT_s);
211210
Args.AddAllArgs(CmdArgs, options::OPT_t);
212211
Args.AddAllArgs(CmdArgs, options::OPT_r);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ void RISCV::Linker::ConstructJob(Compilation &C, const JobAction &JA,
194194
Args.AddAllArgs(CmdArgs, options::OPT_u);
195195
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
196196
Args.AddAllArgs(CmdArgs,
197-
{options::OPT_T_Group, options::OPT_e, options::OPT_s,
198-
options::OPT_t, options::OPT_Z_Flag, options::OPT_r});
197+
{options::OPT_T_Group, options::OPT_s, options::OPT_t,
198+
options::OPT_Z_Flag, options::OPT_r});
199199

200200
// TODO: add C++ includes and libs if compiling C++.
201201

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

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

122122
getToolChain().AddFilePathLibArgs(Args, CmdArgs);
123123

124-
Args.AddAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group,
125-
options::OPT_e, options::OPT_r});
124+
Args.AddAllArgs(CmdArgs,
125+
{options::OPT_L, options::OPT_T_Group, options::OPT_r});
126126

127127
bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, CmdArgs);
128128
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);

‎clang/test/Driver/msp430-toolchain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
// RUN: FileCheck -check-prefix=MISC-FLAGS-2-POS %s < %t
5858
// RUN: FileCheck -check-prefix=MISC-FLAGS-2-NEG %s < %t
5959
// MISC-FLAGS-2-POS: "{{.*}}msp430-elf-ld"
60-
// MISC-FLAGS-2-POS: "-e" "EntryPoint" "-s" "-u" "__undef"
60+
// MISC-FLAGS-2-POS: "-s" "-u" "__undef"{{.*}} "-e" "EntryPoint"
6161
// MISC-FLAGS-2-NEG: "{{.*}}msp430-elf-ld"
6262
// MISC-FLAGS-2-NEG-NOT: "-r"
6363
// MISC-FLAGS-2-NEG-NOT: "-t"

0 commit comments

Comments
 (0)