diff --git a/Toolchain/Stubs/i686clang/libc.so b/Toolchain/Stubs/i686clang/libc.so index fe90dfc0f2..c9e343199d 100644 Binary files a/Toolchain/Stubs/i686clang/libc.so and b/Toolchain/Stubs/i686clang/libc.so differ diff --git a/Toolchain/Stubs/i686clang/libm.so b/Toolchain/Stubs/i686clang/libm.so deleted file mode 100644 index fe2a0a6d56..0000000000 Binary files a/Toolchain/Stubs/i686clang/libm.so and /dev/null differ diff --git a/Toolchain/Stubs/x86_64clang/libc.so b/Toolchain/Stubs/x86_64clang/libc.so index 14cd6f94d9..bfa4652d7d 100644 Binary files a/Toolchain/Stubs/x86_64clang/libc.so and b/Toolchain/Stubs/x86_64clang/libc.so differ diff --git a/Toolchain/Stubs/x86_64clang/libm.so b/Toolchain/Stubs/x86_64clang/libm.so deleted file mode 100644 index 16cc84faef..0000000000 Binary files a/Toolchain/Stubs/x86_64clang/libm.so and /dev/null differ diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt index 1715956920..e171d3dd69 100644 --- a/Userland/Libraries/LibC/CMakeLists.txt +++ b/Userland/Libraries/LibC/CMakeLists.txt @@ -22,6 +22,7 @@ set(LIBC_SOURCES link.cpp locale.cpp malloc.cpp + math.cpp mntent.cpp net.cpp netdb.cpp diff --git a/Userland/Libraries/LibM/math.cpp b/Userland/Libraries/LibC/math.cpp similarity index 100% rename from Userland/Libraries/LibM/math.cpp rename to Userland/Libraries/LibC/math.cpp diff --git a/Userland/Libraries/LibM/math.h b/Userland/Libraries/LibC/math.h similarity index 100% rename from Userland/Libraries/LibM/math.h rename to Userland/Libraries/LibC/math.h diff --git a/Userland/Libraries/LibM/CMakeLists.txt b/Userland/Libraries/LibM/CMakeLists.txt index a59e2bf011..e054251e14 100644 --- a/Userland/Libraries/LibM/CMakeLists.txt +++ b/Userland/Libraries/LibM/CMakeLists.txt @@ -1,10 +1,4 @@ -set(SOURCES - math.cpp - ../LibC/ssp.cpp -) - -set_source_files_properties (../LibC/ssp.cpp PROPERTIES COMPILE_FLAGS - "-fno-stack-protector") - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdlib") -serenity_libc(LibM m) +# Provide a dummy target and a linker script that tells everything to link against LibC instead. +add_library(LibM INTERFACE) +target_link_libraries(LibM INTERFACE LibC) +file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libm.so" "INPUT(libc.so)")