From 28061cf94d882bba7ce64a4b61454f2cf07bf4a5 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Fri, 15 Jul 2022 15:51:00 +0200 Subject: [PATCH] Everywhere: Fully remove the separate LibPthread directory --- CMakeLists.txt | 1 - Documentation/UsingQtCreator.md | 1 - Documentation/VSCodeConfiguration.md | 2 -- Meta/Azure/Caches.yml | 4 ++-- Toolchain/BuildClang.sh | 4 ++-- Toolchain/BuildIt.sh | 4 +--- Userland/Libraries/CMakeLists.txt | 1 - Userland/Libraries/LibC/CMakeLists.txt | 5 +++++ Userland/Libraries/LibPthread/CMakeLists.txt | 4 ---- 9 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 Userland/Libraries/LibPthread/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 0392cbc06ed..0f047eae787 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,7 +186,6 @@ include_directories(Userland/Libraries) include_directories(Userland/Libraries/LibC) include_directories(Userland/Libraries/LibCrypt) include_directories(Userland/Libraries/LibM) -include_directories(Userland/Libraries/LibPthread) include_directories(Userland/Libraries/LibSystem) include_directories(Userland/Services) include_directories(Userland) diff --git a/Documentation/UsingQtCreator.md b/Documentation/UsingQtCreator.md index d1f548cbd40..d964f55a9a8 100644 --- a/Documentation/UsingQtCreator.md +++ b/Documentation/UsingQtCreator.md @@ -24,7 +24,6 @@ Userland/Services/ Userland/Libraries/ Userland/Libraries/LibC/ Userland/Libraries/LibM/ -Userland/Libraries/LibPthread/ Userland/Libraries/LibSystem/ Toolchain/Local/i686/i686-pc-serenity/include/c++/12.1.0 Build/i686/ diff --git a/Documentation/VSCodeConfiguration.md b/Documentation/VSCodeConfiguration.md index 0d6dc3a229f..5250e2cd224 100644 --- a/Documentation/VSCodeConfiguration.md +++ b/Documentation/VSCodeConfiguration.md @@ -46,7 +46,6 @@ These extensions can be used as-is, but you need to point them to the custom Ser "${workspaceFolder}/Userland/Libraries", "${workspaceFolder}/Userland/Libraries/LibC", "${workspaceFolder}/Userland/Libraries/LibM", - "${workspaceFolder}/Userland/Libraries/LibPthread", "${workspaceFolder}/Userland/Services", "${workspaceFolder}/Toolchain/Local/i686/i686-pc-serenity/include/c++/**" ], @@ -77,7 +76,6 @@ These extensions can be used as-is, but you need to point them to the custom Ser "${workspaceFolder}/Userland/Libraries", "${workspaceFolder}/Userland/Libraries/LibC", "${workspaceFolder}/Userland/Libraries/LibM", - "${workspaceFolder}/Userland/Libraries/LibPthread", "${workspaceFolder}/Userland/Services", "${workspaceFolder}/Toolchain/Local/i686/i686-pc-serenity/include/c++/**" ], diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml index 9be6792cd03..4e3b31015ae 100644 --- a/Meta/Azure/Caches.yml +++ b/Meta/Azure/Caches.yml @@ -19,13 +19,13 @@ steps: - ${{ if eq(parameters.toolchain, 'clang') }}: - task: Cache@2 inputs: - key: '"toolchain" | "x86_64" | Toolchain/BuildClang.sh | Toolchain/Patches/llvm/*.patch | Toolchain/CMake/*.cmake | Userland/Libraries/LibC/**/*.h | Userland/Libraries/LibPthread/**/*.h' + key: '"toolchain" | "x86_64" | Toolchain/BuildClang.sh | Toolchain/Patches/llvm/*.patch | Toolchain/CMake/*.cmake | Userland/Libraries/LibC/**/*.h' path: $(Build.SourcesDirectory)/Toolchain/Cache displayName: 'Toolchain Prebuilt Cache' - ${{ if eq(parameters.toolchain, 'gcc') }}: - task: Cache@2 inputs: - key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/binutils.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h | Userland/Libraries/LibPthread/**/*.h' + key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/binutils.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h' path: $(Build.SourcesDirectory)/Toolchain/Cache displayName: 'Toolchain Prebuilt Cache' diff --git a/Toolchain/BuildClang.sh b/Toolchain/BuildClang.sh index b99b0d87a28..598e994e26b 100755 --- a/Toolchain/BuildClang.sh +++ b/Toolchain/BuildClang.sh @@ -248,14 +248,14 @@ popd # === COPY HEADERS === SRC_ROOT=$($REALPATH "$DIR"/..) -FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC "$SRC_ROOT"/Userland/Libraries/LibM "$SRC_ROOT"/Userland/Libraries/LibPthread "$SRC_ROOT"/Userland/Libraries/LibDl -name '*.h' -print) +FILES=$(find "$SRC_ROOT"/Kernel/API "$SRC_ROOT"/Userland/Libraries/LibC "$SRC_ROOT"/Userland/Libraries/LibM "$SRC_ROOT"/Userland/Libraries/LibDl -name '*.h' -print) for arch in $ARCHS; do mkdir -p "$BUILD/${arch}clang" pushd "$BUILD/${arch}clang" mkdir -p Root/usr/include/ for header in $FILES; do - target=$(echo "$header" | "$SED" -e "s@$SRC_ROOT/Userland/Libraries/LibC@@" -e "s@$SRC_ROOT/Userland/Libraries/LibM@@" -e "s@$SRC_ROOT/Userland/Libraries/LibPthread@@" -e "s@$SRC_ROOT/Userland/Libraries/LibDl@@" -e "s@$SRC_ROOT/Kernel/@Kernel/@") + target=$(echo "$header" | "$SED" -e "s@$SRC_ROOT/Userland/Libraries/LibC@@" -e "s@$SRC_ROOT/Userland/Libraries/LibM@@" -e "s@$SRC_ROOT/Userland/Libraries/LibDl@@" -e "s@$SRC_ROOT/Kernel/@Kernel/@") buildstep "system_headers" "$INSTALL" -D "$header" "Root/usr/include/$target" done popd diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh index cc7d2cf011f..cc2427c2769 100755 --- a/Toolchain/BuildIt.sh +++ b/Toolchain/BuildIt.sh @@ -363,7 +363,7 @@ pushd "$DIR/Build/$ARCH" buildstep "binutils/install" "$MAKE" install || exit 1 popd - echo "XXX serenity libc, libdl, libm and libpthread headers" + echo "XXX serenity libc, libdl and libm headers" mkdir -p "$BUILD" pushd "$BUILD" mkdir -p Root/usr/include/ @@ -375,7 +375,6 @@ pushd "$DIR/Build/$ARCH" "$SRC_ROOT"/Userland/Libraries/LibC \ "$SRC_ROOT"/Userland/Libraries/LibDl \ "$SRC_ROOT"/Userland/Libraries/LibM \ - "$SRC_ROOT"/Userland/Libraries/LibPthread \ -name '*.h' -print) for header in $FILES; do target=$(echo "$header" | sed \ @@ -383,7 +382,6 @@ pushd "$DIR/Build/$ARCH" -e "s@$SRC_ROOT/Userland/Libraries/LibC@@" \ -e "s@$SRC_ROOT/Userland/Libraries/LibDl@@" \ -e "s@$SRC_ROOT/Userland/Libraries/LibM@@" \ - -e "s@$SRC_ROOT/Userland/Libraries/LibPthread@@" \ -e "s@$SRC_ROOT/Kernel/@Kernel/@") buildstep "system_headers" $INSTALL -D "$header" "Root/usr/include/$target" done diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt index 8deb83b589f..f19cd94dbc0 100644 --- a/Userland/Libraries/CMakeLists.txt +++ b/Userland/Libraries/CMakeLists.txt @@ -39,7 +39,6 @@ add_subdirectory(LibMarkdown) add_subdirectory(LibPCIDB) add_subdirectory(LibPDF) add_subdirectory(LibProtocol) -add_subdirectory(LibPthread) add_subdirectory(LibRegex) add_subdirectory(LibSanitizer) add_subdirectory(LibSoftGPU) diff --git a/Userland/Libraries/LibC/CMakeLists.txt b/Userland/Libraries/LibC/CMakeLists.txt index 2319a241e19..916d76da37a 100644 --- a/Userland/Libraries/LibC/CMakeLists.txt +++ b/Userland/Libraries/LibC/CMakeLists.txt @@ -179,3 +179,8 @@ 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) +file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)") diff --git a/Userland/Libraries/LibPthread/CMakeLists.txt b/Userland/Libraries/LibPthread/CMakeLists.txt deleted file mode 100644 index ba5fc79edb7..00000000000 --- a/Userland/Libraries/LibPthread/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Provide a dummy target and a linker script that tells everything to link against LibC instead. -add_library(LibPthread INTERFACE) -target_link_libraries(LibPthread INTERFACE LibC) -file(WRITE "${CMAKE_STAGING_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libpthread.so" "INPUT(libc.so)")