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

Toolchain: Remove references to -lm

Browse source
This commit is contained in:
Tim Schumacher 2022-09-06 12:12:48 +02:00 • committed by Brian Gianforcaro
parent a4f5a5d783
commit 77f124c87a
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Toolchain/CMake/LLVMRuntimesConfig.cmake
View file

@ -58,8 +58,5 @@ set(CMAKE_CXX_FLAGS ${compiler_flags} CACHE STRING "")
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "") set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "") set(LIBCXX_ENABLE_STATIC_ABI_LIBRARY ON CACHE BOOL "")
set(LIBCXX_INCLUDE_BENCHMARKS OFF CACHE BOOL "") set(LIBCXX_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
if (NOT "${SERENITY_TOOLCHAIN_ARCH}" STREQUAL "aarch64")
set(LIBCXX_HAS_M_LIB ON CACHE BOOL "")
endif()
set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "") set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "") set(LIBUNWIND_USE_COMPILER_RT ON CACHE BOOL "")

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

@ -21,7 +21,7 @@ Co-Authored-By: Shannon Booth <shannon.ml.booth@gmail.com>
--- ---
gcc/config.gcc | 20 ++++++++++++++++ gcc/config.gcc | 20 ++++++++++++++++
gcc/config/i386/serenity.h | 7 ++++++ gcc/config/i386/serenity.h | 7 ++++++
gcc/config/serenity.h | 47 ++++++++++++++++++++++++++++++++++++++ gcc/config/serenity.h | 51 ++++++++++++++++++++++++++++++++++++++
gcc/config/serenity.opt | 35 ++++++++++++++++++++++++++++ gcc/config/serenity.opt | 35 ++++++++++++++++++++++++++++
4 files changed, 109 insertions(+) 4 files changed, 109 insertions(+)
create mode 100644 gcc/config/i386/serenity.h create mode 100644 gcc/config/i386/serenity.h
@ -84,7 +84,7 @@ new file mode 100644
index 000000000..dc2f5361e index 000000000..dc2f5361e
--- /dev/null --- /dev/null
+++ b/gcc/config/serenity.h +++ b/gcc/config/serenity.h
@@ -0,0 +1,47 @@ @@ -0,0 +1,51 @@
+/* Useful if you wish to make target-specific GCC changes. */ +/* Useful if you wish to make target-specific GCC changes. */
+#undef TARGET_SERENITY +#undef TARGET_SERENITY
+#define TARGET_SERENITY 1 +#define TARGET_SERENITY 1
@ -122,6 +122,10 @@ index 000000000..dc2f5361e
+/* Use --as-needed -lgcc_s for eh support. */ +/* Use --as-needed -lgcc_s for eh support. */
+#define USE_LD_AS_NEEDED 1 +#define USE_LD_AS_NEEDED 1
+ +
+/* We don't have a separate math library, it's included within libc. While we do have compatibility
+ linker scripts in place, just don't add it to the linker invocation to begin with. */
+#define MATH_LIBRARY ""
+
+/* Additional predefined macros. */ +/* Additional predefined macros. */
+#undef TARGET_OS_CPP_BUILTINS +#undef TARGET_OS_CPP_BUILTINS
+#define TARGET_OS_CPP_BUILTINS() \ +#define TARGET_OS_CPP_BUILTINS() \

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

@ -144,7 +144,7 @@ new file mode 100644
index 000000000..6fc664a05 index 000000000..6fc664a05
--- /dev/null --- /dev/null
+++ b/clang/lib/Driver/ToolChains/Serenity.cpp +++ b/clang/lib/Driver/ToolChains/Serenity.cpp
@@ -0,0 +1,337 @@ @@ -0,0 +1,336 @@
+//===---- 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.
@ -301,7 +301,6 @@ index 000000000..6fc664a05
+ TC.AddCXXStdlibLibArgs(Args, CmdArgs); + TC.AddCXXStdlibLibArgs(Args, CmdArgs);
+ if (OnlyLibstdcxxStatic) + if (OnlyLibstdcxxStatic)
+ CmdArgs.push_back("-Bdynamic"); + CmdArgs.push_back("-Bdynamic");
+ CmdArgs.push_back("-lm");
+ CmdArgs.push_back("--pop-state"); + CmdArgs.push_back("--pop-state");
+ } + }
+ +