Skip to content

[driver] return immediately in addArchSpecificRPath and getArchSpecificLibPaths on AIX #134520

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
Apr 29, 2025
Merged

[driver] return immediately in addArchSpecificRPath and getArchSpecificLibPaths on AIX #134520

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
0287e93
[driver] return in addArchSpecificRPath for AIX and also get the trip…
DanielCChen Apr 6, 2025
64e5b60
To disable getArchSpecificLibPaths on AIX.
DanielCChen Apr 16, 2025
60b1ea6
To address review comments and added a test.
DanielCChen Apr 28, 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
2 changes: 2 additions & 0 deletions clang/lib/Driver/ToolChains/AIX.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ class LLVM_LIBRARY_VISIBILITY AIX : public ToolChain {
return llvm::DebuggerKind::DBX;
}

path_list getArchSpecificLibPaths() const override { return path_list(); };

protected:
Tool *buildAssembler() const override;
Tool *buildLinker() const override;
Expand Down
3 changes: 3 additions & 0 deletions clang/lib/Driver/ToolChains/CommonArgs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,6 +1252,9 @@ void tools::addArchSpecificRPath(const ToolChain &TC, const ArgList &Args,
options::OPT_fno_rtlib_add_rpath, false))
return;

if (TC.getTriple().isOSAIX()) // TODO: AIX doesn't support -rpath option.
return;

SmallVector<std::string> CandidateRPaths(TC.getArchSpecificLibPaths());
if (const auto CandidateRPath = TC.getStdlibPath())
CandidateRPaths.emplace_back(*CandidateRPath);
Expand Down
1 change: 1 addition & 0 deletions flang/test/Driver/flang-ld-powerpc.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
! AIX64-LD-PER-TARGET-DEFAULT-SAME: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix{{/|\\\\}}libflang_rt.runtime.a"
! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-lm"
! AIX64-LD-PER-TARGET-DEFAULT-SAME: "-lpthread"
! AIX64-LD-PER-TARGET-DEFAULT-NOT: "-L/[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}powerpc64-ibm-aix"


! Check powerpc64-ibm-aix 64-bit linking to static flang-rt by option
Expand Down