-
-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Note that we can't just update previous patches in place, as that would prevent electron-source and ungoogled-chrome (< M126) from building.
- Loading branch information
1 parent
bda04d2
commit 7f36179
Showing
3 changed files
with
62 additions
and
3 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
29 changes: 29 additions & 0 deletions
29
pkgs/applications/networking/browsers/chromium/patches/chromium-126-llvm-17.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,29 @@ | ||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
index 6efe967eb0a1c..590a2c274ac13 100644 | ||
--- a/build/config/compiler/BUILD.gn | ||
+++ b/build/config/compiler/BUILD.gn | ||
@@ -568,24 +568,6 @@ config("compiler") { | ||
} | ||
} | ||
|
||
- # TODO(crbug.com/40283598): This causes binary size growth and potentially | ||
- # other problems. | ||
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version. | ||
- if (default_toolchain != "//build/toolchain/cros:target" && | ||
- !llvm_android_mainline) { | ||
- cflags += [ | ||
- "-mllvm", | ||
- "-split-threshold-for-reg-with-hint=0", | ||
- ] | ||
- if (use_thin_lto && is_a_target_toolchain) { | ||
- if (is_win) { | ||
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ] | ||
- } else { | ||
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ] | ||
- } | ||
- } | ||
- } | ||
- | ||
# TODO(crbug.com/40192287): Investigate why/if this should be needed. | ||
if (is_win) { | ||
cflags += [ "/clang:-ffp-contract=off" ] |
21 changes: 21 additions & 0 deletions
21
pkgs/applications/networking/browsers/chromium/patches/chromium-126-rust.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,21 @@ | ||
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | ||
index 6efe967eb0a1c..2ddae4efacbfa 100644 | ||
--- a/build/config/compiler/BUILD.gn | ||
+++ b/build/config/compiler/BUILD.gn | ||
@@ -1653,16 +1653,6 @@ config("runtime_library") { | ||
configs += [ "//build/config/c++:runtime_library" ] | ||
} | ||
|
||
- # Rust and C++ both provide intrinsics for LLVM to call for math operations. We | ||
- # want to use the C++ intrinsics, not the ones in the Rust compiler_builtins | ||
- # library. The Rust symbols are marked as weak, so that they can be replaced by | ||
- # the C++ symbols. This config ensures the C++ symbols exist and are strong in | ||
- # order to cause that replacement to occur by explicitly linking in clang's | ||
- # compiler-rt library. | ||
- if (is_clang && toolchain_has_rust) { | ||
- configs += [ "//build/config/clang:compiler_builtins" ] | ||
- } | ||
- | ||
# TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia | ||
# configuration. | ||
if (is_posix || is_fuchsia) { |