From 874e5277f968ca18420e121d1bd296cbefc47b1d Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Sun, 12 Nov 2023 06:35:24 +0900 Subject: [PATCH] Upgrade FreeBSD ABi used on std to 12 --- build.rs | 6 +++--- ci/build.sh | 6 +++--- ci/docker/aarch64-unknown-linux-musl/Dockerfile | 2 +- ci/docker/s390x-unknown-linux-musl/Dockerfile | 2 +- libc-test/build.rs | 2 +- src/unix/haiku/mod.rs | 2 +- src/unix/mod.rs | 2 +- src/unix/redox/mod.rs | 2 +- src/vxworks/mod.rs | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.rs b/build.rs index d7a9b7f7811d2..ee99981881c04 100644 --- a/build.rs +++ b/build.rs @@ -59,15 +59,15 @@ fn main() { ); } - // The ABI of libc used by libstd is backward compatible with FreeBSD 10. + // The ABI of libc used by std is backward compatible with FreeBSD 12. // The ABI of libc from crates.io is backward compatible with FreeBSD 11. // // On CI, we detect the actual FreeBSD version and match its ABI exactly, // running tests to ensure that the ABI is correct. match which_freebsd() { - Some(10) if libc_ci || rustc_dep_of_std => set_cfg("freebsd10"), + Some(10) if libc_ci => set_cfg("freebsd10"), Some(11) if libc_ci => set_cfg("freebsd11"), - Some(12) if libc_ci => set_cfg("freebsd12"), + Some(12) if libc_ci || rustc_dep_of_std => set_cfg("freebsd12"), Some(13) if libc_ci => set_cfg("freebsd13"), Some(14) if libc_ci => set_cfg("freebsd14"), Some(_) | None => set_cfg("freebsd11"), diff --git a/ci/build.sh b/ci/build.sh index 67cc0c421be5b..41225f9cdffd6 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -39,7 +39,7 @@ test_target() { done fi - # Test that libc builds without any default features (no libstd) + # Test that libc builds without any default features (no std) if [ "${NO_STD}" != "1" ]; then cargo "+${RUST}" "${BUILD_CMD}" -vv --no-default-features --target "${TARGET}" else @@ -47,8 +47,8 @@ test_target() { RUSTFLAGS="-A improper_ctypes_definitions" cargo "+${RUST}" "${BUILD_CMD}" \ -Z build-std=core,alloc -vv --no-default-features --target "${TARGET}" fi - # Test that libc builds with default features (e.g. libstd) - # if the target supports libstd + # Test that libc builds with default features (e.g. std) + # if the target supports std if [ "$NO_STD" != "1" ]; then cargo "+${RUST}" "${BUILD_CMD}" -vv --target "${TARGET}" else diff --git a/ci/docker/aarch64-unknown-linux-musl/Dockerfile b/ci/docker/aarch64-unknown-linux-musl/Dockerfile index c27a451792a47..bc15db0692297 100644 --- a/ci/docker/aarch64-unknown-linux-musl/Dockerfile +++ b/ci/docker/aarch64-unknown-linux-musl/Dockerfile @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY install-musl.sh / RUN sh /install-musl.sh aarch64 -# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd? +# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std? ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \ CC_aarch64_unknown_linux_musl=musl-gcc \ RUSTFLAGS='-Clink-args=-lgcc -L /musl-aarch64/lib' \ diff --git a/ci/docker/s390x-unknown-linux-musl/Dockerfile b/ci/docker/s390x-unknown-linux-musl/Dockerfile index 868f7b67bc9e1..d93eba4bd48e6 100644 --- a/ci/docker/s390x-unknown-linux-musl/Dockerfile +++ b/ci/docker/s390x-unknown-linux-musl/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ COPY install-musl.sh / RUN sh /install-musl.sh s390x -# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd? +# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std? ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \ CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x -L /musl-s390x" \ CC_s390x_unknown_linux_gnu=musl-gcc \ diff --git a/libc-test/build.rs b/libc-test/build.rs index d0fa164381a14..e9178a0a41499 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -349,7 +349,7 @@ fn test_apple(target: &str) { // close calls the close_nocancel system call "close" => true, - // FIXME: libstd removed libresolv support: https://github.com/rust-lang/rust/pull/102766 + // FIXME: std removed libresolv support: https://github.com/rust-lang/rust/pull/102766 "res_init" => true, // FIXME: remove once the target in CI is updated diff --git a/src/unix/haiku/mod.rs b/src/unix/haiku/mod.rs index 0db460b550272..a7d1719983c8f 100644 --- a/src/unix/haiku/mod.rs +++ b/src/unix/haiku/mod.rs @@ -865,7 +865,7 @@ pub const LC_NUMERIC: ::c_int = 4; pub const LC_TIME: ::c_int = 5; pub const LC_MESSAGES: ::c_int = 6; -// FIXME: Haiku does not have MAP_FILE, but libstd/os.rs requires it +// FIXME: Haiku does not have MAP_FILE, but library/std/os.rs requires it pub const MAP_FILE: ::c_int = 0x00; pub const MAP_SHARED: ::c_int = 0x01; pub const MAP_PRIVATE: ::c_int = 0x02; diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 9daebcaa6d364..fc905cfcc6589 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -321,7 +321,7 @@ cfg_if! { if #[cfg(any(target_os = "l4re", target_os = "espidf"))] { // required libraries for L4Re and the ESP-IDF framework are linked externally, ATM } else if #[cfg(feature = "std")] { - // cargo build, don't pull in anything extra as the libstd dep + // cargo build, don't pull in anything extra as the std dep // already pulls in all libs. } else if #[cfg(all(target_os = "linux", any(target_env = "gnu", target_env = "uclibc"), diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs index cd219a777288f..17242eaf2a1df 100644 --- a/src/unix/redox/mod.rs +++ b/src/unix/redox/mod.rs @@ -28,7 +28,7 @@ pub type nfds_t = ::c_ulong; pub type nlink_t = ::c_ulong; pub type off_t = ::c_longlong; pub type pthread_t = *mut ::c_void; -// Must be usize due to libstd/sys_common/thread_local.rs, +// Must be usize due to library/std/sys_common/thread_local.rs, // should technically be *mut ::c_void pub type pthread_key_t = usize; pub type rlim_t = ::c_ulonglong; diff --git a/src/vxworks/mod.rs b/src/vxworks/mod.rs index 21d33a4e5eddf..43afbc3e2c23d 100644 --- a/src/vxworks/mod.rs +++ b/src/vxworks/mod.rs @@ -582,8 +582,8 @@ pub const EAI_SERVICE: ::c_int = 9; pub const EAI_SOCKTYPE: ::c_int = 10; pub const EAI_SYSTEM: ::c_int = 11; -// This is not defined in vxWorks, but we have to define it here -// to make the building pass for getrandom and libstd, FIXME +// FIXME: This is not defined in vxWorks, but we have to define it here +// to make the building pass for getrandom and std pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void; //Clock Lib Stuff