LibC: Remove the LibPthread interface target

gmbows · Jul 19, 2022 · 5870484 · 5870484
1 parent 28061cf
commit 5870484
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/Tests/Kernel/CMakeLists.txt b/Tests/Kernel/CMakeLists.txt
@@ -50,11 +50,3 @@ set(LIBTEST_BASED_SOURCES
 foreach(libtest_source IN LISTS LIBTEST_BASED_SOURCES)
     serenity_test("${libtest_source}" Kernel)
 endforeach()
-
-target_link_libraries(elf-execve-mmap-race LibPthread)
-target_link_libraries(kill-pidtid-confusion LibPthread)
-target_link_libraries(nanosleep-race-outbuf-munmap LibPthread)
-target_link_libraries(null-deref-close-during-select LibPthread)
-target_link_libraries(null-deref-crash-during-pthread_join LibPthread)
-target_link_libraries(uaf-close-while-blocked-in-read LibPthread)
-target_link_libraries(pthread-cond-timedwait-example LibPthread)
diff --git a/Tests/LibThreading/CMakeLists.txt b/Tests/LibThreading/CMakeLists.txt
@@ -3,5 +3,5 @@ set(TEST_SOURCES
 )
 
 foreach(source IN LISTS TEST_SOURCES)
-    serenity_test("${source}" LibThreading LIBS LibThreading LibPthread)
+    serenity_test("${source}" LibThreading LIBS LibThreading)
 endforeach()
diff --git a/Userland/DevTools/UserspaceEmulator/CMakeLists.txt b/Userland/DevTools/UserspaceEmulator/CMakeLists.txt
@@ -23,4 +23,4 @@ set(SOURCES
 add_compile_options(-mmmx -Wno-psabi -frounding-math)
 
 serenity_bin(UserspaceEmulator)
-target_link_libraries(UserspaceEmulator LibX86 LibDebug LibCore LibPthread LibLine)
+target_link_libraries(UserspaceEmulator LibX86 LibDebug LibCore LibLine)
diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt
@@ -180,7 +180,5 @@ target_link_libraries(LibC ssp system LibTimeZone)
 # We mark LibCStatic as a dependency of LibC because this triggers the build of the LibCStatic target
 add_dependencies(LibC LibM LibSystem LibCStatic)
 
-# Provide a dummy target and a linker script for LibPthread that tells everything to link against LibC instead.
-add_library(LibPthread INTERFACE)
-target_link_libraries(LibPthread INTERFACE LibC)
+# Provide a linker script instead of LibPthread that tells everything to link against LibC.
 file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)")
diff --git a/Userland/Libraries/LibThreading/CMakeLists.txt b/Userland/Libraries/LibThreading/CMakeLists.txt
@@ -4,4 +4,4 @@ set(SOURCES
 )
 
 serenity_lib(LibThreading threading)
-target_link_libraries(LibThreading LibC LibCore LibPthread)
+target_link_libraries(LibThreading LibC LibCore)
diff --git a/Userland/Utilities/CMakeLists.txt b/Userland/Utilities/CMakeLists.txt
@@ -228,7 +228,7 @@ target_link_libraries(traceroute LibMain)
 target_link_libraries(tree LibMain)
 target_link_libraries(true LibMain)
 target_link_libraries(truncate LibMain)
-target_link_libraries(tt LibPthread LibMain)
+target_link_libraries(tt LibMain)
 target_link_libraries(tty LibMain)
 target_link_libraries(umount LibMain)
 target_link_libraries(uname LibMain)