Skip to content

[Legacy-Flang][Driver][ASan] Add default rpath of host-asan #81

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

Open
ampandey-AMD wants to merge 1 commit into
base: aomp-dev
Choose a base branch
from
Open

[Legacy-Flang][Driver][ASan] Add default rpath of host-asan #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions flang-legacy/17.0-4/llvm-legacy/clang/lib/Driver/ToolChains/CommonArgs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,8 +949,16 @@ void tools::addOpenMPRuntimeSpecificRPath(const ToolChain &TC,
SmallString<256> DefaultLibPath =
llvm::sys::path::parent_path(TC.getDriver().Dir);
llvm::sys::path::append(DefaultLibPath, CLANG_INSTALL_LIBDIR_BASENAME);
if (TC.getSanitizerArgs(Args).needsAsanRt()) {
CmdArgs.push_back("-rpath");
CmdArgs.push_back(Args.MakeArgString(TC.getCompilerRTPath()));
}
CmdArgs.push_back("-rpath");
CmdArgs.push_back(Args.MakeArgString(CandidateRPath.c_str()));
if (llvm::find_if(CmdArgs, [](StringRef str) {
return !str.compare("--enable-new-dtags");
}) == CmdArgs.end())
CmdArgs.push_back("--disable-new-dtags");
}
}

Expand Down
2 changes: 0 additions & 2 deletions flang-legacy/17.0-4/llvm-legacy/clang/lib/Driver/ToolChains/Gnu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
// Add Fortran runtime libraries
if (needFortranLibs(D, Args)) {
ToolChain.AddFortranStdlibLibArgs(Args, CmdArgs);
CmdArgs.push_back("-rpath");
Copy link
Contributor

@estewart08 estewart08 Apr 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need guarded with ! needsAsanRt?

CmdArgs.push_back(Args.MakeArgString(D.Dir + "/../lib"));
} else {
// Claim "no Flang libraries" arguments if any
for (auto Arg : Args.filtered(options::OPT_noFlangLibs)) {
Expand Down