std: freebsd build update. #114521

devnexen · 2023-08-05T15:16:11Z

since freebsd 11 had been removed, minimum is now 12.

rustbot · 2023-08-05T15:16:17Z

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

cuviper · 2023-08-10T23:37:35Z

since freebsd 11 had been removed

Has it? #89058 is still open...

workingjubilee · 2023-10-10T04:21:08Z

It was accepted however, no?

cuviper · 2023-10-19T00:09:15Z

library/std/build.rs

-            println!("cargo:rustc-cfg=freebsd12");
-        } else if env::var("RUST_STD_FREEBSD_13_ABI").is_ok() {
-            println!("cargo:rustc-cfg=freebsd12");
+        println!("cargo:rustc-cfg=freebsd12");


With this minimum, we should drop the cfg altogether and remove cfg(not(freebsd12)) code.

AFAICS just a couple functions in library/std/src/os/freebsd/fs.rs are using that.

since freebsd 11 had been removed, minimum is now 12.

cuviper · 2023-10-20T22:42:10Z

library/std/build.rs

-            println!("cargo:rustc-cfg=freebsd13");
-        }
-    } else if target.contains("linux")
+    if target.contains("linux")


I think we need freebsd to be in this big common list, otherwise it will fall into the else restricted-std.

cuviper · 2023-10-21T07:13:27Z

Thanks!

@bors r+ rollup

bors · 2023-10-21T07:13:29Z

📌 Commit f479142 has been approved by cuviper

It is now in the queue for this repository.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#114521 (std: freebsd build update.) - rust-lang#116911 (Suggest relaxing implicit `type Assoc: Sized;` bound) - rust-lang#116917 (coverage: Simplify the injection of coverage statements) - rust-lang#116961 (Typo suggestion to change bindings with leading underscore) - rust-lang#116964 (Add stable Instance::body() and RustcInternal trait) - rust-lang#116974 (coverage: Fix inconsistent handling of function signature spans) - rust-lang#116990 (Mention `into_iter` on borrow errors suggestions when appropriate) - rust-lang#116995 (Point at assoc fn definition on type param divergence) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#114521 - devnexen:std_fbsd_13_upd, r=cuviper std: freebsd build update. since freebsd 11 had been removed, minimum is now 12.

Upgrade FreeBSD ABi used on std to 12 ref.: - rust-lang/rust#89058 - rust-lang/rust#114521

Pkgsrc changes: * Adjust patches and cargo checksums to new versions. * For an external LLVM, set dependency of llvm >= 16, in accordance with the upstream changes. * Mark that on NetBSD we now need >= 9.0, so 8.x is no longer supported. * On NetBSD/sparc64 10.x, we now need GCC 12 to build the embedded LLVM, which is version 17; apparently GCC 10.4 or 10.5 mis-compiles it, resulting in an illegal instruction fault during the build. Ref. rust-lang/rust#117231 Upstream changes: Version 1.75.0 (2023-12-28) ========================== - [Stabilize `async fn` and return-position `impl Trait` in traits.] (rust-lang/rust#115822) - [Allow function pointer signatures containing `&mut T` in `const` contexts.] (rust-lang/rust#116015) - [Match `usize`/`isize` exhaustively with half-open ranges.] (rust-lang/rust#116692) - [Guarantee that `char` has the same size and alignment as `u32`.] (rust-lang/rust#116894) - [Document that the null pointer has the 0 address.] (rust-lang/rust#116988) - [Allow partially moved values in `match`.] (rust-lang/rust#103208) - [Add notes about non-compliant FP behavior on 32bit x86 targets.] (rust-lang/rust#113053) - [Stabilize ratified RISC-V target features.] (rust-lang/rust#116485) Compiler -------- - [Rework negative coherence to properly consider impls that only partly overlap.] (rust-lang/rust#112875) - [Bump `COINDUCTIVE_OVERLAP_IN_COHERENCE` to deny, and warn in dependencies.] (rust-lang/rust#116493) - [Consider alias bounds when computing liveness in NLL.] (rust-lang/rust#116733) - [Add the V (vector) extension to the `riscv64-linux-android` target spec.] (rust-lang/rust#116618) - [Automatically enable cross-crate inlining for small functions] (rust-lang/rust#116505) - Add several new tier 3 targets: - [`csky-unknown-linux-gnuabiv2hf`] (rust-lang/rust#117049) - [`i586-unknown-netbsd`] (rust-lang/rust#117170) - [`mipsel-unknown-netbsd`] (rust-lang/rust#117356) Refer to Rust's [platform support page][platform-support-doc] for more information on Rust's tiered platform support. Libraries --------- - [Override `Waker::clone_from` to avoid cloning `Waker`s unnecessarily.] (rust-lang/rust#96979) - [Implement `BufRead` for `VecDeque<u8>`.] (rust-lang/rust#110604) - [Implement `FusedIterator` for `DecodeUtf16` when the inner iterator does.] (rust-lang/rust#110729) - [Implement `Not, Bit{And,Or}{,Assign}` for IP addresses.] (rust-lang/rust#113747) - [Implement `Default` for `ExitCode`.] (rust-lang/rust#114589) - [Guarantee representation of None in NPO] (rust-lang/rust#115333) - [Document when atomic loads are guaranteed read-only.] (rust-lang/rust#115577) - [Broaden the consequences of recursive TLS initialization.] (rust-lang/rust#116172) - [Windows: Support sub-millisecond sleep.] (rust-lang/rust#116461) - [Fix generic bound of `str::SplitInclusive`'s `DoubleEndedIterator` impl] (rust-lang/rust#100806) - [Fix exit status / wait status on non-Unix `cfg(unix)` platforms.] (rust-lang/rust#115108) Stabilized APIs --------------- - [`Atomic*::from_ptr`] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicUsize.html#method.from_ptr) - [`FileTimes`] (https://doc.rust-lang.org/stable/std/fs/struct.FileTimes.html) - [`FileTimesExt`] (https://doc.rust-lang.org/stable/std/os/windows/fs/trait.FileTimesExt.html) - [`File::set_modified`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.set_modified) - [`File::set_times`] (https://doc.rust-lang.org/stable/std/fs/struct.File.html#method.set_times) - [`IpAddr::to_canonical`] (https://doc.rust-lang.org/stable/core/net/enum.IpAddr.html#method.to_canonical) - [`Ipv6Addr::to_canonical`] (https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.to_canonical) - [`Option::as_slice`] (https://doc.rust-lang.org/stable/core/option/enum.Option.html#method.as_slice) - [`Option::as_mut_slice`] (https://doc.rust-lang.org/stable/core/option/enum.Option.html#method.as_mut_slice) - [`pointer::byte_add`] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_add) - [`pointer::byte_offset`] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_offset) - [`pointer::byte_offset_from`] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_offset_from) - [`pointer::byte_sub`] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.byte_sub) - [`pointer::wrapping_byte_add`] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.wrapping_byte_add) - [`pointer::wrapping_byte_offset`] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.wrapping_byte_offset) - [`pointer::wrapping_byte_sub`] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.wrapping_byte_sub) These APIs are now stable in const contexts: - [`Ipv6Addr::to_ipv4_mapped`] (https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.to_ipv4_mapped) - [`MaybeUninit::assume_init_read`] (https://doc.rust-lang.org/stable/core/mem/union.MaybeUninit.html#method.assume_init_read) - [`MaybeUninit::zeroed`] (https://doc.rust-lang.org/stable/core/mem/union.MaybeUninit.html#method.zeroed) - [`mem::discriminant`] (https://doc.rust-lang.org/stable/core/mem/fn.discriminant.html) - [`mem::zeroed`] (https://doc.rust-lang.org/stable/core/mem/fn.zeroed.html) Cargo ----- - [Add new packages to `[workspace.members]` automatically.] (rust-lang/cargo#12779) - [Allow version-less `Cargo.toml` manifests.] (rust-lang/cargo#12786) - [Make browser links out of HTML file paths.] (rust-lang/cargo#12889) Rustdoc ------- - [Accept less invalid Rust in rustdoc.] (rust-lang/rust#117450) - [Document lack of object safety on affected traits.] (rust-lang/rust#113241) - [Hide `#[repr(transparent)]` if it isn't part of the public ABI.] (rust-lang/rust#115439) - [Show enum discriminant if it is a C-like variant.] (rust-lang/rust#116142) Compatibility Notes ------------------- - [FreeBSD targets now require at least version 12.] (rust-lang/rust#114521) - [Formally demote tier 2 MIPS targets to tier 3.] (rust-lang/rust#115238) - [Make misalignment a hard error in `const` contexts.] (rust-lang/rust#115524) - [Fix detecting references to packed unsized fields.] (rust-lang/rust#115583) - [Remove support for compiler plugins.] (rust-lang/rust#116412)

rustbot assigned cuviper Aug 5, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Aug 5, 2023

cuviper reviewed Oct 19, 2023

View reviewed changes

std: freebsd build update.

9a963e8

since freebsd 11 had been removed, minimum is now 12.

devnexen force-pushed the std_fbsd_13_upd branch from 0a80741 to 85eb0b3 Compare October 20, 2023 14:13

cuviper reviewed Oct 20, 2023

View reviewed changes

changes from feedback

f479142

devnexen force-pushed the std_fbsd_13_upd branch from 85eb0b3 to f479142 Compare October 20, 2023 22:55

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2023

matthiaskrgr mentioned this pull request Oct 21, 2023

Rollup of 8 pull requests #117013

Merged

bors merged commit 90671a0 into rust-lang:master Oct 21, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 21, 2023

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 21, 2023

Unrolled build for rust-lang#114521

d59458d

Rollup merge of rust-lang#114521 - devnexen:std_fbsd_13_upd, r=cuviper std: freebsd build update. since freebsd 11 had been removed, minimum is now 12.

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

This was referenced Nov 6, 2023

Raise libc's FreeBSD ABI to 12 rust-lang/libc#2406

Open

Upgrade FreeBSD ABi used on std to 12 rust-lang/libc#3434

Merged

bors added a commit to rust-lang/libc that referenced this pull request Nov 11, 2023

Auto merge of #3434 - JohnTitor:bump-std-freebsd, r=JohnTitor

f5172d2

Upgrade FreeBSD ABi used on std to 12 ref.: - rust-lang/rust#89058 - rust-lang/rust#114521

cuviper added the relnotes Marks issues that should be documented in the release notes of the next release. label Nov 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

std: freebsd build update. #114521

std: freebsd build update. #114521

devnexen commented Aug 5, 2023

rustbot commented Aug 5, 2023

cuviper commented Aug 10, 2023

workingjubilee commented Oct 10, 2023

cuviper Oct 19, 2023

cuviper Oct 19, 2023

cuviper Oct 20, 2023

cuviper commented Oct 21, 2023

bors commented Oct 21, 2023

std: freebsd build update. #114521

std: freebsd build update. #114521

Conversation

devnexen commented Aug 5, 2023

rustbot commented Aug 5, 2023

cuviper commented Aug 10, 2023

workingjubilee commented Oct 10, 2023

cuviper Oct 19, 2023

Choose a reason for hiding this comment

cuviper Oct 19, 2023

Choose a reason for hiding this comment

cuviper Oct 20, 2023

Choose a reason for hiding this comment

cuviper commented Oct 21, 2023

bors commented Oct 21, 2023