pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: undo wrong code for parallelism detection on NetBSD.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Thu Oct 12 14:37:13 2023 +0000
Changeset: 87a82a36aec0e7f787871588e1b1ececbccc630f
Modified Files:
rust/Makefile
rust/distinfo
rust/do-cross.mk
rust/patches/patch-library_std_src_sys_unix_thread.rs
rust/platform.mk
Log Message:
rust: undo wrong code for parallelism detection on NetBSD.
This mirrors the upstream pull request I just filed at
https://github.com/rust-lang/rust/pull/116665
I have applied this to a 1.72.1 rust checkout, and have re-built
the bootstrap kits for our NetBSD ports with that change applied,
and this commit bumps the bootstrap requirement for 1.73.0 from
1.72.0 to use the newly generated 1.72.1 bootstrap kits for all
the NetBSD targets.
This gets us building again on NetBSD/evbarmv7hf 9.0, NetBSD/macppc
10.0_BETA, and most probably NetBSD/i386 9.3 as well, whereas with
the 1.72.0 bootstrap code, the "bootstrap" rust program would crash
with SEGV on those particular platforms.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=87a82a36aec0e7f787871588e1b1ececbccc630f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/Makefile | 23 ++---
rust/distinfo | 110 ++++++++++-----------
rust/do-cross.mk | 2 +-
.../patch-library_std_src_sys_unix_thread.rs | 43 +++++++-
rust/platform.mk | 2 +-
5 files changed, 111 insertions(+), 69 deletions(-)
diffs:
diff --git a/rust/Makefile b/rust/Makefile
index b5306ba29f..2ca0416697 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -286,7 +286,7 @@ RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_ARCH= i586-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -306,14 +306,14 @@ pre-build-fix-paxctl:
${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-x86_64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_ARCH= x86_64-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_ARCH= powerpc-unknown-netbsd
# Cross-built against NetBSD 9.0
@@ -336,7 +336,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_ARCH= aarch64-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -345,7 +345,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64eb} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_ARCH= aarch64_be-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -354,7 +354,7 @@ SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64} || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_ARCH= sparc64-unknown-netbsd
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
@@ -364,7 +364,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv7hf} || make(distinfo) || make (makesum) || make(mdi)
RUST_ARCH= armv7-unknown-netbsd-eabihf
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -373,7 +373,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-earmv6hf} || make(distinfo) || make (makesum) || make(mdi)
RUST_ARCH= armv6-unknown-netbsd-eabihf
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -382,7 +382,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
.endif
#.if ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || make(distinfo) || make (makesum) || make(mdi)
#RUST_ARCH= mipsel-unknown-netbsd
-#RUST_STAGE0_VER= 1.72.0
+#RUST_STAGE0_VER= 1.72.1
#RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
#RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
#DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -391,7 +391,7 @@ SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
#.endif
.if ${MACHINE_PLATFORM:MNetBSD-*-riscv64} || make(distinfo) || make (makesum) || make(mdi)
RUST_ARCH= riscv64gc-unknown-netbsd
-RUST_STAGE0_VER= 1.72.0
+RUST_STAGE0_VER= 1.72.1
RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.xz
DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
@@ -698,7 +698,8 @@ TOOL_DEPENDS+= compat80>=0:../../emulators/compat80
# This is for when we build natively:
.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} || \
${MACHINE_PLATFORM:MNetBSD-*-i386} || \
- ${MACHINE_PLATFORM:MNetBSD-*-mipsel}
+ ${MACHINE_PLATFORM:MNetBSD-*-mipsel} || \
+ ${MACHINE_PLATFORM:MNetBSD-*-riscv64}
# Make libatomic library available via a unique directory:
DEPENDS+= libatomic-links>=0:../../devel/libatomic-links
.endif
diff --git a/rust/distinfo b/rust/distinfo
index f4451512c5..d571d30861 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -6,39 +6,15 @@ Size (rust-1.72.0-aarch64-apple-darwin.tar.gz) = 240731919 bytes
BLAKE2s (rust-1.72.0-aarch64-unknown-linux-gnu.tar.gz) = 328f5c5c8a250b4dd48d28adb247855e486c638116cdb7d649bfbe6b7a23d274
SHA512 (rust-1.72.0-aarch64-unknown-linux-gnu.tar.gz) = 74fee4e7bb028f296735f223cf63aafd233c31429b7557bcb8ea81b535e121922ef8feecc7f1d0778ed4f90c3d2e67d4a84c7fcf987e563780fc5c4e0d90434e
Size (rust-1.72.0-aarch64-unknown-linux-gnu.tar.gz) = 452759746 bytes
-BLAKE2s (rust-1.72.0-aarch64-unknown-netbsd.tar.xz) = a127d40afd7c79a73c556fc7f16a534815dc4ed8463d2940e5e6ea4562fcc518
-SHA512 (rust-1.72.0-aarch64-unknown-netbsd.tar.xz) = 12e31baaf40b044b1236a7f286f69410103b19d028df18af02f08f35d2b0f04edcab05eb9927270364285d8e60ebd1db9d625d553fc9a83193ff7b98cd8a5b0b
-Size (rust-1.72.0-aarch64-unknown-netbsd.tar.xz) = 158397384 bytes
-BLAKE2s (rust-1.72.0-aarch64_be-unknown-netbsd.tar.xz) = 755eac7877b54b30a598159a862dd8e2106ea00b99182f385a6c6baed0fd8bd2
-SHA512 (rust-1.72.0-aarch64_be-unknown-netbsd.tar.xz) = 1102f6ab7dee4c320e9905f87a8195907ac6dec1e4b20b093d5fd4869c15b2b9c358c125fe101df449845967481feeff2654cb3f6b30d66b78e2c67920414aa8
-Size (rust-1.72.0-aarch64_be-unknown-netbsd.tar.xz) = 157966192 bytes
BLAKE2s (rust-1.72.0-arm-unknown-linux-gnueabihf.tar.gz) = cf4d530a4a6f20e90b8b608e141ea8e8fee473d01f8fb748a48730d57f5a6bd5
SHA512 (rust-1.72.0-arm-unknown-linux-gnueabihf.tar.gz) = 89c25bb3bb3acb6e0a94aaf6e2c58d6f689fbcb7ca3280f0504de8d770cd895651cf31f4316a9efbb5785936a0127cf2dffe6cd3ede6d45531d64a92912349dd
Size (rust-1.72.0-arm-unknown-linux-gnueabihf.tar.gz) = 343108462 bytes
-BLAKE2s (rust-1.72.0-armv6-unknown-netbsd-eabihf.tar.xz) = cd38c66803b2c45df30919d34e20861b71e21a83cdc7addb285019b0dc073acb
-SHA512 (rust-1.72.0-armv6-unknown-netbsd-eabihf.tar.xz) = 7ac6f4920d3db00d9e217810656ca9ac96cb930ce980f975c93ce945b53a39e551a00a1316c1bebe4775042527c996e2fb1c6429462b108160e90c7defbbf8ce
-Size (rust-1.72.0-armv6-unknown-netbsd-eabihf.tar.xz) = 132829056 bytes
BLAKE2s (rust-1.72.0-armv7-unknown-linux-gnueabihf.tar.gz) = 9890683604a55142a6951cfcb37eb19f85da1c6d11e8d8db7387b458aca954c4
SHA512 (rust-1.72.0-armv7-unknown-linux-gnueabihf.tar.gz) = 0fe784067113779d6008f22e450e6f072fc1d7bd3a18ca60b9d875b0104559c41f098b78061f6f6aa94069fc2cda60ea9e3494fcb6eba9cab87dac64d9573b32
Size (rust-1.72.0-armv7-unknown-linux-gnueabihf.tar.gz) = 332721448 bytes
-BLAKE2s (rust-1.72.0-armv7-unknown-netbsd-eabihf.tar.xz) = ef2f8e88b1662e75bd196a7b8ff0cb93e893d8010af60fe5d4489913b9a1f014
-SHA512 (rust-1.72.0-armv7-unknown-netbsd-eabihf.tar.xz) = 3e326d0f544d51396d782d148d504a3ccd1f84683831c9ea75b6d3b2785e394ee34d36390a1f1ff0b4ea153d02a9aaab61b31c64c8ad7c445743d38d1a1c9a2f
-Size (rust-1.72.0-armv7-unknown-netbsd-eabihf.tar.xz) = 137369016 bytes
-BLAKE2s (rust-1.72.0-i586-unknown-netbsd.tar.xz) = 4926992e91a8b03645c54fc694e86da38cf0269bc9aa80ef40b12ab312c412ef
-SHA512 (rust-1.72.0-i586-unknown-netbsd.tar.xz) = f3301a3b5db51a8075b58e40c32f529deb6595ecc54fe255d927dfeb21cf9725430fad2944cbc6d2883351246a39fee288800428138edf84e8b7fa81ac33e48f
-Size (rust-1.72.0-i586-unknown-netbsd.tar.xz) = 169722524 bytes
BLAKE2s (rust-1.72.0-i686-unknown-linux-gnu.tar.gz) = ed7f52546053c2956514f5ce082979e85d8cefc6cf6c19e514a402bd1b1d354f
SHA512 (rust-1.72.0-i686-unknown-linux-gnu.tar.gz) = 785dc7d53298b8498da9aa001165bd9243fd7fc58430c95b23313310f7fc96225b402de9a82bf1a7cae6988a354f9d937f1ceaf18225a3d25e48811ccc91ae17
Size (rust-1.72.0-i686-unknown-linux-gnu.tar.gz) = 402802077 bytes
-BLAKE2s (rust-1.72.0-powerpc-unknown-netbsd90.tar.xz) = 919de7811c7ba01f1b0b9f266ff680bfb07e0ed8fa75ec43fd934b87a17246ae
-SHA512 (rust-1.72.0-powerpc-unknown-netbsd90.tar.xz) = 977ca03165cadcff5c0f8f836da65f1254c0bedf2031e3b1592cf3031d12d202467aaa75964295167a191008e8f0bcc85d116f587e5762c23463c18398645760
-Size (rust-1.72.0-powerpc-unknown-netbsd90.tar.xz) = 187237884 bytes
-BLAKE2s (rust-1.72.0-riscv64gc-unknown-netbsd.tar.xz) = 705107904118bf1a12bb2842b77fbc4033760db129eed0770a22c413f705183e
-SHA512 (rust-1.72.0-riscv64gc-unknown-netbsd.tar.xz) = 857a2153c3181efc37eb7d66b7b350fcba260529d34c8dc5c8fee94feeedb1c210a2943c1c38ec144e01937e6803c29d5304c012fc0a7775e5a029e1b513c42d
-Size (rust-1.72.0-riscv64gc-unknown-netbsd.tar.xz) = 170178716 bytes
-BLAKE2s (rust-1.72.0-sparc64-unknown-netbsd.tar.xz) = 97ed1c28e51d03f2dd48506e7b6c2b79e776e69ce62da7451f02682a9c09fb03
-SHA512 (rust-1.72.0-sparc64-unknown-netbsd.tar.xz) = 8bbb4f3fe04e64264c3550e24af85d13c1f7d9a2b7f6acb55381d55feb8ff633f753a4c4f2b8f87cb53bd9d453854bd6ebd2f23b8e5107f346f101e27af19bc9
-Size (rust-1.72.0-sparc64-unknown-netbsd.tar.xz) = 153057392 bytes
BLAKE2s (rust-1.72.0-x86_64-apple-darwin.tar.gz) = af5b611327a7d84935ee3b55ec422744fa67cb21030e94063196a06d4413517b
SHA512 (rust-1.72.0-x86_64-apple-darwin.tar.gz) = 417614ca4446143479385e22e40d98ffefbc16cb8668a3cf957794f5bb0d81a364d980bf6b6fa5f804276c49c42d8ac3148ebaee58234bea8a2edb76e19fc06a
Size (rust-1.72.0-x86_64-apple-darwin.tar.gz) = 326770962 bytes
@@ -48,51 +24,51 @@ Size (rust-1.72.0-x86_64-unknown-freebsd.tar.gz) = 308289212 bytes
BLAKE2s (rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz) = 6069b770aa68e583dc98d4dfb9212f83aa3d78177912603ccfeb752afe7cab53
SHA512 (rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz) = 166d968371d98662e14805afb8a64a7ac81979ff4db3265e530ee2c02046c2a388bd60d48e55ec54831e3a95fcdfd5c35f2bd2166911e5adcfe5e5516e4e480d
Size (rust-1.72.0-x86_64-unknown-linux-gnu.tar.gz) = 348493826 bytes
-BLAKE2s (rust-1.72.0-x86_64-unknown-netbsd.tar.xz) = a4218642422b442c57dcf7086cc7bb82ec4ae24bc3f2bb09133f78824a903ffa
-SHA512 (rust-1.72.0-x86_64-unknown-netbsd.tar.xz) = b47c6c12b60df129a047dfd94fe9a932feee3f2a94fc4a97b6cabc2ead1a438fe33fb997f4e749ac9ffdf8c78274e7023511bd85e93fd3fe2873a7c8f8dadc59
-Size (rust-1.72.0-x86_64-unknown-netbsd.tar.xz) = 150911484 bytes
+BLAKE2s (rust-1.72.1-aarch64-unknown-netbsd.tar.xz) = c5aa3084f3653be97fd14dbb2dd20d36334277450733143f6185162c0caf5298
+SHA512 (rust-1.72.1-aarch64-unknown-netbsd.tar.xz) = ff5b2d2046e6ea04f01a32e2cf3d22d65223f52c2b27c1d29ea808bfa9f3eee94e0410971ab21c9fd49abddf1599454c6544bdabfab22f2ffd802c2f620649e7
+Size (rust-1.72.1-aarch64-unknown-netbsd.tar.xz) = 159770736 bytes
+BLAKE2s (rust-1.72.1-aarch64_be-unknown-netbsd.tar.xz) = 71fc52b117716633ab9f36a5b472b28ce20f3ee9ae7c5316e073e43cecf6d5d8
+SHA512 (rust-1.72.1-aarch64_be-unknown-netbsd.tar.xz) = 872e10f767c968f1d38c24b90e7932e88472ce8d8321ffcbdd4791b301c52c72dd9101cd513add46c92cad8d6018e6d30549d714ff9f5a14dc09891d490f25fa
+Size (rust-1.72.1-aarch64_be-unknown-netbsd.tar.xz) = 156090180 bytes
+BLAKE2s (rust-1.72.1-armv6-unknown-netbsd-eabihf.tar.xz) = 964f468e2ae3cdf3d92e6326f6b5d6bd889117f012327031567f5ecbb4ce1dd4
+SHA512 (rust-1.72.1-armv6-unknown-netbsd-eabihf.tar.xz) = 55703e8cff1a43d87153644a603baa0ab46a27590c0571303999e990d0713707ab7d35d022feab957c6e93fbaac9a1a609e13abb4dc7d70e38ead757bae4f899
+Size (rust-1.72.1-armv6-unknown-netbsd-eabihf.tar.xz) = 135260448 bytes
+BLAKE2s (rust-1.72.1-armv7-unknown-netbsd-eabihf.tar.xz) = ef9382449c90ea1ffae53f7aebcbb08f417cd65df5d7f321a5507eb4e45bc10c
+SHA512 (rust-1.72.1-armv7-unknown-netbsd-eabihf.tar.xz) = 0a2c2ca3096b33f992630de3cf1a1b254626bf6d1c81418c651e43b57ef265241158854098c70c22d5a2d6c31904e35ef6d2affe2da3cca99809700b9254088c
+Size (rust-1.72.1-armv7-unknown-netbsd-eabihf.tar.xz) = 137884200 bytes
+BLAKE2s (rust-1.72.1-i586-unknown-netbsd.tar.xz) = a558a2141bc66451b6848262ec838d920ee0ee13fdc8484e4a1d110c3c9abe3c
+SHA512 (rust-1.72.1-i586-unknown-netbsd.tar.xz) = 3732d9cf3b6220f27543ae576792a300c97a1c54b7f63083d34a750fe010a4e2c5a5d4899a6bd3135ec9829a18b1529c58caf7fbb4eb49672093e122c59cf4a3
+Size (rust-1.72.1-i586-unknown-netbsd.tar.xz) = 172583092 bytes
+BLAKE2s (rust-1.72.1-powerpc-unknown-netbsd90.tar.xz) = 45bc45ec36a0d1f308aa34aba19c0eec1b8686b37e5f596ced020558ad90a68e
+SHA512 (rust-1.72.1-powerpc-unknown-netbsd90.tar.xz) = 4b4cebc34bb53c316fc001a13335dfdd62ace20ce7098d99696bcf07b28691425964e2e50e3b6e7cfcf43cd68741842807b773bb6cb464f9d3ebc61aba1c7d72
+Size (rust-1.72.1-powerpc-unknown-netbsd90.tar.xz) = 185984568 bytes
+BLAKE2s (rust-1.72.1-riscv64gc-unknown-netbsd.tar.xz) = 8abdeb94d799fc03ba2e6a1f3e2eb1b0b0ada2cfb5ae4c4d1d4ac27a6422e27b
+SHA512 (rust-1.72.1-riscv64gc-unknown-netbsd.tar.xz) = 55596059cac2fd3dc2f1a4793e6e56d8cf9dead58d1bd809bdc6997d32ac0346abcb0b1ad6889f22db61b7aab957cb50f51d2ad41c0336da07cf2640018607e9
+Size (rust-1.72.1-riscv64gc-unknown-netbsd.tar.xz) = 170193092 bytes
+BLAKE2s (rust-1.72.1-sparc64-unknown-netbsd.tar.xz) = 1b7afd4bae462ac1ca63cd2524e7005a0efd119a96df9b9df7aae56cdf3cdf47
+SHA512 (rust-1.72.1-sparc64-unknown-netbsd.tar.xz) = ba77c7cebda788f0e880bf97569cc89d8779f70cc6b9e7291d5de62bdb1e2d68015dcdf4e353460840d86f8ef2703b7ecd63f8bf297af37d75ab4e669852874c
+Size (rust-1.72.1-sparc64-unknown-netbsd.tar.xz) = 153019884 bytes
BLAKE2s (rust-1.72.1-x86_64-unknown-illumos.tar.gz) = 14073b33014a1a53d01ad6ee5001a646f26445c05eb84d361ccd86de8999dd63
SHA512 (rust-1.72.1-x86_64-unknown-illumos.tar.gz) = 143fdeabbeacded6f37ee447c4a2ddcc13816083ab356da13d8b52e8c873560f29d67621e62bc68089c578d6ffdab3756a02fcd07c3192c43e5617803398d422
Size (rust-1.72.1-x86_64-unknown-illumos.tar.gz) = 230033646 bytes
+BLAKE2s (rust-1.72.1-x86_64-unknown-netbsd.tar.xz) = 38b1cc764cef9fbf016aa8e43d920ac67bde53024e67bd6172dd5e50916ad4ea
+SHA512 (rust-1.72.1-x86_64-unknown-netbsd.tar.xz) = 4c2e138bdbec6e35fecec3a84b9d3eb151f232ff1a264c3d6ce2b0ba80ecbf8ef3e5bb52b2cfcbbc5a745e6041e0f110bdd8ec946c256403a74f4dae8b20c6c5
+Size (rust-1.72.1-x86_64-unknown-netbsd.tar.xz) = 150968500 bytes
BLAKE2s (rust-std-1.72.0-aarch64-apple-darwin.tar.gz) = dac67e23180062cd6d4ae0c46e77c4ecc94ce381bc2991eefc6c50b492f11053
SHA512 (rust-std-1.72.0-aarch64-apple-darwin.tar.gz) = be89f45338f326fd46e213472e4d8134f0348f60871cbb7e1b641c5d4fb3229d37da1b4d173f9b2953b8ca91b0c8a90b5fb8a8c892acbac169bfa730ded44a4a
Size (rust-std-1.72.0-aarch64-apple-darwin.tar.gz) = 40654475 bytes
BLAKE2s (rust-std-1.72.0-aarch64-unknown-linux-gnu.tar.gz) = 0eb7ef7b95e57682d9026e02024626c30b26c15bdfa565a164778d0118a4f659
SHA512 (rust-std-1.72.0-aarch64-unknown-linux-gnu.tar.gz) = 3ac354ef8706c5c52667dec0cea5f39d9274f2afc27beca86427fe31417b403844c32ca81674894414aeeca687459678f8985d208a1069e69ec9d16c72b49365
Size (rust-std-1.72.0-aarch64-unknown-linux-gnu.tar.gz) = 64875725 bytes
-BLAKE2s (rust-std-1.72.0-aarch64-unknown-netbsd.tar.xz) = 4afb2babe9acc36e176baec3b3e21753d77e826d83a669229772353f8b0b8093
-SHA512 (rust-std-1.72.0-aarch64-unknown-netbsd.tar.xz) = 2f4629de0749655bd8de0f738a11c8b3a052eb58afee0a12534e17954fb74794ec9b2d6db9f930690bd7f39a635553c3edf536deb4c29392d559cbf7b851bd5c
-Size (rust-std-1.72.0-aarch64-unknown-netbsd.tar.xz) = 23267536 bytes
-BLAKE2s (rust-std-1.72.0-aarch64_be-unknown-netbsd.tar.xz) = 8e1dcd4b281231f32e24bfc4d5bde5a69a5b59c4ab611482978597ae9181663d
-SHA512 (rust-std-1.72.0-aarch64_be-unknown-netbsd.tar.xz) = fb9cf435ff3781b4ae5aaabdb8b7262c707f826853cca8020250ad5b5c72fdcafbb1d699ab336605e5cc141b3d8589dbb79fad1a818c4fc63cecfbcc83314353
-Size (rust-std-1.72.0-aarch64_be-unknown-netbsd.tar.xz) = 23312472 bytes
BLAKE2s (rust-std-1.72.0-arm-unknown-linux-gnueabihf.tar.gz) = a3ac5e6f914075ac5e11fd0247789823558eb69621fc5810b2564d13d0c5bcbf
SHA512 (rust-std-1.72.0-arm-unknown-linux-gnueabihf.tar.gz) = f491a6fa164585c961f4742e7d7938c4f18450486402376e23dee224fb3771032e863ad3efa1af99d6957221b2f3390234f3d327fd8b04d803f4fd6eea2132ef
Size (rust-std-1.72.0-arm-unknown-linux-gnueabihf.tar.gz) = 37785930 bytes
-BLAKE2s (rust-std-1.72.0-armv6-unknown-netbsd-eabihf.tar.xz) = 3bb8671aefead8a9446e06f7767f317a07137959deb6d91d5cc527710fb4fb40
-SHA512 (rust-std-1.72.0-armv6-unknown-netbsd-eabihf.tar.xz) = 8bcd6881ec01cd5d95a76e28bb7d365daacffd3cdda486149a7b4bc45fa4bc921cc29a6cbb0f86ac2dca569673c9ffdd71d016d9f0629bea97dd465635dcdf0d
-Size (rust-std-1.72.0-armv6-unknown-netbsd-eabihf.tar.xz) = 21654492 bytes
BLAKE2s (rust-std-1.72.0-armv7-unknown-linux-gnueabihf.tar.gz) = 7910013df198532f468f56dfae3158ef6fec1ac024bffcc02bb8ac197b1814a7
SHA512 (rust-std-1.72.0-armv7-unknown-linux-gnueabihf.tar.gz) = a41e4ef9f18d703a4ec608dec7679f6df8b8c36a84be1f317c270375e8317586dd5f9cd034f4e538e46190958474a5cd872ff71bd03a710533d2d0b74eb10422
Size (rust-std-1.72.0-armv7-unknown-linux-gnueabihf.tar.gz) = 39277423 bytes
-BLAKE2s (rust-std-1.72.0-armv7-unknown-netbsd-eabihf.tar.xz) = 52dc30adc128ffffbb322753e31bf5c047bbadffb377cf29aeadd800d15a3b77
-SHA512 (rust-std-1.72.0-armv7-unknown-netbsd-eabihf.tar.xz) = 4bf1a3ea63eeb25c9827f9c6e9035d44f56ebcfef745904f2c76cf228ea1457ba167fde320380a80206b6b324d8098baf32881bd902ae1e9a5bd574b630e9a51
-Size (rust-std-1.72.0-armv7-unknown-netbsd-eabihf.tar.xz) = 22625952 bytes
-BLAKE2s (rust-std-1.72.0-i586-unknown-netbsd.tar.xz) = 6a12ff6f8729201ac2f359c334426c0d66d5996198049c2bffb6098d9436681a
-SHA512 (rust-std-1.72.0-i586-unknown-netbsd.tar.xz) = 6a00d4ccb658be5546fb559b2ef2bc08df9a9c4ee6f0fb037ce75bddcb67f7bf7d202fdcc7d14e6f3e1e236b5e84510168231d47c5bf9d779ce013c0cf5a8922
-Size (rust-std-1.72.0-i586-unknown-netbsd.tar.xz) = 23468376 bytes
BLAKE2s (rust-std-1.72.0-i686-unknown-linux-gnu.tar.gz) = 7ca256fe771e341b0797d16788fd8ff40bc9cda6771fa255636c93db571a29a2
SHA512 (rust-std-1.72.0-i686-unknown-linux-gnu.tar.gz) = 4a8aff89fc12da67dc6c0d68a05e07ab171e137c5391146cd1db076fbf8ee92d037c3730c05bbe320516567857fa2007341e02174e8f75552956103cdedbb8af
Size (rust-std-1.72.0-i686-unknown-linux-gnu.tar.gz) = 41471607 bytes
-BLAKE2s (rust-std-1.72.0-powerpc-unknown-netbsd90.tar.xz) = b0d4aeb3627b2ac139cd1dfe7c1a9f627f41cb734bed5abdcf5d0bd01aafa862
-SHA512 (rust-std-1.72.0-powerpc-unknown-netbsd90.tar.xz) = 6b13fa735f6eb976983d19c611376d079ae9c054876116a0d79faacc5e7017eb20ee34bdda0094a58789f7929073e37dc652ef32e473c0f8eb8c1934fd09f18c
-Size (rust-std-1.72.0-powerpc-unknown-netbsd90.tar.xz) = 21693544 bytes
-BLAKE2s (rust-std-1.72.0-riscv64gc-unknown-netbsd.tar.xz) = cbff2a549fd812a28cc9b31a02aff39ff2c06fa2153ee69d1f18eb4a6a88c6ba
-SHA512 (rust-std-1.72.0-riscv64gc-unknown-netbsd.tar.xz) = d7b57b29861232ea9a008b8cb56fec29ca6c11dd718c24e75f16e6ccde69fe21a66fc2e14a525e4d31e365dbe4d28f365e8995948773692bd61aa1891388237e
-Size (rust-std-1.72.0-riscv64gc-unknown-netbsd.tar.xz) = 21994408 bytes
-BLAKE2s (rust-std-1.72.0-sparc64-unknown-netbsd.tar.xz) = d28d6156e73f58643be3380bf4a7f00c8af58bf8c6d802df6cdc5c54c6b856d7
-SHA512 (rust-std-1.72.0-sparc64-unknown-netbsd.tar.xz) = a58d13b424b4cacb46e0d211a41b5d99c0eeb576a894330449fd620c9ce69bb9c73dd17252a2757c7b1a4cca9f43daf502f575e379db3a77e23216477b5fd522
-Size (rust-std-1.72.0-sparc64-unknown-netbsd.tar.xz) = 21517872 bytes
BLAKE2s (rust-std-1.72.0-x86_64-apple-darwin.tar.gz) = 0860f55d7f0ded9acd1cab981859175a9a9d88cdca6652291b020d7ed0f5f052
SHA512 (rust-std-1.72.0-x86_64-apple-darwin.tar.gz) = 706121190c12013752768363173c9d92a7990bdb853935526c80f0b8c9bcf9ed7677bcead91ca649a6e1ec4dd30dca812a748c336a08df2cec728696be87a262
Size (rust-std-1.72.0-x86_64-apple-darwin.tar.gz) = 43014050 bytes
@@ -102,9 +78,33 @@ Size (rust-std-1.72.0-x86_64-unknown-freebsd.tar.gz) = 44531107 bytes
BLAKE2s (rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz) = b823c3b9dbecda64fa29caa6692ebfdc3c6f218e8ac2d565d38fcbb6aa5b4ebb
SHA512 (rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz) = 03f4024a931048acabfc1c9fc73e567ad652c6db5a52f282c4ee3fada9eae3cfff00ef15ce004678d978678c17a828c8a074b03fae674802e5e113a947d48751
Size (rust-std-1.72.0-x86_64-unknown-linux-gnu.tar.gz) = 46275300 bytes
-BLAKE2s (rust-std-1.72.0-x86_64-unknown-netbsd.tar.xz) = e06fc09a36e91e5c63dc2b184ea85e3efd162eca9e0d81ecc12f64b14480f222
-SHA512 (rust-std-1.72.0-x86_64-unknown-netbsd.tar.xz) = d6d055d779e5d777c75bf30540c456356f8b90fd8a32887e8a15a6754f5ccd57ee205ffd74a7715bdf9b2790aea3cec023bfa9239ec7f8a4f34b3abfb377ad3f
-Size (rust-std-1.72.0-x86_64-unknown-netbsd.tar.xz) = 26205580 bytes
+BLAKE2s (rust-std-1.72.1-aarch64-unknown-netbsd.tar.xz) = bf3f779d2db6990592b5d80f0cee34417efae1a5f7ab2950c00477b64592a5a8
+SHA512 (rust-std-1.72.1-aarch64-unknown-netbsd.tar.xz) = 853a7a729c4c279ba4b3d2764f2198bc0cfcde2faae6c727a1cfb0aae57f07f1a98bfc580a1ab3aaa9c13120ff379761fadb1558bb67c81b63cbad8a1fe4348f
+Size (rust-std-1.72.1-aarch64-unknown-netbsd.tar.xz) = 23143948 bytes
+BLAKE2s (rust-std-1.72.1-aarch64_be-unknown-netbsd.tar.xz) = 06a2099a6bba4e3143cda1ef5d6e2c81aa2fda5ec49c999fe1dfea3bea4853ec
+SHA512 (rust-std-1.72.1-aarch64_be-unknown-netbsd.tar.xz) = a07fdd49fc277ed51829312f551b1f02bb5521d5697abc8fd3422656c14276f29d9c7c6d78c340e46706c64c7e15c1bd6eac252b93e5bd6c071e0d7b4f83f07f
+Size (rust-std-1.72.1-aarch64_be-unknown-netbsd.tar.xz) = 23208140 bytes
+BLAKE2s (rust-std-1.72.1-armv6-unknown-netbsd-eabihf.tar.xz) = 495a7525f76c3edb7877eee39239518f0042d37dd1a4b94ddcbb0a9bac870591
+SHA512 (rust-std-1.72.1-armv6-unknown-netbsd-eabihf.tar.xz) = abe779de0a5c22cbd73effd4607dad499c2350903fb5fe8d3ef0a1ac31c2a27c611c4621d2052ce74f28e0a4eaa91b690a1d3a52da49a58d2638d181acfb8e67
+Size (rust-std-1.72.1-armv6-unknown-netbsd-eabihf.tar.xz) = 21555600 bytes
+BLAKE2s (rust-std-1.72.1-armv7-unknown-netbsd-eabihf.tar.xz) = ae4df952eb4995237d5bf5ddf353ceffa22959f69965a21413c8649d85323555
+SHA512 (rust-std-1.72.1-armv7-unknown-netbsd-eabihf.tar.xz) = 1b2d0faa1fc3cbd80322d18a4891f885731ce2e99a34e57ba7b974ba19b6872f97a03c94851e41120e3be165e9ce9a7e440d720a32f1cec50960d98833fa8fdf
+Size (rust-std-1.72.1-armv7-unknown-netbsd-eabihf.tar.xz) = 22448372 bytes
+BLAKE2s (rust-std-1.72.1-i586-unknown-netbsd.tar.xz) = a44c59dd79f1538c6791274d90cb82f3836b87a2d776c7f9ee8d53eaed8324f5
+SHA512 (rust-std-1.72.1-i586-unknown-netbsd.tar.xz) = 9900c388ba60d439e32d64e7c88b669fe4c4b70d8862537972c6fb9a4bb764315782e1fc35539c882188a888377fce7151aa387cb2f65610cf1dc519cb7e55e9
+Size (rust-std-1.72.1-i586-unknown-netbsd.tar.xz) = 23666268 bytes
+BLAKE2s (rust-std-1.72.1-powerpc-unknown-netbsd90.tar.xz) = a0583c15929ae338f95ba3bbd536df60053ebfc6008e1c3101cf7213a0603623
+SHA512 (rust-std-1.72.1-powerpc-unknown-netbsd90.tar.xz) = 94fd617997f0a4c9347f747f8c4bde70c5fa2bb6e6791411b37eace90cec990ef8063673407ce3eb7533fadc30b57660f11d8724d790dc170ac0e983d18cccad
+Size (rust-std-1.72.1-powerpc-unknown-netbsd90.tar.xz) = 21615996 bytes
+BLAKE2s (rust-std-1.72.1-riscv64gc-unknown-netbsd.tar.xz) = aa49ab95fe56a94612bb3d70147846ff644f3a0980040dc5b77a4afcbfca96d0
+SHA512 (rust-std-1.72.1-riscv64gc-unknown-netbsd.tar.xz) = ee71979c48dc20f858d5ed93b3fdaf033565763fd9085d001a9ed57504d52de55f9c10a9ff75013dc25a6f671d3c9b70ff5b9dfe6e9d58db32a64b9c65f7978c
+Size (rust-std-1.72.1-riscv64gc-unknown-netbsd.tar.xz) = 21928348 bytes
+BLAKE2s (rust-std-1.72.1-sparc64-unknown-netbsd.tar.xz) = c16c747e8af3c0aa416776fd1c13382211aa87c4d4dfdb9a405e84dc598cde35
+SHA512 (rust-std-1.72.1-sparc64-unknown-netbsd.tar.xz) = 2223b73667fe9a4d116efea4e384c2b18dc044c0fc43130f70683cb53148228cbdeb565365d05f6b1b607acbb75d0cbd9c01f4acd4050bf58b7e9271f0ad030d
+Size (rust-std-1.72.1-sparc64-unknown-netbsd.tar.xz) = 21571728 bytes
+BLAKE2s (rust-std-1.72.1-x86_64-unknown-netbsd.tar.xz) = 6ad1f651f97ff82a68c5aefbd34b2ed9c424c407887f266213ab0bdd85409113
+SHA512 (rust-std-1.72.1-x86_64-unknown-netbsd.tar.xz) = 4bd3487085c29ef5ba46ecd7c1b12a9f3ce24e5e1234acf0b9f829790ffc5ed1b065aa787c66e1730ef2d74fcd2e333973b2af22ddac8fc6b52b8f2178724d99
+Size (rust-std-1.72.1-x86_64-unknown-netbsd.tar.xz) = 25225220 bytes
BLAKE2s (rustc-1.73.0-src.tar.gz) = 2d3fb1ef162c82d6d5afa1868792108dc68ef42a6d640fb7674c350b17057aaf
SHA512 (rustc-1.73.0-src.tar.gz) = 4e5de9455f3c17b9a01847ec2280b6354c66f7eae00513433b3f7c84c908942999167b51d683967019c8e68fe30b5add5c29f7a4c3a3a1fa0c3e290c7fe09816
Size (rustc-1.73.0-src.tar.gz) = 280735223 bytes
@@ -118,7 +118,7 @@ SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = bc73a140d7b1d3ced
SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 1ab343595e65ff6348f83cffc30e53d764485ff8
SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 56621c10310914672a851cf5dfbf343a9ff4e1be
SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
-SHA1 (patch-library_std_src_sys_unix_thread.rs) = 36a3085500ecbb34f8ecc08388c164da54bdf5d4
+SHA1 (patch-library_std_src_sys_unix_thread.rs) = 3f79b21fa033782122e09ffc44de55a0e5ecaecb
SHA1 (patch-library_std_src_sys_unix_thread__parking_netbsd.rs) = c29eb1cf074766d34bd2b8c348ce29c6ae2ba163
SHA1 (patch-src_bootstrap_bootstrap.py) = 00e11eb1f8e8534440bf3760837be6058e800c83
SHA1 (patch-src_bootstrap_builder.rs) = a30ad08861034944ed3d7b37df6289f4356f7f19
diff --git a/rust/do-cross.mk b/rust/do-cross.mk
index 6b59749ac6..930882972b 100644
--- a/rust/do-cross.mk
+++ b/rust/do-cross.mk
@@ -15,7 +15,7 @@ SHORT_TARGETS+= i386
SHORT_TARGETS+= riscv64
# can't find -latomic(!) late in the build:
-#SHORT_TARGETS+= mipsel # produces mips32 (not mips1) executables
+SHORT_TARGETS+= mipsel # produces mips32 (not mips1) executables
# Conditional local overrides of ROOT.* variables:
.sinclude "local-roots.mk"
diff --git a/rust/patches/patch-library_std_src_sys_unix_thread.rs b/rust/patches/patch-library_std_src_sys_unix_thread.rs
index de78fb7ebb..f01348ffb6 100644
--- a/rust/patches/patch-library_std_src_sys_unix_thread.rs
+++ b/rust/patches/patch-library_std_src_sys_unix_thread.rs
@@ -2,9 +2,50 @@ $NetBSD$
Fix stack-clash on SunOS.
+Undo new(ish) code (from 1.72.0) which attempts to count threads/CPUs
+on NetBSD; somehow it is causing crashes in bootstrap() on certain
+CPU architectures (i386, powerpc, armv7, but not riscv64, aarch64
+or amd64); _cpuset_isset() crashes with SEGV. And according to
+what I hear, the code is bogus; by default threads do not have
+affinity to any specific set of CPUs in NetBSD, and trying to
+replicate this with a simple C program always results in 0.
+So rip the newish code out with prejudice, and instead fallback to
+the sysctl() method of getting "number of CPUs" which was used
+before (and is still present, following the ripped-out code).
+
--- library/std/src/sys/unix/thread.rs.orig 2020-10-07 07:53:22.000000000 +0000
+++ library/std/src/sys/unix/thread.rs
-@@ -752,7 +752,7 @@ pub mod guard {
+@@ -352,29 +352,6 @@ pub fn available_parallelism() -> io::Re
+ }
+ }
+
+- #[cfg(target_os = "netbsd")]
+- {
+- unsafe {
+- let set = libc::_cpuset_create();
+- if !set.is_null() {
+- let mut count: usize = 0;
+- if libc::pthread_getaffinity_np(libc::pthread_self(), libc::_cpuset_size(set), set) == 0 {
+- for i in 0..u64::MAX {
+- match libc::_cpuset_isset(i, set) {
+- -1 => break,
+- 0 => continue,
+- _ => count = count + 1,
+- }
+- }
+- }
+- libc::_cpuset_destroy(set);
+- if let Some(count) = NonZeroUsize::new(count) {
+- return Ok(count);
+- }
+- }
+- }
+- }
+-
+ let mut cpus: libc::c_uint = 0;
+ let mut cpus_size = crate::mem::size_of_val(&cpus);
+
+@@ -812,7 +789,7 @@ pub mod guard {
let page_size = os::page_size();
PAGE_SIZE.store(page_size, Ordering::Relaxed);
diff --git a/rust/platform.mk b/rust/platform.mk
index 27a5823852..cc75fd55ab 100644
--- a/rust/platform.mk
+++ b/rust/platform.mk
@@ -8,7 +8,7 @@
.if !defined(PLATFORM_SUPPORTS_RUST)
# Rust needs NetBSD>7
-.for rust_arch in aarch64 earmv7hf i386 powerpc sparc64 x86_64
+.for rust_arch in aarch64 earmv7hf i386 powerpc riscv64 sparc64 x86_64
. for rust_os in Darwin FreeBSD Linux NetBSD SunOS
. if ${OPSYS} != "NetBSD" || empty(OS_VERSION:M[0-7].*)
RUST_PLATFORMS+= ${rust_os}-*-${rust_arch}
Home |
Main Index |
Thread Index |
Old Index