RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:37:44 +00:00
Code Issues Activity Actions

Toolchain: Don't pass -lpthread when pthreads are requested

Browse source 
This is essentially a no-op since we have our replacement linker script,
but if we can skip over that entirely, why not?
This commit is contained in:
Tim Schumacher 2022-07-15 16:09:36 +02:00 • committed by Linus Groh
parent 5870484d1a
commit a857b6297a
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Toolchain/Patches/gcc/0001-Add-a-gcc-driver-for-SerenityOS.patch
View file

@ -96,7 +96,7 @@ index 000000000..dc2f5361e
+/* Default arguments you want when running your +/* Default arguments you want when running your
+ i686-serenity-gcc/x86_64-serenity-gcc toolchain */ + i686-serenity-gcc/x86_64-serenity-gcc toolchain */
+#undef LIB_SPEC +#undef LIB_SPEC
+#define LIB_SPEC "%{pthread:-lpthread} -lc" /* link against C standard library */ +#define LIB_SPEC "-lc" /* link against C standard library */
+ +
+/* Files that are linked before user code. +/* Files that are linked before user code.
+ The %s tells GCC to look for these files in the library directory. */ + The %s tells GCC to look for these files in the library directory. */

5
Toolchain/Patches/llvm/0003-Driver-Add-support-for-SerenityOS.patch
View file

@ -144,7 +144,7 @@ new file mode 100644
index 000000000..955422438 index 000000000..955422438
--- /dev/null --- /dev/null
+++ b/clang/lib/Driver/ToolChains/Serenity.cpp +++ b/clang/lib/Driver/ToolChains/Serenity.cpp
@@ -0,0 +1,340 @@ @@ -0,0 +1,337 @@
+//===---- Serenity.cpp - SerenityOS ToolChain Implementation ----*- C++ -*-===// +//===---- Serenity.cpp - SerenityOS ToolChain Implementation ----*- C++ -*-===//
+// +//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@ -306,9 +306,6 @@ index 000000000..955422438
+ } + }
+ +
+ if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) { + if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
+ if (Args.hasArg(options::OPT_pthread, options::OPT_pthreads))
+ CmdArgs.push_back("-lpthread");
+
+ if (!Args.hasArg(options::OPT_nolibc)) + if (!Args.hasArg(options::OPT_nolibc))
+ CmdArgs.push_back("-lc"); + CmdArgs.push_back("-lc");
+ } + }