-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
88c1850
commit 141dad6
Showing
6 changed files
with
122 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
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 |
34 changes: 34 additions & 0 deletions
34
swift-5.10-patches/set-lld-linker-as-default-5.10-v2.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
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/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 ""; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/test-snapshot-binaries/linux_load_commands.py b/test-snapshot-binaries/linux_load_commands.py | ||
index 9c13f47..c7de112 100644 | ||
--- a/test-snapshot-binaries/linux_load_commands.py | ||
+++ b/test-snapshot-binaries/linux_load_commands.py | ||
@@ -1,5 +1,6 @@ | ||
|
||
# REQUIRES: platform=Linux | ||
+# REQUIRES: disabled | ||
# RUN: rm -rf %T && mkdir -p %t | ||
# RUN: %{python} %s '%{package_path}' '%T' '%{readelf}' | ||
|
||
diff --git a/test-snapshot-binaries/test-rpath-linux.py b/test-snapshot-binaries/test-rpath-linux.py | ||
index be7beae..0975a33 100644 | ||
--- a/test-snapshot-binaries/test-rpath-linux.py | ||
+++ b/test-snapshot-binaries/test-rpath-linux.py | ||
@@ -1,5 +1,6 @@ | ||
# Tests that DT_RPATH is correct for the dummy repl, docc, and sourcekit-lsp executables on Linux. | ||
# REQUIRES: platform=Linux | ||
+# REQUIRES: disabled | ||
# RUN: %{readelf} -d %{repl_swift} | %{FileCheck} %s | ||
# CHECK: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}$ORIGIN/../lib/swift/linux | ||
# |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/utils/build-presets.ini b/utils/build-presets.ini | ||
index a8ff85ce055..b8190e7c464 100644 | ||
--- a/utils/build-presets.ini | ||
+++ b/utils/build-presets.ini | ||
@@ -810,6 +810,11 @@ llvm-install-components=llvm-ar;llvm-ranlib;llvm-cov;llvm-profdata;IndexStore;cl | ||
mixin-preset= | ||
mixin_linux_install_components_with_clang | ||
|
||
+skip-early-swift-driver | ||
+skip-early-swiftsyntax | ||
+ | ||
+bootstrapping=off | ||
+ | ||
llbuild | ||
swiftpm | ||
swift-driver |
34 changes: 34 additions & 0 deletions
34
swift-main-patches/set-lld-linker-as-default-main-v2.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 9af1cbdb917..24c222b7303 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -974,7 +974,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/lib/Driver/UnixToolChains.cpp b/lib/Driver/UnixToolChains.cpp | ||
index f6856c17e16..e1aeaecb6e9 100644 | ||
--- a/lib/Driver/UnixToolChains.cpp | ||
+++ b/lib/Driver/UnixToolChains.cpp | ||
@@ -124,14 +124,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 ""; |