[Driver] Use AddRunTimeLibs on Solaris #137596
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When linking `libomp.so` on Solaris, I encountered ``` clang: warning: argument unused during compilation: '-static-libgcc' [-Wunused-command-line-argument] ``` This happens because `Solaris.cpp` (`solaris::Linker::ConstructJob`) links `-lgcc_s` and `-lgcc` on its own instead of using the common `CommonArgs.cpp` (`tools::AddRunTimeLibs`) which handles `-static-libgcc` out of the box. This patch switches to `AddRunTimeLibs` and adds a test for `-static-libgcc` handling. In `solaris-ld.c`, a few tests had to be adjusted because `-lgcc` is now linked before `-lgcc_s`. Tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11`.
llvmbot
added
clang
|
@llvm/pr-subscribers-clang-driver @llvm/pr-subscribers-clang Author: Rainer Orth (rorth) ChangesWhen linking This happens because This patch switches to Tested on Full diff: https://github.com/llvm/llvm-project/pull/137596.diff 2 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp b/clang/lib/Driver/ToolChains/Solaris.cpp
index 639497b8fbad2..a066aeea7ff13 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -243,13 +243,10 @@ void solaris::Linker::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back("-latomic");
addAsNeededOption(ToolChain, Args, CmdArgs, false);
}
- addAsNeededOption(ToolChain, Args, CmdArgs, true);
- CmdArgs.push_back("-lgcc_s");
- addAsNeededOption(ToolChain, Args, CmdArgs, false);
+
+ AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
CmdArgs.push_back("-lc");
- if (!Args.hasArg(options::OPT_shared)) {
- CmdArgs.push_back("-lgcc");
- }
+
const SanitizerArgs &SA = ToolChain.getSanitizerArgs(Args);
if (NeedsSanitizerDeps) {
linkSanitizerRuntimeDeps(ToolChain, Args, CmdArgs);
diff --git a/clang/test/Driver/solaris-ld.c b/clang/test/Driver/solaris-ld.c
index ce0728d392bf2..9aa7ed760666d 100644
--- a/clang/test/Driver/solaris-ld.c
+++ b/clang/test/Driver/solaris-ld.c
@@ -20,10 +20,10 @@
// CHECK-LD-SPARC32-SAME: "-L[[SYSROOT]]/usr/lib"
// CHECK-LD: "-z" "ignore" "-latomic" "-z" "record"
// CHECK-GLD: "--as-needed" "-latomic" "--no-as-needed"
+// CHECK-LD-SPARC32-SAME: "-lgcc"
// CHECK-LD: "-z" "ignore" "-lgcc_s" "-z" "record"
// CHECK-GLD: "--as-needed" "-lgcc_s" "--no-as-needed"
// CHECK-LD-SPARC32-SAME: "-lc"
-// CHECK-LD-SPARC32-SAME: "-lgcc"
// CHECK-LD-SPARC32-SAME: "[[SYSROOT]]/usr/gcc/4.8/lib/gcc/sparc-sun-solaris2.11/4.8.2{{/|\\\\}}crtend.o"
// CHECK-LD-SPARC32-SAME: "[[SYSROOT]]/usr/lib{{/|\\\\}}crtn.o"
@@ -42,9 +42,9 @@
// CHECK-LD-SPARC64-SAME: "-L[[SYSROOT]]/usr/gcc/4.8/lib/gcc/sparc-sun-solaris2.11/4.8.2/../../../sparcv9"
// CHECK-LD-SPARC64-SAME: "-L[[SYSROOT]]/usr/lib/sparcv9"
// CHECK-LD-SPARC64-NOT: "-latomic"
+// CHECK-LD-SPARC64-SAME: "-lgcc"
// CHECK-LD-SPARC64-SAME: "-lgcc_s"
// CHECK-LD-SPARC64-SAME: "-lc"
-// CHECK-LD-SPARC64-SAME: "-lgcc"
// CHECK-LD-SPARC64-SAME: "[[SYSROOT]]/usr/gcc/4.8/lib/gcc/sparc-sun-solaris2.11/4.8.2/sparcv9{{/|\\\\}}crtend.o"
// CHECK-LD-SPARC64-SAME: "[[SYSROOT]]/usr/lib/sparcv9{{/|\\\\}}crtn.o"
@@ -63,9 +63,9 @@
// CHECK-LD-X32-SAME: "-L[[SYSROOT]]/usr/gcc/4.9/lib/gcc/i386-pc-solaris2.11/4.9.4/../../.."
// CHECK-LD-X32-SAME: "-L[[SYSROOT]]/usr/lib"
// CHECK-LD-X32-NOT: "-latomic"
+// CHECK-LD-X32-SAME: "-lgcc"
// CHECK-LD-X32-SAME: "-lgcc_s"
// CHECK-LD-X32-SAME: "-lc"
-// CHECK-LD-X32-SAME: "-lgcc"
// CHECK-LD-X32-SAME: "[[SYSROOT]]/usr/gcc/4.9/lib/gcc/i386-pc-solaris2.11/4.9.4{{/|\\\\}}crtend.o"
// CHECK-LD-X32-SAME: "[[SYSROOT]]/usr/lib{{/|\\\\}}crtn.o"
@@ -85,9 +85,9 @@
// CHECK-LD-X64-SAME: "-L[[SYSROOT]]/usr/gcc/4.9/lib/gcc/i386-pc-solaris2.11/4.9.4/../../../amd64"
// CHECK-LD-X64-SAME: "-L[[SYSROOT]]/usr/lib/amd64"
// CHECK-LD-X64-NOT: "-latomic"
+// CHECK-LD-X64-SAME: "-lgcc"
// CHECK-LD-X64-SAME: "-lgcc_s"
// CHECK-LD-X64-SAME: "-lc"
-// CHECK-LD-X64-SAME: "-lgcc"
// CHECK-LD-X64-SAME: "[[SYSROOT]]/usr/gcc/4.9/lib/gcc/i386-pc-solaris2.11/4.9.4/amd64{{/|\\\\}}crtend.o"
// CHECK-LD-X64-SAME: "[[SYSROOT]]/usr/lib/amd64{{/|\\\\}}crtn.o"
@@ -101,6 +101,15 @@
// CHECK-SPARC32-SHARED-SAME: "-lc"
// CHECK-SPARC32-SHARED-NOT: "-lgcc"
+/// Check that -static-libgcc is supported.
+// RUN: %clang -### %s --target=sparc-sun-solaris2.11 \
+// RUN: -static-libgcc \
+// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
+// RUN: | FileCheck --check-prefixes=CHECK-STATIC-LIBGCC %s
+// CHECK-STATIC-LIBGCC-NOT: warning: argument unused during compilation: '-static-libgcc'
+// CHECK-STATIC-LIBGCC: "-lgcc" "-lgcc_eh"
+// CHECK-STATIC-LIBGCC-NOT: "-lgcc_s"
+
// Check that libm is only linked with clang++.
// RUN: %clang -### %s --target=sparc-sun-solaris2.11 \
// RUN: --sysroot=%S/Inputs/solaris_sparc_tree 2>&1 \
|
brad0
approved these changes
May 4, 2025
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/11/builds/14369 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/193/builds/7452 Here is the relevant piece of the build log for the reference |
|
I suspect the |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/38/builds/3236 Here is the relevant piece of the build log for the reference |
|
I've just created PR #138466 which hopefully fixes those failures. Can anyone affected please give this a try? |
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
When linking `libomp.so` on Solaris, I encountered ``` clang: warning: argument unused during compilation: '-static-libgcc' [-Wunused-command-line-argument] ``` This happens because `Solaris.cpp` (`solaris::Linker::ConstructJob`) links `-lgcc_s` and `-lgcc` on its own instead of using the common `CommonArgs.cpp` (`tools::AddRunTimeLibs`) which handles `-static-libgcc` out of the box. This patch switches to `AddRunTimeLibs` and adds a test for `-static-libgcc` handling. In `solaris-ld.c`, a few tests had to be adjusted because `-lgcc` is now linked before `-lgcc_s`. Tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11`.
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
When linking `libomp.so` on Solaris, I encountered ``` clang: warning: argument unused during compilation: '-static-libgcc' [-Wunused-command-line-argument] ``` This happens because `Solaris.cpp` (`solaris::Linker::ConstructJob`) links `-lgcc_s` and `-lgcc` on its own instead of using the common `CommonArgs.cpp` (`tools::AddRunTimeLibs`) which handles `-static-libgcc` out of the box. This patch switches to `AddRunTimeLibs` and adds a test for `-static-libgcc` handling. In `solaris-ld.c`, a few tests had to be adjusted because `-lgcc` is now linked before `-lgcc_s`. Tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11`.
IanWood1
pushed a commit
to IanWood1/llvm-project
that referenced
this pull request
May 6, 2025
When linking `libomp.so` on Solaris, I encountered ``` clang: warning: argument unused during compilation: '-static-libgcc' [-Wunused-command-line-argument] ``` This happens because `Solaris.cpp` (`solaris::Linker::ConstructJob`) links `-lgcc_s` and `-lgcc` on its own instead of using the common `CommonArgs.cpp` (`tools::AddRunTimeLibs`) which handles `-static-libgcc` out of the box. This patch switches to `AddRunTimeLibs` and adds a test for `-static-libgcc` handling. In `solaris-ld.c`, a few tests had to be adjusted because `-lgcc` is now linked before `-lgcc_s`. Tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11`.
GeorgeARM
pushed a commit
to GeorgeARM/llvm-project
that referenced
this pull request
May 7, 2025
When linking `libomp.so` on Solaris, I encountered ``` clang: warning: argument unused during compilation: '-static-libgcc' [-Wunused-command-line-argument] ``` This happens because `Solaris.cpp` (`solaris::Linker::ConstructJob`) links `-lgcc_s` and `-lgcc` on its own instead of using the common `CommonArgs.cpp` (`tools::AddRunTimeLibs`) which handles `-static-libgcc` out of the box. This patch switches to `AddRunTimeLibs` and adds a test for `-static-libgcc` handling. In `solaris-ld.c`, a few tests had to be adjusted because `-lgcc` is now linked before `-lgcc_s`. Tested on `amd64-pc-solaris2.11` and `sparcv9-sun-solaris2.11`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When linking
libomp.soon Solaris, I encounteredThis happens because
Solaris.cpp(solaris::Linker::ConstructJob) links-lgcc_sand-lgccon its own instead of using the commonCommonArgs.cpp(tools::AddRunTimeLibs) which handles-static-libgccout of the box.This patch switches to
AddRunTimeLibsand adds a test for-static-libgcchandling. Insolaris-ld.c, a few tests had to be adjusted because-lgccis now linked before-lgcc_s.Tested on
amd64-pc-solaris2.11andsparcv9-sun-solaris2.11.