diff options
| author | madanial0 <118996571+madanial0@users.noreply.github.com> | 2023-12-21 10:22:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 10:22:30 -0500 |
| commit | 6b505406a3403a9ab6c733ccf1fbcc52d9ca0601 (patch) | |
| tree | 9a25f53643effd0f5346d49308fb194c8d9a0395 | |
| parent | 8eccf2b872cc1a88a1e5d4e5af0bfdabfb66c7bb (diff) | |
[Flang] remove whole-archive option for AIX linker (#76039)
The AIX linker does not support the `--whole-archive` option, removing
the option if the OS is AIX.
---------
Co-authored-by: Mark Danial <mark.danial@ibm.com>
| -rw-r--r-- | clang/lib/Driver/ToolChains/CommonArgs.cpp | 5 | ||||
| -rw-r--r-- | flang/test/Driver/no-duplicate-main.f90 | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index 4f4bdac793be..6eb0ed8f3fed 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -1174,8 +1174,9 @@ static void addFortranMain(const ToolChain &TC, const ArgList &Args, // The --whole-archive option needs to be part of the link line to make // sure that the main() function from Fortran_main.a is pulled in by the // linker. However, it shouldn't be used if it's already active. - // TODO: Find an equivalent of `--whole-archive` for Darwin. - if (!isWholeArchivePresent(Args) && !TC.getTriple().isMacOSX()) { + // TODO: Find an equivalent of `--whole-archive` for Darwin and AIX. + if (!isWholeArchivePresent(Args) && !TC.getTriple().isMacOSX() && + !TC.getTriple().isOSAIX()) { CmdArgs.push_back("--whole-archive"); CmdArgs.push_back("-lFortran_main"); CmdArgs.push_back("--no-whole-archive"); diff --git a/flang/test/Driver/no-duplicate-main.f90 b/flang/test/Driver/no-duplicate-main.f90 index b884e7ecd7f1..88f4430828e0 100644 --- a/flang/test/Driver/no-duplicate-main.f90 +++ b/flang/test/Driver/no-duplicate-main.f90 @@ -1,4 +1,4 @@ -! UNSUPPORTED: system-windows, system-darwin +! UNSUPPORTED: system-windows, system-darwin, system-aix ! RUN: %flang -x ir -o %t.c-object -c %S/Inputs/no_duplicate_main.ll ! RUN: %flang -o %t -c %s |