Skip to content

Commit

Permalink
rust179: update CKSUM adjustments for openssl* vendor crate patches.
Browse files Browse the repository at this point in the history
Also set has_thread_local to false for NetBSD/aarch64*, due to
NetBSD PR#58154, ref. comments in
rust-lang/rust#123551
Verification remains.
  • Loading branch information
he32 committed Jul 23, 2024
1 parent c1697e3 commit a90cd31
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 0 deletions.
12 changes: 12 additions & 0 deletions rust179/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,18 @@ CKSUM_CRATES+= vendor/crossbeam-utils-0.8.18
CKSUMS+= 31a8276afd38e39987a169eeb02e9bed32670de5ca36d7eb74aab7e506cf9dc4
CKSUMS+= ead4bda23c322bde8c01e48d4cd19b70e7b7e473a56466218d279f88463ab466

CKSUM_CRATES+= vendor/openssl-sys-0.9.92
CKSUMS+= 33f814dba4ac9942266157cbe3dc8eadf5e477090370a92c36c53f916fa45d48
CKSUMS+= f78ddd9b03c31a03350aa152d6f707c6cbb21b2ea0b493d05238aa473b80af09
CKSUMS+= b2cbaa5bfac5e7d5550aa0eb8e5c65a9f7e86a3692b759fb13330ef6e3b26b30
CKSUMS+= b303bf9ceae9fcffa4a0420ea858675d827fc2d75c358f8236e44274d58be1a0

CKSUM_CRATES+= vendor/openssl-src-111.28.1+1.1.1w
CKSUMS+= 090744f85cf99a9b8412c23fca1eabb61eb45d830f0f9f0e7309be2572c1e827
CKSUMS+= 4261f87c06e6505afd9f7bdafe5aebdd153a1c6f928203cec2dd125642d60fc1
CKSUMS+= c87f041ff9ada85cddcb2a787788e05b2ab5ffc0a85f502fe7e3f7cbda59d49c
CKSUMS+= 67b877964bc0e40c84669c423818a3cb39501eaedfc3f5caf9c33d4779c3d03f

SUBST_CLASSES+= cksum
SUBST_STAGE.cksum= pre-configure
.for crate in ${CKSUM_CRATES}
Expand Down
2 changes: 2 additions & 0 deletions rust179/distinfo
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,10 @@ SHA512 (rustc-1.79.0-src.tar.gz) = 4fa7385b2e89816849f1c353be3bf8fd36c05896ca7de
Size (rustc-1.79.0-src.tar.gz) = 297469050 bytes
SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 3105b0c89cf04b4469fc56cd89e7e4a661517002
SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8
SHA1 (patch-compiler_rustc__target_spec_targets_aarch64__unknown__netbsd.rs) = 1a02f2dd61a5f9cc4be1f66ac3404c961810c731
SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 7d910631f49acf2c33fdd191fd3e0f261efae234
SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00
SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs) = 620eaf74c1dd030973af53dfe4f9aa998be5b123
SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = e97b7978cc525db7eadf967d51f4818a3c145754
SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 1ab343595e65ff6348f83cffc30e53d764485ff8
SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$NetBSD$

NetBSD aarch64 has a bug in the thread-local storage implementation,
ref. PR#58154. Turn it off for now.
Ideally should check whether the version has the fix or not, but
e.g. __NetBSD_Version__ isn't easily available here that I know...

--- compiler/rustc_target/src/spec/targets/aarch64_unknown_netbsd.rs.orig 2024-07-23 19:18:44.116841966 +0000
+++ compiler/rustc_target/src/spec/targets/aarch64_unknown_netbsd.rs
@@ -17,6 +17,7 @@ pub fn target() -> Target {
mcount: "__mcount".into(),
max_atomic_width: Some(128),
stack_probes: StackProbeType::Inline,
+ has_thread_local: false, // ref. NetBSD PR#58154
..base::netbsd::opts()
},
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$NetBSD$

NetBSD aarch64 has a bug in the thread-local storage implementation,
ref. PR#58154. Turn it off for now.
Ideally should check whether the version has the fix or not, but
e.g. __NetBSD_Version__ isn't easily available here that I know...

--- compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs.orig 2024-07-23 19:21:34.344805113 +0000
+++ compiler/rustc_target/src/spec/targets/aarch64_be_unknown_netbsd.rs
@@ -18,6 +18,7 @@ pub fn target() -> Target {
max_atomic_width: Some(128),
stack_probes: StackProbeType::Inline,
endian: Endian::Big,
+ has_thread_local: false, // ref. NetBSD PR#58154
..base::netbsd::opts()
},
}

0 comments on commit a90cd31

Please sign in to comment.