Skip to content

Commit 94faef1

Browse files
danakjcopybara-github
authored andcommitted
Enable weak-intrinsics in compiler_builtins
This will allow the C++ intrinsics to replace them when they are linked in explicitly. [email protected] Bug: 1445978 Change-Id: If37225fb6b6d49f6ccd2e548c2ca451bebdedbc1 Cq-Include-Trybots: luci.chromium.try:android-rust-arm32-rel,android-rust-arm64-dbg,android-rust-arm64-rel,linux-rust-x64-rel,linux-rust-x64-dbg,mac-rust-x64-dbg,win-rust-x64-dbg,win-rust-x64-rel Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4567107 Commit-Queue: danakj <[email protected]> Reviewed-by: Adrian Taylor <[email protected]> Cr-Commit-Position: refs/heads/main@{#1151214} NOKEYCHECK=True GitOrigin-RevId: 78de5406e5bfd08ffecf16f0db11156795426753
1 parent b339e75 commit 94faef1

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

rust/std/gnrt_config.toml

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ extra_gn_deps = [
3838
]
3939

4040
[crate.compiler_builtins]
41+
features = ['weak-intrinsics']
4142
# Dependencies of profiler_builtins must have instrumentation disabled
4243
remove_library_configs = ['//build/config/coverage:default_coverage']
4344
extra_gn_deps_to_ignore = ['//build/rust/std:profiler_builtins_group']

rust/std/rules/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ cargo_crate("compiler_builtins") {
171171
"compiler-builtins",
172172
"core",
173173
"rustc-dep-of-std",
174+
"weak-intrinsics",
174175
]
175176
build_root = "//third_party/rust-toolchain/lib/rustlib/src/rust/vendor/compiler_builtins-0.1.92/build.rs"
176177
build_sources = [ "//third_party/rust-toolchain/lib/rustlib/src/rust/vendor/compiler_builtins-0.1.92/build.rs" ]

0 commit comments

Comments
 (0)