Skip to content

[clang][Driver] Clean up UEFI linker argument handling #159639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 19, 2025
Merged

[clang][Driver] Clean up UEFI linker argument handling #159639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f35ec3
[clang][Driver] Clean up UEFI linker argument handling
frobtech Sep 18, 2025
ac4fb54
Merge branch 'main' into p/clang-uefi-driver-link-flags
frobtech Sep 18, 2025
6d21e28
Merge branch 'main' into p/clang-uefi-driver-link-flags
frobtech Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions clang/lib/Driver/ToolChains/UEFI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,29 +57,44 @@ void tools::uefi::Linker::ConstructJob(Compilation &C, const JobAction &JA,
assert((Output.isFilename() || Output.isNothing()) && "invalid output");
if (Output.isFilename())
CmdArgs.push_back(
Args.MakeArgString(std::string("-out:") + Output.getFilename()));
Args.MakeArgString(std::string("/out:") + Output.getFilename()));

CmdArgs.push_back("-nologo");

// TODO: Other UEFI binary subsystems that are currently unsupported:
// efi_boot_service_driver, efi_rom, efi_runtime_driver.
CmdArgs.push_back("-subsystem:efi_application");
CmdArgs.push_back("/nologo");

// Default entry function name according to the TianoCore reference
// implementation is EfiMain.
// TODO: Provide a flag to override the entry function name.
CmdArgs.push_back("-entry:EfiMain");
// implementation is EfiMain. -Wl,/subsystem:... or -Wl,/entry:... can
// override these since they will be added later in AddLinkerInputs.
CmdArgs.push_back("/subsystem:efi_application");
CmdArgs.push_back("/entry:EfiMain");

// "Terminal Service Aware" flag is not needed for UEFI applications.
CmdArgs.push_back("-tsaware:no");
CmdArgs.push_back("/tsaware:no");

if (Args.hasArg(options::OPT_g_Group, options::OPT__SLASH_Z7))
CmdArgs.push_back("-debug");
CmdArgs.push_back("/debug");

Args.AddAllArgValues(CmdArgs, options::OPT__SLASH_link);

AddLinkerInputs(TC, Inputs, Args, CmdArgs, JA);

// Sample these options first so they are claimed even under -nostdlib et al.
bool NoLibc = Args.hasArg(options::OPT_nolibc);
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
options::OPT_r)) {
addSanitizerRuntimes(TC, Args, CmdArgs);

addXRayRuntime(TC, Args, CmdArgs);

TC.addProfileRTLibs(Args, CmdArgs);

// TODO: When compiler-rt/lib/builtins is ready, enable this call:
// AddRunTimeLibs(TC, TC.getDriver(), CmdArgs, Args);

if (!NoLibc) {
// TODO: When there is a libc ready, add it here.
}
}

// This should ideally be handled by ToolChain::GetLinkerPath but we need
// to special case some linker paths. In the case of lld, we need to
// translate 'lld' into 'lld-link'.
Expand Down
10 changes: 5 additions & 5 deletions clang/test/Driver/uefi-constructed-args.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
// CHECK-SAME: "-mrelocation-model" "pic" "-pic-level" "2"
// CHECK-SAME: "-mframe-pointer=all"
// CHECK-SAME: "-fms-extensions"
// CHECK-NEXT: "-nologo"
// CHECK-SAME: "-subsystem:efi_application"
// CHECK-SAME: "-entry:EfiMain"
// CHECK-SAME: "-tsaware:no"
// CHECK-SAME: "-debug"
// CHECK-NEXT: "/nologo"
// CHECK-SAME: "/subsystem:efi_application"
// CHECK-SAME: "/entry:EfiMain"
// CHECK-SAME: "/tsaware:no"
// CHECK-SAME: "/debug"
Loading