Skip to content

Commit e4a79b7

Browse files
authored
[LLD] [MinGW] Fall back to using default target if no -m flag given. (#134700)
On Cygwin at least, GCC is not passing any -m flag to the linker, so fall back to the default target triple to determine if we need to apply i386-specific behaviors. Fixes #134558
1 parent db22909 commit e4a79b7

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

lld/MinGW/Driver.cpp

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,14 @@ searchLibrary(StringRef name, ArrayRef<StringRef> searchPaths, bool bStatic) {
171171
return "";
172172
}
173173

174+
static bool isI386Target(const opt::InputArgList &args,
175+
const Triple &defaultTarget) {
176+
auto *a = args.getLastArg(OPT_m);
177+
if (a)
178+
return StringRef(a->getValue()) == "i386pe";
179+
return defaultTarget.getArch() == Triple::x86;
180+
}
181+
174182
namespace lld {
175183
namespace coff {
176184
bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
@@ -216,6 +224,8 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
216224
return false;
217225
}
218226

227+
Triple defaultTarget(Triple::normalize(sys::getDefaultTargetTriple()));
228+
219229
std::vector<std::string> linkArgs;
220230
auto add = [&](const Twine &s) { linkArgs.push_back(s.str()); };
221231

@@ -224,7 +234,7 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
224234

225235
if (auto *a = args.getLastArg(OPT_entry)) {
226236
StringRef s = a->getValue();
227-
if (args.getLastArgValue(OPT_m) == "i386pe" && s.starts_with("_"))
237+
if (isI386Target(args, defaultTarget) && s.starts_with("_"))
228238
add("-entry:" + s.substr(1));
229239
else if (!s.empty())
230240
add("-entry:" + s);
@@ -521,7 +531,7 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
521531
for (auto *a : args.filtered(OPT_Xlink))
522532
add(a->getValue());
523533

524-
if (args.getLastArgValue(OPT_m) == "i386pe")
534+
if (isI386Target(args, defaultTarget))
525535
add("-alternatename:__image_base__=___ImageBase");
526536
else
527537
add("-alternatename:__image_base__=__ImageBase");

0 commit comments

Comments
 (0)