diff --git a/amazonlinux-2023/patches/swift-5.9/swift-use-lld-linker-5.9-no-skip-driver.patch b/amazonlinux-2023/patches/swift-5.9/swift-use-lld-linker-5.9-no-skip-driver.patch deleted file mode 100644 index f717240..0000000 --- a/amazonlinux-2023/patches/swift-5.9/swift-use-lld-linker-5.9-no-skip-driver.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c5626cbe50..953d2d2ac2b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -890,7 +890,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_HOST_SYSTEM_NAME STREQUA - elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(SWIFT_USE_LINKER_default "") - else() -- set(SWIFT_USE_LINKER_default "gold") -+ set(SWIFT_USE_LINKER_default "lld") - endif() - set(SWIFT_USE_LINKER ${SWIFT_USE_LINKER_default} CACHE STRING - "Build Swift with a non-default linker") -diff --git a/lib/Driver/UnixToolChains.cpp b/lib/Driver/UnixToolChains.cpp -index 389afb821dd..ebe300f13ca 100644 ---- a/lib/Driver/UnixToolChains.cpp -+++ b/lib/Driver/UnixToolChains.cpp -@@ -99,14 +99,14 @@ std::string toolchains::GenericUnix::getDefaultLinker() const { - // section on these targets, it also generates COPY relocations for - // final executables, as such, unless specified, we default to gold - // linker. -- return "gold"; -+ return "lld"; - case llvm::Triple::x86: - case llvm::Triple::x86_64: - case llvm::Triple::ppc64: - case llvm::Triple::ppc64le: - case llvm::Triple::systemz: - // BFD linker has issues wrt relocations against protected symbols. -- return "gold"; -+ return "lld"; - default: - // Otherwise, use the default BFD linker. - return ""; -diff --git a/utils/build-presets.ini b/utils/build-presets.ini -index 6a93cc25e6c..e9bff3b1487 100644 ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -831,6 +831,13 @@ llvm-install-components=llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-re - mixin-preset= - mixin_linux_install_components_with_clang - -+extra-cmake-options= -+ -DLLVM_USE_LINKER=lld -+ -DSWIFT_USE_LINKER=lld -+ -+#skip-early-swift-driver -+#skip-early-swiftsyntax -+ - llbuild - swiftpm - swift-driver -@@ -881,6 +888,7 @@ relocate-xdg-cache-home-under-build-subdir - mixin-preset= - mixin_linux_installation - build-subdir=buildbot_linux -+ - lldb - release - test