Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history
  • Loading branch information
futurejones committed Mar 12, 2024
1 parent 9ce1805 commit 58346cf
Showing 1 changed file with 56 additions and 0 deletions.
56 changes: 56 additions & 0 deletions swift-5.10-patches/set-lld-linker-as-default-5.10-v2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c758792bf4a..80ef65ab6b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -902,7 +902,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT CMAKE_HOST_SYSTEM_NAME STREQ
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/bootstrapping-off-5.10.patch b/bootstrapping-off-5.10.patch
deleted file mode 100644
index 9cc2bc53185..00000000000
--- a/bootstrapping-off-5.10.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/utils/build-presets.ini b/utils/build-presets.ini
-index bd591736ec1..888a01a490b 100644
---- a/utils/build-presets.ini
-+++ b/utils/build-presets.ini
-@@ -843,6 +843,11 @@ llvm-install-components=llvm-ar;llvm-cov;llvm-profdata;IndexStore;clang;clang-re
- mixin-preset=
- mixin_linux_install_components_with_clang
-
-+skip-early-swift-driver
-+skip-early-swiftsyntax
-+
-+bootstrapping=off
-+
- llbuild
- swiftpm
- swift-driver
diff --git a/lib/Driver/UnixToolChains.cpp b/lib/Driver/UnixToolChains.cpp
index 61498c144a2..f9f540ec144 100644
--- a/lib/Driver/UnixToolChains.cpp
+++ b/lib/Driver/UnixToolChains.cpp
@@ -125,14 +125,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 "";

0 comments on commit 58346cf

Please sign in to comment.