Attachment #255526 for bug #283000

Lines 97-103 WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} Link Here

(-)b/Mk/Uses/cargo.mk (-1 / +1 lines)
97		97
98	CARGO_BUILDDEP?= yes	98	CARGO_BUILDDEP?= yes
99	. if ${CARGO_BUILDDEP:tl} == "yes"	99	. if ${CARGO_BUILDDEP:tl} == "yes"
100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.82.0:lang/${RUST_DEFAULT}	100	BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT}
101	. elif ${CARGO_BUILDDEP:tl} == "any-version"	101	. elif ${CARGO_BUILDDEP:tl} == "any-version"
102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}	102	BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT}
103	. endif	103	. endif

Lines 77-83 ELF_FEATURES+= +wxneeded:dist/bin/${MOZILLA} +wxneeded:dist/bin/${MOZILLA}-bin Link Here

(-)b/Mk/bsd.gecko.mk (-1 / +1 lines)
77	BUNDLE_LIBS= yes	77	BUNDLE_LIBS= yes
78		78
79	BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \	79	BUILD_DEPENDS+= rust-cbindgen>=0.26.0:devel/rust-cbindgen \
80	${RUST_DEFAULT}>=1.82.0:lang/${RUST_DEFAULT} \	80	${RUST_DEFAULT}>=1.83.0:lang/${RUST_DEFAULT} \
81	node:www/node	81	node:www/node
82	LIB_DEPENDS+= libdrm.so:graphics/libdrm	82	LIB_DEPENDS+= libdrm.so:graphics/libdrm
83	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci	83	RUN_DEPENDS+= ${LOCALBASE}/lib/libpci.so:devel/libpci

Lines 1-3 Link Here

(-)b/lang/rust-bootstrap/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1729451664	1	TIMESTAMP = 1732649274
2	SHA256 (rust/rustc-1.82.0-src.tar.xz) = 1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210	2	SHA256 (rust/rustc-1.83.0-src.tar.xz) = 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
3	SIZE (rust/rustc-1.82.0-src.tar.xz) = 219769328	3	SIZE (rust/rustc-1.83.0-src.tar.xz) = 353808388

Lines 1-6 Link Here

(-)b/lang/rust/Makefile (-4 / +4 lines)
1	PORTNAME= rust	1	PORTNAME= rust
2	PORTVERSION?= 1.82.0	2	PORTVERSION?= 1.83.0
3	PORTREVISION?= 1	3	PORTREVISION?= 0
4	CATEGORIES= lang	4	CATEGORIES= lang
5	MASTER_SITES= https://static.rust-lang.org/dist/:src \	5	MASTER_SITES= https://static.rust-lang.org/dist/:src \
6	https://dev-static.rust-lang.org/dist/:src \	6	https://dev-static.rust-lang.org/dist/:src \
Lines 72-79 WASM_VARS= _COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown Link Here
72	_RUST_TARGETS+=wasm32-unknown-unknown	72	_RUST_TARGETS+=wasm32-unknown-unknown
73		73
74	# See WRKSRC/src/stage0 for the date and version values	74	# See WRKSRC/src/stage0 for the date and version values
75	BOOTSTRAPS_DATE?= 2024-09-05	75	BOOTSTRAPS_DATE?= 2024-10-17
76	RUST_BOOTSTRAP_VERSION?= 1.81.0	76	RUST_BOOTSTRAP_VERSION?= 1.82.0
77		77
78	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor	78	CARGO_VENDOR_DIR?= ${WRKSRC}/vendor
79		79




TIMESTAMP = 1732649272
SHA256 (rust/rustc-1.83.0-src.tar.xz) = 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
SIZE (rust/rustc-1.83.0-src.tar.xz) = 353808388
SHA256 (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2a758f72d6bbb983193dea7d24e6e5fc3811b63f472c6c58f32197af940aa795
SIZE (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 62711948
SHA256 (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2ec9beef0b6e222f10c69e40229b00785e484726f15f190872bba92ad05b9356
SIZE (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 26423576
SHA256 (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 1493b5ff965b59876dba00a192daf89f74f4ee6686cd89ea878ac86e89a8dded
SIZE (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 9217928
SHA256 (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 9bc7885aa7434d9e9fe5e400bd14aba6b7bad47a957fbd12651c2038e8fd64f5
SIZE (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 51037096
SHA256 (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 3927d64465cb5bedce595e3ebe728df2cafc719c5ffd68354180f0024b331a6f
SIZE (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 28148888
SHA256 (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = d6e96db4a4e78d58cfc9410cc3107e528c839fa2937f18aae8f217e5097a1c15
SIZE (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = 10406292
SHA256 (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = c13982b87ae60cbe4fe6ddfa96cded7293c0d59011816e6f89cdfa4531964eea
SIZE (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = 62941904
SHA256 (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = cadc589d89ca68fb81ad2913e60e89348a75bd228725f82faba2d4c961a2aca7
SIZE (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = 25949604
SHA256 (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = efbd26868fef7fbca7da59591fdbacefa0f3ad5e263b9487d4fe07c93e0da588
SIZE (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = 9313164
SHA256 (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 0016215d5b3c034cbd8f332336d284690be30f7c088e926fdd2281182f165313
SIZE (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 71103120
SHA256 (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = bdf02f49d85c3e7a103bb43bf2982341d765b2afeff2994f5086f2963cbe0bcc
SIZE (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = 27840180
SHA256 (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = e5b10d5a18b8f2512fd4aa53a7c30b6b9b61f2572cf59a401d075d3ba588f426
SIZE (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = 10843032
SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = b4f5b4599a4e9bbc3f90445bd0aae1aecf0d147947ea512e0f00dfa76a9e3cf2
SIZE (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = 67416020
SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 7e7c8623ca7c3105d82478d4ae766ddf489a7e8fbaa01d40f32500d4de06a65d
SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 25162056
SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = b6a66517fcf3a08ced4fd887dfa5318ccfa23e897c63666f16149755ec05ba63
SIZE (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = 9984192
SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = e050efa9b992d891bf4669c5ecf3531eba6c9a630ed0cbd4c94e00c8cc66317e
SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 65447208
SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9790d33816e253ba2a640c47fbf52b61f0c6841c04fe004561ac0fa82b74de90
SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 25120776
SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = b8bcfb00232aa49b380c2a6b2b4ad00ef0603d7e545b115046add963e20e3aa9
SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9636840
SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 04d7fd15fe90fa5272802e5a3afe6baf4868a0018ecb6e1ecca8c2b009df5cd6
SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 67188864
SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = bb76f789c552ffdaab681fa90084e658c0027bbc99f5e8d07c3c0b99efe2181b
SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 25235320
SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 1e5f30101156510ac03833bf3362d41fc1b4603f6509dea3c71a8cc0fbb7d76b
SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 9908700
SHA256 (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = cb73b8677f807afee63481aaeb51136b5a7db4e9d194a646ba3c9e0c8c4d54cc
SIZE (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 71586632
SHA256 (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = ff00c41174c771450ab4b962f7f41f2be18944d3c834fab4316181bec955d784
SIZE (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 25011372
SHA256 (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 2f99b7d5f40d1f0f28f474b5e28298652a5e71d9a1bfcfa30ba1283b790f4d7d
SIZE (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 11545916





https://reviews.llvm.org/D77776

--- vendor/cc-1.0.79/src/lib.rs.orig	2021-03-04 20:58:54 UTC
+++ vendor/cc-1.0.79/src/lib.rs
@@ -2659,24 +2659,7 @@ impl Tool {
     }
 
     fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
-        // Try to detect family of the tool from its name, falling back to Gnu.
-        let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) {
-            if fname.contains("clang-cl") {
-                ToolFamily::Msvc { clang_cl: true }
-            } else if fname.ends_with("cl") || fname == "cl.exe" {
-                ToolFamily::Msvc { clang_cl: false }
-            } else if fname.contains("clang") {
-                match clang_driver {
-                    Some("cl") => ToolFamily::Msvc { clang_cl: true },
-                    _ => ToolFamily::Clang,
-                }
-            } else {
-                ToolFamily::Gnu
-            }
-        } else {
-            ToolFamily::Gnu
-        };
-
+        let family = ToolFamily::Gnu;
         Tool {
             path: path,
             cc_wrapper_path: None,

--- vendor/cc-1.0.97/src/tool.rs.orig	2024-05-09 18:20:47 UTC
+++ vendor/cc-1.0.97/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
 
             match (clang, accepts_cl_style_flags, gcc) {
                 (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
-                (true, false, _) => Ok(ToolFamily::Clang {
-                    zig_cc: is_zig_cc(path, cargo_output),
-                }),
+                (true, false, _) => Ok(ToolFamily::Gnu),
                 (false, false, true) => Ok(ToolFamily::Gnu),
                 (false, false, false) => {
                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
--- vendor/cc-1.0.99/src/tool.rs.orig	2024-05-09 18:20:47 UTC
+++ vendor/cc-1.0.99/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {

-                (true, false, _) => Ok(ToolFamily::Clang {
-                    zig_cc: is_zig_cc(path, cargo_output),
-                }),
+                (true, false, _) => Ok(ToolFamily::Gnu),
                 (false, false, true) => Ok(ToolFamily::Gnu),
                 (false, false, false) => {
                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
--- vendor/cc-1.0.105/src/tool.rs.orig	2024-05-09 18:20:47 UTC
+++ vendor/cc-1.0.105/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
 
             match (clang, accepts_cl_style_flags, gcc) {
                 (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
-                (true, false, _) => Ok(ToolFamily::Clang {
-                    zig_cc: is_zig_cc(path, cargo_output),
-                }),
+                (true, false, _) => Ok(ToolFamily::Gnu),
                 (false, false, true) => Ok(ToolFamily::Gnu),
                 (false, false, false) => {
                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
--- vendor/cc-1.1.5/src/tool.rs.orig	2024-05-09 18:20:47 UTC
+++ vendor/cc-1.1.5/src/tool.rs
@@ -151,9 +151,7 @@ impl Tool {
 
             match (clang, accepts_cl_style_flags, gcc) {
                 (clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
-                (true, false, _) => Ok(ToolFamily::Clang {
-                    zig_cc: is_zig_cc(path, cargo_output),
-                }),
+                (true, false, _) => Ok(ToolFamily::Gnu),
                 (false, false, true) => Ok(ToolFamily::Gnu),
                 (false, false, false) => {
                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");

--- vendor/cc-1.1.22/src/tool.rs.orig	2024-11-27 08:36:40.862061000 +0100
+++ vendor/cc-1.1.22/src/tool.rs	2024-11-27 08:38:23.622042000 +0100
@@ -174,9 +174,7 @@ impl Tool {
 
             match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                 (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
-                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
-                    zig_cc: is_zig_cc(path, cargo_output),
-                }),
+                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                 (false, false, false, false, false) => {
                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");

--- vendor/cc-1.1.23/src/tool.rs.orig	2024-11-27 08:36:40.862061000 +0100
+++ vendor/cc-1.1.23/src/tool.rs	2024-11-27 08:38:23.622042000 +0100
@@ -174,9 +174,7 @@ impl Tool {
 
             match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
                 (clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
-                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Clang {
-                    zig_cc: is_zig_cc(path, cargo_output),
-                }),
+                (true, _, _, _, false) | (_, _, _, true, false) => Ok(ToolFamily::Gnu),
                 (false, false, true, _, false) | (_, _, _, _, true) => Ok(ToolFamily::Gnu),
                 (false, false, false, false, false) => {
                     cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");





diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
index de34069eabdf2..68a8364194607 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
@@ -4,7 +4,7 @@
 pub type nlink_t = u16;
 // Type of `dev_t` changed from `u32` to `u64` in FreeBSD 12:

 s! {
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
index 10fcaa03a4ef6..197400ffb4e28 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
@@ -2,7 +2,7 @@
 
 pub type nlink_t = u64;

 s! {
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
index ec6bce2a03091..d3a77d03c48d0 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
@@ -2,7 +2,7 @@
 
 pub type nlink_t = u64;

 pub type kssize_t = i64;
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
index 160a4baae481b..9d65317d29cb4 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
@@ -2,7 +2,7 @@
 
 pub type nlink_t = u64;

 pub type kssize_t = i64;
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
index d73215a68ec33..f76208400f324 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
@@ -2,7 +2,7 @@
 
 pub type nlink_t = u64;

rename from src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs

--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs.orig	2024-10-24 17:21:07.154172000 +0200
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs	2024-10-24 17:21:02.029962000 +0200
@@ -0,0 +1,34 @@
+#[repr(C)]
+#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]



index 80c6fa1684530..5c1156581fd61 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
@@ -3,12 +3,10 @@
 pub struct stat {
     pub st_dev: ::dev_t,

 impl ::Copy for ::stat {}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
index 68a8364194607..e416ebf745841 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
@@ -479,10 +479,11 @@ extern "C" {
 }
 

 }
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
index 197400ffb4e28..c4431a6458e8f 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
@@ -218,6 +218,40 @@ s! {
         /// kthread flag.
         pub ki_tdflags: ::c_long,

diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
deleted file mode 100644
index 80c6fa1684530..0000000000000
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[repr(C)]

-}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
index d3a77d03c48d0..118404e8b089b 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
@@ -228,6 +228,40 @@ s! {
         /// kthread flag.
         pub ki_tdflags: ::c_long,

diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
deleted file mode 100644
index 80c6fa1684530..0000000000000
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[repr(C)]

-}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
index 9d65317d29cb4..e624dd7201b0a 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
@@ -228,6 +228,40 @@ s! {
         /// kthread flag.
         pub ki_tdflags: ::c_long,

diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
deleted file mode 100644
index 80c6fa1684530..0000000000000
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-#[repr(C)]

-}
diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
index f76208400f324..a299af7d5d53e 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
@@ -228,6 +228,40 @@ s! {
         /// kthread flag.
         pub ki_tdflags: ::c_long,

         mod x86_64;
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs
index c3c576ed66681..31a660e7d0a22 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
@@ -42,31 +42,6 @@ s_no_extra_traits! {
 }
 


diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs
index 300b3dd45ca9d..8ff500c65981c 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
@@ -6,36 +6,6 @@ pub type time_t = i64;
 pub type suseconds_t = i32;
 pub type register_t = i32;

     if #[cfg(libc_const_size_of)] {
diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
index a0120c337e0ad..f84062ba34b93 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
@@ -6,32 +6,6 @@ pub type time_t = i64;
 pub type suseconds_t = i32;
 pub type register_t = i32;

     if #[cfg(libc_const_size_of)] {
diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
index 7f5b9752264e3..69cf4c5fc88c7 100644
--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
@@ -6,32 +6,6 @@ pub type time_t = i64;
 pub type suseconds_t = i64;
 pub type register_t = i64;
- 

Return to bug 283000

Lines 2-8 Link Here

(-)b/lang/rust-bootstrap/Makefile (-1 / +2 lines)
2	# to upload them to ~/public_distfiles on freefall in preparation	2	# to upload them to ~/public_distfiles on freefall in preparation
3	# for the next lang/rust update.	3	# for the next lang/rust update.
4	PORTNAME= rust	4	PORTNAME= rust
5	PORTVERSION= 1.82.0	5	PORTVERSION= 1.83.0
6	CATEGORIES= lang	6	CATEGORIES= lang
7	MASTER_SITES= https://static.rust-lang.org/dist/	7	MASTER_SITES= https://static.rust-lang.org/dist/
8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-	8	PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-
Lines 98-103 do-configure: Link Here
98	@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml	98	@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
99	@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml	99	@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
100	@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml	100	@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml
		101	@${ECHO_CMD} 'download-ci-llvm=false' >> ${WRKSRC}/config.toml
101	@${ECHO_CMD} 'link-shared=false' >> ${WRKSRC}/config.toml	102	@${ECHO_CMD} 'link-shared=false' >> ${WRKSRC}/config.toml
102	.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)	103	.if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
103	@${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml	104	@${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml

Lines 1-51 Link Here

(-)b/lang/rust/distinfo (-45 / +45 lines)
1	TIMESTAMP = 1731596358	1	TIMESTAMP = 1732649272
2	SHA256 (rust/rustc-1.82.0-src.tar.xz) = 1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210	2	SHA256 (rust/rustc-1.83.0-src.tar.xz) = 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
3	SIZE (rust/rustc-1.82.0-src.tar.xz) = 219769328	3	SIZE (rust/rustc-1.83.0-src.tar.xz) = 353808388
4	SHA256 (rust/2024-09-05/rustc-1.81.0-aarch64-unknown-freebsd.tar.xz) = 721beae8927fc82313d397ce8de7f11a298d3f966344943dae98605a4042758c	4	SHA256 (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2a758f72d6bbb983193dea7d24e6e5fc3811b63f472c6c58f32197af940aa795
5	SIZE (rust/2024-09-05/rustc-1.81.0-aarch64-unknown-freebsd.tar.xz) = 61258492	5	SIZE (rust/2024-10-17/rustc-1.82.0-aarch64-unknown-freebsd.tar.xz) = 62711948
6	SHA256 (rust/2024-09-05/rust-std-1.81.0-aarch64-unknown-freebsd.tar.xz) = 4d3a685ea57f94ab78d35da7bc8290a7a21eac70a6b23240d058ce9e5934af50	6	SHA256 (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 2ec9beef0b6e222f10c69e40229b00785e484726f15f190872bba92ad05b9356
7	SIZE (rust/2024-09-05/rust-std-1.81.0-aarch64-unknown-freebsd.tar.xz) = 26107012	7	SIZE (rust/2024-10-17/rust-std-1.82.0-aarch64-unknown-freebsd.tar.xz) = 26423576
8	SHA256 (rust/2024-09-05/cargo-1.81.0-aarch64-unknown-freebsd.tar.xz) = a213e3470c9d4c4b867657be419c47db6f34047837b0fbcc4e18fa7add181dbf	8	SHA256 (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 1493b5ff965b59876dba00a192daf89f74f4ee6686cd89ea878ac86e89a8dded
9	SIZE (rust/2024-09-05/cargo-1.81.0-aarch64-unknown-freebsd.tar.xz) = 9206832	9	SIZE (rust/2024-10-17/cargo-1.82.0-aarch64-unknown-freebsd.tar.xz) = 9217928
10	SHA256 (rust/2024-09-05/rustc-1.81.0-x86_64-unknown-freebsd.tar.xz) = a1875f80c608dc5e7cf431d782512b36753c7b8a8a7e68b2828542a1b15f4797	10	SHA256 (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 9bc7885aa7434d9e9fe5e400bd14aba6b7bad47a957fbd12651c2038e8fd64f5
11	SIZE (rust/2024-09-05/rustc-1.81.0-x86_64-unknown-freebsd.tar.xz) = 50002544	11	SIZE (rust/2024-10-17/rustc-1.82.0-x86_64-unknown-freebsd.tar.xz) = 51037096
12	SHA256 (rust/2024-09-05/rust-std-1.81.0-x86_64-unknown-freebsd.tar.xz) = dd34a1f363e4f36e8814520cd19cb41b8dea4991bf58effa28b68bed5309aa6f	12	SHA256 (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 3927d64465cb5bedce595e3ebe728df2cafc719c5ffd68354180f0024b331a6f
13	SIZE (rust/2024-09-05/rust-std-1.81.0-x86_64-unknown-freebsd.tar.xz) = 26944964	13	SIZE (rust/2024-10-17/rust-std-1.82.0-x86_64-unknown-freebsd.tar.xz) = 28148888
14	SHA256 (rust/2024-09-05/cargo-1.81.0-x86_64-unknown-freebsd.tar.xz) = 0e2578c6d00860bcfcb7f7f55a85a162d98538c8c4ad856cfa0fe8cacf64a564	14	SHA256 (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = d6e96db4a4e78d58cfc9410cc3107e528c839fa2937f18aae8f217e5097a1c15
15	SIZE (rust/2024-09-05/cargo-1.81.0-x86_64-unknown-freebsd.tar.xz) = 10321608	15	SIZE (rust/2024-10-17/cargo-1.82.0-x86_64-unknown-freebsd.tar.xz) = 10406292
16	SHA256 (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = c13982b87ae60cbe4fe6ddfa96cded7293c0d59011816e6f89cdfa4531964eea	16	SHA256 (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = c13982b87ae60cbe4fe6ddfa96cded7293c0d59011816e6f89cdfa4531964eea
17	SIZE (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = 62941904	17	SIZE (rust/2024-09-05/rustc-1.81.0-armv7-unknown-freebsd.tar.xz) = 62941904
18	SHA256 (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = cadc589d89ca68fb81ad2913e60e89348a75bd228725f82faba2d4c961a2aca7	18	SHA256 (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = cadc589d89ca68fb81ad2913e60e89348a75bd228725f82faba2d4c961a2aca7
19	SIZE (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = 25949604	19	SIZE (rust/2024-09-05/rust-std-1.81.0-armv7-unknown-freebsd.tar.xz) = 25949604
20	SHA256 (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = efbd26868fef7fbca7da59591fdbacefa0f3ad5e263b9487d4fe07c93e0da588	20	SHA256 (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = efbd26868fef7fbca7da59591fdbacefa0f3ad5e263b9487d4fe07c93e0da588
21	SIZE (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = 9313164	21	SIZE (rust/2024-09-05/cargo-1.81.0-armv7-unknown-freebsd.tar.xz) = 9313164
22	SHA256 (rust/2024-09-05/rustc-1.81.0-i686-unknown-freebsd.tar.xz) = 5562e52a5d3bc7e6072838c0aa8e7e518fe2db74c0e3792204e1dc5306559b20	22	SHA256 (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 0016215d5b3c034cbd8f332336d284690be30f7c088e926fdd2281182f165313
23	SIZE (rust/2024-09-05/rustc-1.81.0-i686-unknown-freebsd.tar.xz) = 68846504	23	SIZE (rust/2024-10-17/rustc-1.82.0-i686-unknown-freebsd.tar.xz) = 71103120
24	SHA256 (rust/2024-09-05/rust-std-1.81.0-i686-unknown-freebsd.tar.xz) = 7f0422aa60f4df0fabc4a07708319b09f496833cc6c4111544710a683b0571b2	24	SHA256 (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = bdf02f49d85c3e7a103bb43bf2982341d765b2afeff2994f5086f2963cbe0bcc
25	SIZE (rust/2024-09-05/rust-std-1.81.0-i686-unknown-freebsd.tar.xz) = 26734268	25	SIZE (rust/2024-10-17/rust-std-1.82.0-i686-unknown-freebsd.tar.xz) = 27840180
26	SHA256 (rust/2024-09-05/cargo-1.81.0-i686-unknown-freebsd.tar.xz) = 762a7d113f8c77ae8c50f07da840ccb917cb836b6fbd2427b09967e82189d50a	26	SHA256 (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = e5b10d5a18b8f2512fd4aa53a7c30b6b9b61f2572cf59a401d075d3ba588f426
27	SIZE (rust/2024-09-05/cargo-1.81.0-i686-unknown-freebsd.tar.xz) = 10756764	27	SIZE (rust/2024-10-17/cargo-1.82.0-i686-unknown-freebsd.tar.xz) = 10843032
28	SHA256 (rust/2024-09-05/rustc-1.81.0-powerpc-unknown-freebsd.tar.xz) = 801950501c837591740febb71f4ef70b461a665e6e899badd1dee7010b2b1757	28	SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = b4f5b4599a4e9bbc3f90445bd0aae1aecf0d147947ea512e0f00dfa76a9e3cf2
29	SIZE (rust/2024-09-05/rustc-1.81.0-powerpc-unknown-freebsd.tar.xz) = 65322316	29	SIZE (rust/2024-10-17/rustc-1.82.0-powerpc-unknown-freebsd.tar.xz) = 67416020
30	SHA256 (rust/2024-09-05/rust-std-1.81.0-powerpc-unknown-freebsd.tar.xz) = 3704d7d1c404698920373db1131a81eb3d5ec0c6b3dd4620c896144dddf3fe53	30	SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 7e7c8623ca7c3105d82478d4ae766ddf489a7e8fbaa01d40f32500d4de06a65d
31	SIZE (rust/2024-09-05/rust-std-1.81.0-powerpc-unknown-freebsd.tar.xz) = 24778908	31	SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc-unknown-freebsd.tar.xz) = 25162056
32	SHA256 (rust/2024-09-05/cargo-1.81.0-powerpc-unknown-freebsd.tar.xz) = 23f8b7c3195ba7626ac5c897707e36d5a5e701de79c950b3e58bd647e786faba	32	SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = b6a66517fcf3a08ced4fd887dfa5318ccfa23e897c63666f16149755ec05ba63
33	SIZE (rust/2024-09-05/cargo-1.81.0-powerpc-unknown-freebsd.tar.xz) = 9923104	33	SIZE (rust/2024-10-17/cargo-1.82.0-powerpc-unknown-freebsd.tar.xz) = 9984192
34	SHA256 (rust/2024-09-05/rustc-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 478d738a735eb0d1d6dddaee977c4ce0dc5168fcbd9dcadf67a6fc571cc8986a	34	SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = e050efa9b992d891bf4669c5ecf3531eba6c9a630ed0cbd4c94e00c8cc66317e
35	SIZE (rust/2024-09-05/rustc-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 63419468	35	SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 65447208
36	SHA256 (rust/2024-09-05/rust-std-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 451227b91ed09e7813ffba77b4e17f9b919b11ad373b0bc87a84eec64b7b9a01	36	SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9790d33816e253ba2a640c47fbf52b61f0c6841c04fe004561ac0fa82b74de90
37	SIZE (rust/2024-09-05/rust-std-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 24849284	37	SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 25120776
38	SHA256 (rust/2024-09-05/cargo-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 92dae5616bb090c9ae99d0006fe7612d64773d145f574a091b90cc764287f4ac	38	SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = b8bcfb00232aa49b380c2a6b2b4ad00ef0603d7e545b115046add963e20e3aa9
39	SIZE (rust/2024-09-05/cargo-1.81.0-powerpc64-unknown-freebsd.tar.xz) = 9533220	39	SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64-unknown-freebsd.tar.xz) = 9636840
40	SHA256 (rust/2024-09-05/rustc-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 5be810fe0ee72c734c8e00941f1c01a43506ef6063a3aa51e1e6dbb2fefb520b	40	SHA256 (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 04d7fd15fe90fa5272802e5a3afe6baf4868a0018ecb6e1ecca8c2b009df5cd6
41	SIZE (rust/2024-09-05/rustc-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 65284584	41	SIZE (rust/2024-10-17/rustc-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 67188864
42	SHA256 (rust/2024-09-05/rust-std-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 247759fa4d96ec7c7ee88290700a4ef4c2799e8c8e66e7dafe81ca678d57e4f3	42	SHA256 (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = bb76f789c552ffdaab681fa90084e658c0027bbc99f5e8d07c3c0b99efe2181b
43	SIZE (rust/2024-09-05/rust-std-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 24899100	43	SIZE (rust/2024-10-17/rust-std-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 25235320
44	SHA256 (rust/2024-09-05/cargo-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 6e5141477f52caf26583e9d3263698ae427c89bec23b3af8b8e0d59f4e6b46ec	44	SHA256 (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 1e5f30101156510ac03833bf3362d41fc1b4603f6509dea3c71a8cc0fbb7d76b
45	SIZE (rust/2024-09-05/cargo-1.81.0-powerpc64le-unknown-freebsd.tar.xz) = 9825936	45	SIZE (rust/2024-10-17/cargo-1.82.0-powerpc64le-unknown-freebsd.tar.xz) = 9908700
46	SHA256 (rust/2024-09-05/rustc-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = eec81507223597baa72979407ac0594506aed0d3c42299eb0b8fcc49f27d2251	46	SHA256 (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = cb73b8677f807afee63481aaeb51136b5a7db4e9d194a646ba3c9e0c8c4d54cc
47	SIZE (rust/2024-09-05/rustc-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 72380112	47	SIZE (rust/2024-10-17/rustc-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 71586632
48	SHA256 (rust/2024-09-05/rust-std-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 160ebd04a8e49ab9b6b3cff4c0e913a433810557fd5ccdb8839ba4facfbdcc3a	48	SHA256 (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = ff00c41174c771450ab4b962f7f41f2be18944d3c834fab4316181bec955d784
49	SIZE (rust/2024-09-05/rust-std-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 24745684	49	SIZE (rust/2024-10-17/rust-std-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 25011372
50	SHA256 (rust/2024-09-05/cargo-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = a42a1fe5cf41c0baf74e69e0d6f9baf3e592570b232bd2c0f752a56f3622a446	50	SHA256 (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 2f99b7d5f40d1f0f28f474b5e28298652a5e71d9a1bfcfa30ba1283b790f4d7d
51	SIZE (rust/2024-09-05/cargo-1.81.0-riscv64gc-unknown-freebsd.tar.xz) = 11996032	51	SIZE (rust/2024-10-17/cargo-1.82.0-riscv64gc-unknown-freebsd.tar.xz) = 11545916

Lines 8-55 until LLVM can be updated to use libc++ by default. Link Here

(-)b/lang/rust/files/patch-vendor_cc.rs (-88 / +20 lines)
8		8
9	https://reviews.llvm.org/D77776	9	https://reviews.llvm.org/D77776
10		10
11	--- vendor/cc-1.0.79/src/lib.rs.orig 2021-03-04 20:58:54 UTC
12	+++ vendor/cc-1.0.79/src/lib.rs
13	@@ -2659,24 +2659,7 @@ impl Tool {
14	}
15
16	fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self {
17	- // Try to detect family of the tool from its name, falling back to Gnu.
18	- let family = if let Some(fname) = path.file_name().and_then(\|p\| p.to_str()) {
19	- if fname.contains("clang-cl") {
20	- ToolFamily::Msvc { clang_cl: true }
21	- } else if fname.ends_with("cl") \|\| fname == "cl.exe" {
22	- ToolFamily::Msvc { clang_cl: false }
23	- } else if fname.contains("clang") {
24	- match clang_driver {
25	- Some("cl") => ToolFamily::Msvc { clang_cl: true },
26	- _ => ToolFamily::Clang,
27	- }
28	- } else {
29	- ToolFamily::Gnu
30	- }
31	- } else {
32	- ToolFamily::Gnu
33	- };
34	-
35	+ let family = ToolFamily::Gnu;
36	Tool {
37	path: path,
38	cc_wrapper_path: None,
39
40	--- vendor/cc-1.0.97/src/tool.rs.orig 2024-05-09 18:20:47 UTC
41	+++ vendor/cc-1.0.97/src/tool.rs
42	@@ -151,9 +151,7 @@ impl Tool {
43
44	match (clang, accepts_cl_style_flags, gcc) {
45	(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
46	- (true, false, _) => Ok(ToolFamily::Clang {
47	- zig_cc: is_zig_cc(path, cargo_output),
48	- }),
49	+ (true, false, _) => Ok(ToolFamily::Gnu),
50	(false, false, true) => Ok(ToolFamily::Gnu),
51	(false, false, false) => {
52	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
53	--- vendor/cc-1.0.99/src/tool.rs.orig 2024-05-09 18:20:47 UTC	11	--- vendor/cc-1.0.99/src/tool.rs.orig 2024-05-09 18:20:47 UTC
54	+++ vendor/cc-1.0.99/src/tool.rs	12	+++ vendor/cc-1.0.99/src/tool.rs
55	@@ -151,9 +151,7 @@ impl Tool {	13	@@ -151,9 +151,7 @@ impl Tool {
Lines 59-119 https://reviews.llvm.org/D77776 Link Here
59	- (true, false, _) => Ok(ToolFamily::Clang {	17	- (true, false, _) => Ok(ToolFamily::Clang {
60	- zig_cc: is_zig_cc(path, cargo_output),	18	- zig_cc: is_zig_cc(path, cargo_output),
61	- }),	19	- }),
62	+ (true, false, _) => Ok(ToolFamily::Gnu),
63	(false, false, true) => Ok(ToolFamily::Gnu),
64	(false, false, false) => {
65	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
66	--- vendor/cc-1.0.105/src/tool.rs.orig 2024-05-09 18:20:47 UTC
67	+++ vendor/cc-1.0.105/src/tool.rs
68	@@ -151,9 +151,7 @@ impl Tool {
69
70	match (clang, accepts_cl_style_flags, gcc) {
71	(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
72	- (true, false, _) => Ok(ToolFamily::Clang {
73	- zig_cc: is_zig_cc(path, cargo_output),
74	- }),
75	+ (true, false, _) => Ok(ToolFamily::Gnu),
76	(false, false, true) => Ok(ToolFamily::Gnu),
77	(false, false, false) => {
78	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
79	--- vendor/cc-1.1.5/src/tool.rs.orig 2024-05-09 18:20:47 UTC
80	+++ vendor/cc-1.1.5/src/tool.rs
81	@@ -151,9 +151,7 @@ impl Tool {
82
83	match (clang, accepts_cl_style_flags, gcc) {
84	(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),
85	- (true, false, _) => Ok(ToolFamily::Clang {
86	- zig_cc: is_zig_cc(path, cargo_output),
87	- }),
88	+ (true, false, _) => Ok(ToolFamily::Gnu),	20	+ (true, false, _) => Ok(ToolFamily::Gnu),
89	(false, false, true) => Ok(ToolFamily::Gnu),	21	(false, false, true) => Ok(ToolFamily::Gnu),
90	(false, false, false) => {	22	(false, false, false) => {
91	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");	23	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");
92		24
93	--- vendor/cc-1.1.6/src/tool.rs.orig 2024-05-09 18:20:47 UTC	25	--- vendor/cc-1.1.22/src/tool.rs.orig 2024-11-27 08:36:40.862061000 +0100
94	+++ vendor/cc-1.1.6/src/tool.rs	26	+++ vendor/cc-1.1.22/src/tool.rs 2024-11-27 08:38:23.622042000 +0100
95	@@ -151,9 +151,7 @@ impl Tool {	27	@@ -174,9 +174,7 @@ impl Tool {
96		28
97	match (clang, accepts_cl_style_flags, gcc) {	29	match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
98	(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),	30	(clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
99	- (true, false, _) => Ok(ToolFamily::Clang {	31	- (true, _, _, _, false) \| (_, _, _, true, false) => Ok(ToolFamily::Clang {
100	- zig_cc: is_zig_cc(path, cargo_output),	32	- zig_cc: is_zig_cc(path, cargo_output),
101	- }),	33	- }),
102	+ (true, false, _) => Ok(ToolFamily::Gnu),	34	+ (true, _, _, _, false) \| (_, _, _, true, false) => Ok(ToolFamily::Gnu),
103	(false, false, true) => Ok(ToolFamily::Gnu),	35	(false, false, true, _, false) \| (_, _, _, _, true) => Ok(ToolFamily::Gnu),
104	(false, false, false) => {	36	(false, false, false, false, false) => {
105	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");	37	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");
106		38
107	--- vendor/cc-1.1.10/src/tool.rs.orig 2024-05-09 18:20:47 UTC	39	--- vendor/cc-1.1.23/src/tool.rs.orig 2024-11-27 08:36:40.862061000 +0100
108	+++ vendor/cc-1.1.10/src/tool.rs	40	+++ vendor/cc-1.1.23/src/tool.rs 2024-11-27 08:38:23.622042000 +0100
109	@@ -151,9 +151,7 @@ impl Tool {	41	@@ -174,9 +174,7 @@ impl Tool {
110		42
111	match (clang, accepts_cl_style_flags, gcc) {	43	match (clang, accepts_cl_style_flags, gcc, emscripten, vxworks) {
112	(clang_cl, true, _) => Ok(ToolFamily::Msvc { clang_cl }),	44	(clang_cl, true, _, false, false) => Ok(ToolFamily::Msvc { clang_cl }),
113	- (true, false, _) => Ok(ToolFamily::Clang {	45	- (true, _, _, _, false) \| (_, _, _, true, false) => Ok(ToolFamily::Clang {
114	- zig_cc: is_zig_cc(path, cargo_output),	46	- zig_cc: is_zig_cc(path, cargo_output),
115	- }),	47	- }),
116	+ (true, false, _) => Ok(ToolFamily::Gnu),	48	+ (true, _, _, _, false) \| (_, _, _, true, false) => Ok(ToolFamily::Gnu),
117	(false, false, true) => Ok(ToolFamily::Gnu),	49	(false, false, true, _, false) \| (_, _, _, _, true) => Ok(ToolFamily::Gnu),
118	(false, false, false) => {	50	(false, false, false, false, false) => {
119	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__` or `_MSC_VER`, fallback to treating it as GNU");	51	cargo_output.print_warning(&"Compiler family detection failed since it does not define `__clang__`, `__GNUC__`, `__EMSCRIPTEN__` or `__VXWORKS__`, also does not accept cl style flag `-?`, fallback to treating it as GNU");

Lines 22-29 Issue https://github.com/rust-lang/rust/issues/130677 Link Here

(-)b/lang/rust/files/patch-vendor_libc-0.2.159 (-36 / +35 lines)
22		22
23	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	23	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
24	index de34069eabdf2..68a8364194607 100644	24	index de34069eabdf2..68a8364194607 100644
25	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	25	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
26	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	26	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
27	@@ -4,7 +4,7 @@	27	@@ -4,7 +4,7 @@
28	pub type nlink_t = u16;	28	pub type nlink_t = u16;
29	// Type of `dev_t` changed from `u32` to `u64` in FreeBSD 12:	29	// Type of `dev_t` changed from `u32` to `u64` in FreeBSD 12:
Lines 35-42 index de34069eabdf2..68a8364194607 100644 Link Here
35	s! {	35	s! {
36	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	36	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
37	index 10fcaa03a4ef6..197400ffb4e28 100644	37	index 10fcaa03a4ef6..197400ffb4e28 100644
38	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	38	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
39	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	39	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
40	@@ -2,7 +2,7 @@	40	@@ -2,7 +2,7 @@
41		41
42	pub type nlink_t = u64;	42	pub type nlink_t = u64;
Lines 48-55 index 10fcaa03a4ef6..197400ffb4e28 100644 Link Here
48	s! {	48	s! {
49	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	49	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
50	index ec6bce2a03091..d3a77d03c48d0 100644	50	index ec6bce2a03091..d3a77d03c48d0 100644
51	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	51	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
52	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	52	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
53	@@ -2,7 +2,7 @@	53	@@ -2,7 +2,7 @@
54		54
55	pub type nlink_t = u64;	55	pub type nlink_t = u64;
Lines 61-68 index ec6bce2a03091..d3a77d03c48d0 100644 Link Here
61	pub type kssize_t = i64;	61	pub type kssize_t = i64;
62	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs	62	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
63	index 160a4baae481b..9d65317d29cb4 100644	63	index 160a4baae481b..9d65317d29cb4 100644
64	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs	64	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
65	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs	65	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
66	@@ -2,7 +2,7 @@	66	@@ -2,7 +2,7 @@
67		67
68	pub type nlink_t = u64;	68	pub type nlink_t = u64;
Lines 74-81 index 160a4baae481b..9d65317d29cb4 100644 Link Here
74	pub type kssize_t = i64;	74	pub type kssize_t = i64;
75	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs	75	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
76	index d73215a68ec33..f76208400f324 100644	76	index d73215a68ec33..f76208400f324 100644
77	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs	77	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
78	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs	78	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
79	@@ -2,7 +2,7 @@	79	@@ -2,7 +2,7 @@
80		80
81	pub type nlink_t = u64;	81	pub type nlink_t = u64;
Lines 120-127 similarity index 89% Link Here
120	rename from src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs	120	rename from src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
121	rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs	121	rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
122		122
123	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs.orig 2024-10-24 17:21:07.154172000 +0200	123	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs.orig 2024-10-24 17:21:07.154172000 +0200
124	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs 2024-10-24 17:21:02.029962000 +0200	124	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs 2024-10-24 17:21:02.029962000 +0200
125	@@ -0,0 +1,34 @@	125	@@ -0,0 +1,34 @@
126	+#[repr(C)]	126	+#[repr(C)]
127	+#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]	127	+#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))]
Lines 160-167 rename to src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs Link Here
160		160
161		161
162	index 80c6fa1684530..5c1156581fd61 100644	162	index 80c6fa1684530..5c1156581fd61 100644
163	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs	163	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/b64.rs
164	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs	164	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/b32.rs
165	@@ -3,12 +3,10 @@	165	@@ -3,12 +3,10 @@
166	pub struct stat {	166	pub struct stat {
167	pub st_dev: ::dev_t,	167	pub st_dev: ::dev_t,
Lines 198-205 index 80c6fa1684530..5c1156581fd61 100644 Link Here
198	impl ::Copy for ::stat {}	198	impl ::Copy for ::stat {}
199	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	199	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
200	index 68a8364194607..e416ebf745841 100644	200	index 68a8364194607..e416ebf745841 100644
201	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	201	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
202	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs	202	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs
203	@@ -479,10 +479,11 @@ extern "C" {	203	@@ -479,10 +479,11 @@ extern "C" {
204	}	204	}
205		205
Lines 217-224 index 68a8364194607..e416ebf745841 100644 Link Here
217	}	217	}
218	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	218	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
219	index 197400ffb4e28..c4431a6458e8f 100644	219	index 197400ffb4e28..c4431a6458e8f 100644
220	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	220	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
221	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs	221	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs
222	@@ -218,6 +218,40 @@ s! {	222	@@ -218,6 +218,40 @@ s! {
223	/// kthread flag.	223	/// kthread flag.
224	pub ki_tdflags: ::c_long,	224	pub ki_tdflags: ::c_long,
Lines 279-285 index 197400ffb4e28..c4431a6458e8f 100644 Link Here
279	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs	279	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
280	deleted file mode 100644	280	deleted file mode 100644
281	index 80c6fa1684530..0000000000000	281	index 80c6fa1684530..0000000000000
282	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs	282	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/b64.rs
283	+++ /dev/null	283	+++ /dev/null
284	@@ -1,34 +0,0 @@	284	@@ -1,34 +0,0 @@
285	-#[repr(C)]	285	-#[repr(C)]
Lines 318-325 index 80c6fa1684530..0000000000000 Link Here
318	-}	318	-}
319	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	319	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
320	index d3a77d03c48d0..118404e8b089b 100644	320	index d3a77d03c48d0..118404e8b089b 100644
321	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	321	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
322	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs	322	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd13/mod.rs
323	@@ -228,6 +228,40 @@ s! {	323	@@ -228,6 +228,40 @@ s! {
324	/// kthread flag.	324	/// kthread flag.
325	pub ki_tdflags: ::c_long,	325	pub ki_tdflags: ::c_long,
Lines 380-386 index d3a77d03c48d0..118404e8b089b 100644 Link Here
380	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs	380	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
381	deleted file mode 100644	381	deleted file mode 100644
382	index 80c6fa1684530..0000000000000	382	index 80c6fa1684530..0000000000000
383	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs	383	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/b64.rs
384	+++ /dev/null	384	+++ /dev/null
385	@@ -1,34 +0,0 @@	385	@@ -1,34 +0,0 @@
386	-#[repr(C)]	386	-#[repr(C)]
Lines 419-426 index 80c6fa1684530..0000000000000 Link Here
419	-}	419	-}
420	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs	420	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
421	index 9d65317d29cb4..e624dd7201b0a 100644	421	index 9d65317d29cb4..e624dd7201b0a 100644
422	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs	422	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
423	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs	423	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd14/mod.rs
424	@@ -228,6 +228,40 @@ s! {	424	@@ -228,6 +228,40 @@ s! {
425	/// kthread flag.	425	/// kthread flag.
426	pub ki_tdflags: ::c_long,	426	pub ki_tdflags: ::c_long,
Lines 481-487 index 9d65317d29cb4..e624dd7201b0a 100644 Link Here
481	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs	481	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
482	deleted file mode 100644	482	deleted file mode 100644
483	index 80c6fa1684530..0000000000000	483	index 80c6fa1684530..0000000000000
484	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs	484	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/b64.rs
485	+++ /dev/null	485	+++ /dev/null
486	@@ -1,34 +0,0 @@	486	@@ -1,34 +0,0 @@
487	-#[repr(C)]	487	-#[repr(C)]
Lines 520-527 index 80c6fa1684530..0000000000000 Link Here
520	-}	520	-}
521	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs	521	diff --git a/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs b/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
522	index f76208400f324..a299af7d5d53e 100644	522	index f76208400f324..a299af7d5d53e 100644
523	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs	523	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
524	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs	524	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/freebsd15/mod.rs
525	@@ -228,6 +228,40 @@ s! {	525	@@ -228,6 +228,40 @@ s! {
526	/// kthread flag.	526	/// kthread flag.
527	pub ki_tdflags: ::c_long,	527	pub ki_tdflags: ::c_long,
Lines 581-588 index f76208400f324..a299af7d5d53e 100644 Link Here
581	mod x86_64;	581	mod x86_64;
582	diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs	582	diff --git a/src/unix/bsd/freebsdlike/freebsd/x86.rs b/src/unix/bsd/freebsdlike/freebsd/x86.rs
583	index c3c576ed66681..31a660e7d0a22 100644	583	index c3c576ed66681..31a660e7d0a22 100644
584	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/x86.rs	584	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
585	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/x86.rs	585	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/x86.rs
586	@@ -42,31 +42,6 @@ s_no_extra_traits! {	586	@@ -42,31 +42,6 @@ s_no_extra_traits! {
587	}	587	}
588		588
Lines 630-637 Subject: [PATCH] fixup: fix build on powerpc, powerpc64, and arm Link Here
630		630
631	diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs	631	diff --git a/src/unix/bsd/freebsdlike/freebsd/arm.rs b/src/unix/bsd/freebsdlike/freebsd/arm.rs
632	index 300b3dd45ca9d..8ff500c65981c 100644	632	index 300b3dd45ca9d..8ff500c65981c 100644
633	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/arm.rs	633	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
634	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/arm.rs	634	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/arm.rs
635	@@ -6,36 +6,6 @@ pub type time_t = i64;	635	@@ -6,36 +6,6 @@ pub type time_t = i64;
636	pub type suseconds_t = i32;	636	pub type suseconds_t = i32;
637	pub type register_t = i32;	637	pub type register_t = i32;
Lines 671-678 index 300b3dd45ca9d..8ff500c65981c 100644 Link Here
671	if #[cfg(libc_const_size_of)] {	671	if #[cfg(libc_const_size_of)] {
672	diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs	672	diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
673	index a0120c337e0ad..f84062ba34b93 100644	673	index a0120c337e0ad..f84062ba34b93 100644
674	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc.rs	674	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
675	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc.rs	675	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
676	@@ -6,32 +6,6 @@ pub type time_t = i64;	676	@@ -6,32 +6,6 @@ pub type time_t = i64;
677	pub type suseconds_t = i32;	677	pub type suseconds_t = i32;
678	pub type register_t = i32;	678	pub type register_t = i32;
Lines 708-715 index a0120c337e0ad..f84062ba34b93 100644 Link Here
708	if #[cfg(libc_const_size_of)] {	708	if #[cfg(libc_const_size_of)] {
709	diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs	709	diff --git a/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs b/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
710	index 7f5b9752264e3..69cf4c5fc88c7 100644	710	index 7f5b9752264e3..69cf4c5fc88c7 100644
711	--- vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs	711	--- vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
712	+++ vendor/libc-0.2.157/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs	712	+++ vendor/libc-0.2.159/src/unix/bsd/freebsdlike/freebsd/powerpc64.rs
713	@@ -6,32 +6,6 @@ pub type time_t = i64;	713	@@ -6,32 +6,6 @@ pub type time_t = i64;
714	pub type suseconds_t = i64;	714	pub type suseconds_t = i64;
715	pub type register_t = i64;	715	pub type register_t = i64;
716	-