Skip to content

Commit 3180cbc

Browse files
committed
build: Remove workaround for bug in 1.74 and 1.75.
The fix for this bug was merged in 1.76 and we use a more recent compiler. rust-lang/rust#119802
1 parent bccecb5 commit 3180cbc

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

src/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -240,19 +240,6 @@ endif()
240240
# See https://github.com/rust-bitcoin/rust-secp256k1/tree/7c8270a8506e31731e540fab7ee1abde1f48314e/secp256k1-sys#linking-to-external-symbols
241241
set(RUSTFLAGS "${RUSTFLAGS} --cfg=rust_secp_no_symbol_renaming")
242242

243-
# Apply workaround for a potential miscompilation bug:
244-
# See
245-
# - https://github.com/rust-embedded/cortex-m/discussions/503
246-
# - https://github.com/rust-lang/rust/issues/118867
247-
# We have not observed any abnormal behavior even though we fulfil all the criteria to be affected
248-
# (opt-level='z', thumbv7em-none-eabi target, Rust toolchain 1.74.0 being >= 1.73.0), but we apply
249-
# the workaround just in case.
250-
#
251-
# This increases the binary size of the `make firmware` (Multi) build by 11568 bytes at the time of
252-
# adding this workaround. This can be removed again once the issue above is fixed and we have
253-
# updated to a Rust toolchain that contains the fix.
254-
set(RUSTFLAGS "${RUSTFLAGS} -Cllvm-args=--enable-machine-outliner=never")
255-
256243
if(CMAKE_CROSSCOMPILING)
257244
set(RUST_TARGET_ARCH thumbv7em-none-eabi)
258245
set(RUST_TARGET_ARCH_DIR ${RUST_TARGET_ARCH})

0 commit comments

Comments
 (0)