Skip to content

Commit a8a6822

Browse files
devnexendevnexen
committed
ci update freebsd version proposal, freebsd 12 being eol.
raising to the lowest still active supported freebsd version. From 13.1 (already eol too), freebsd introduces a cpu affinity layer with linux. It also introduces a api compatible copy_file_range which can be used like its linux's counterpart. The former is essential to build #120589, therefore breaks the backward compatibility with the previous FreeBSD releases.
1 parent b5c46dc commit a8a6822

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ ENV \
5555
CFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
5656
CXX_x86_64_fortanix_unknown_sgx=clang++-11 \
5757
CXXFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
58-
AR_i686_unknown_freebsd=i686-unknown-freebsd12-ar \
59-
CC_i686_unknown_freebsd=i686-unknown-freebsd12-clang \
60-
CXX_i686_unknown_freebsd=i686-unknown-freebsd12-clang++ \
58+
AR_i686_unknown_freebsd=i686-unknown-freebsd13-ar \
59+
CC_i686_unknown_freebsd=i686-unknown-freebsd13-clang \
60+
CXX_i686_unknown_freebsd=i686-unknown-freebsd13-clang++ \
6161
CC_aarch64_unknown_uefi=clang-11 \
6262
CXX_aarch64_unknown_uefi=clang++-11 \
6363
CC_i686_unknown_uefi=clang-11 \

‎src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ COPY scripts/cmake.sh /scripts/
2929
RUN /scripts/cmake.sh
3030

3131
ENV \
32-
AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-ar \
33-
CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-clang \
34-
CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd12-clang++
32+
AR_x86_64_unknown_freebsd=x86_64-unknown-freebsd13-ar \
33+
CC_x86_64_unknown_freebsd=x86_64-unknown-freebsd13-clang \
34+
CXX_x86_64_unknown_freebsd=x86_64-unknown-freebsd13-clang++
3535

3636
ENV HOSTS=x86_64-unknown-freebsd
3737

‎src/ci/docker/scripts/freebsd-toolchain.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -eux
55

66
arch=$1
77
binutils_version=2.40
8-
freebsd_version=12.3
9-
triple=$arch-unknown-freebsd12
8+
freebsd_version=13.2
9+
triple=$arch-unknown-freebsd13
1010
sysroot=/usr/local/$triple
1111

1212
hide_output() {
@@ -68,7 +68,7 @@ curl "$URL" | tar xJf - -C "$sysroot" --wildcards "${files_to_extract[@]}"
6868
# there might be other problems.)
6969
#
7070
# The --target option is last because the cross-build of LLVM uses
71-
# --target without an OS version ("-freebsd" vs. "-freebsd12"). This
71+
# --target without an OS version ("-freebsd" vs. "-freebsd13"). This
7272
# makes Clang default to libstdc++ (which no longer exists), and also
7373
# controls other features, like GNU-style symbol table hashing and
7474
# anything predicated on the version number in the __FreeBSD__

‎src/doc/rustc/src/platform-support.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ target | notes
104104
`powerpc64le-unknown-linux-gnu` | PPC64LE Linux (kernel 3.10, glibc 2.17)
105105
`riscv64gc-unknown-linux-gnu` | RISC-V Linux (kernel 4.20, glibc 2.29)
106106
`s390x-unknown-linux-gnu` | S390x Linux (kernel 3.2, glibc 2.17)
107-
`x86_64-unknown-freebsd` | 64-bit FreeBSD
107+
`x86_64-unknown-freebsd` | 64-bit FreeBSD (version 13.2)
108108
`x86_64-unknown-illumos` | illumos
109109
`x86_64-unknown-linux-musl` | 64-bit Linux with MUSL
110110
[`x86_64-unknown-netbsd`](platform-support/netbsd.md) | NetBSD/amd64
@@ -164,7 +164,7 @@ target | std | notes
164164
`i586-unknown-linux-gnu` | ✓ | 32-bit Linux w/o SSE (kernel 3.2, glibc 2.17) [^x86_32-floats-x87]
165165
`i586-unknown-linux-musl` | ✓ | 32-bit Linux w/o SSE, MUSL [^x86_32-floats-x87]
166166
[`i686-linux-android`](platform-support/android.md) | ✓ | 32-bit x86 Android [^x86_32-floats-return-ABI]
167-
`i686-unknown-freebsd` | ✓ | 32-bit FreeBSD [^x86_32-floats-return-ABI]
167+
`i686-unknown-freebsd` | ✓ | 32-bit FreeBSD (version 13.2) [^x86_32-floats-return-ABI]
168168
`i686-unknown-linux-musl` | ✓ | 32-bit Linux with MUSL [^x86_32-floats-return-ABI]
169169
[`i686-unknown-uefi`](platform-support/unknown-uefi.md) | * | 32-bit UEFI
170170
[`loongarch64-unknown-none`](platform-support/loongarch-none.md) | * | | LoongArch64 Bare-metal (LP64D ABI)
@@ -247,7 +247,7 @@ target | std | host | notes
247247
[`aarch64-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | | ARM64 OpenHarmony |
248248
[`aarch64-unknown-teeos`](platform-support/aarch64-unknown-teeos.md) | ? | | ARM64 TEEOS |
249249
[`aarch64-unknown-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | ARM64 QNX Neutrino 7.1 RTOS |
250-
`aarch64-unknown-freebsd` | ✓ | ✓ | ARM64 FreeBSD
250+
`aarch64-unknown-freebsd` | ✓ | ✓ | ARM64 FreeBSD (version 13.2)
251251
[`aarch64-unknown-hermit`](platform-support/hermit.md) | ✓ | | ARM64 Hermit
252252
`aarch64-unknown-illumos` | ✓ | ✓ | ARM64 illumos
253253
`aarch64-unknown-linux-gnu_ilp32` | ✓ | ✓ | ARM64 Linux (ILP32 ABI)
@@ -265,14 +265,14 @@ target | std | host | notes
265265
`armv4t-unknown-linux-gnueabi` | ? | | ARMv4T Linux
266266
[`armv5te-none-eabi`](platform-support/armv5te-none-eabi.md) | * | | Bare ARMv5TE
267267
`armv5te-unknown-linux-uclibceabi` | ? | | ARMv5TE Linux with uClibc
268-
`armv6-unknown-freebsd` | ✓ | ✓ | ARMv6 FreeBSD
268+
`armv6-unknown-freebsd` | ✓ | ✓ | ARMv6 FreeBSD (version 13.2)
269269
[`armv6-unknown-netbsd-eabihf`](platform-support/netbsd.md) | ✓ | ✓ | ARMv6 NetBSD w/hard-float
270270
[`armv6k-nintendo-3ds`](platform-support/armv6k-nintendo-3ds.md) | ? | | ARMv6K Nintendo 3DS, Horizon (Requires devkitARM toolchain)
271271
[`armv7-sony-vita-newlibeabihf`](platform-support/armv7-sony-vita-newlibeabihf.md) | ✓ | | ARMv7-A Cortex-A9 Sony PlayStation Vita (requires VITASDK toolchain)
272272
[`armv7-unknown-linux-ohos`](platform-support/openharmony.md) | ✓ | | ARMv7-A OpenHarmony |
273273
[`armv7-unknown-linux-uclibceabi`](platform-support/armv7-unknown-linux-uclibceabi.md) | ✓ | ✓ | ARMv7-A Linux with uClibc, softfloat
274274
[`armv7-unknown-linux-uclibceabihf`](platform-support/armv7-unknown-linux-uclibceabihf.md) | ✓ | ? | ARMv7-A Linux with uClibc, hardfloat
275-
`armv7-unknown-freebsd` | ✓ | ✓ | ARMv7-A FreeBSD
275+
`armv7-unknown-freebsd` | ✓ | ✓ | ARMv7-A FreeBSD (version 13.2)
276276
[`armv7-unknown-netbsd-eabihf`](platform-support/netbsd.md) | ✓ | ✓ | ARMv7-A NetBSD w/hard-float
277277
`armv7-wrs-vxworks-eabihf` | ? | | ARMv7-A for VxWorks
278278
[`armv7a-kmc-solid_asp3-eabi`](platform-support/kmc-solid.md) | ✓ | | ARM SOLID with TOPPERS/ASP3
@@ -329,9 +329,9 @@ target | std | host | notes
329329
`powerpc-unknown-openbsd` | ? | |
330330
`powerpc-wrs-vxworks-spe` | ? | |
331331
`powerpc-wrs-vxworks` | ? | |
332-
`powerpc64-unknown-freebsd` | ✓ | ✓ | PPC64 FreeBSD (ELFv1 and ELFv2)
333-
`powerpc64le-unknown-freebsd` | | | PPC64LE FreeBSD
334-
`powerpc-unknown-freebsd` | | | PowerPC FreeBSD
332+
`powerpc64-unknown-freebsd` | ✓ | ✓ | PPC64 FreeBSD (ELFv1 and ELFv2, version 13.2)
333+
`powerpc64le-unknown-freebsd` | | | PPC64LE FreeBSD (version 13.2)
334+
`powerpc-unknown-freebsd` | | | PowerPC FreeBSD (version 13.2)
335335
`powerpc64-unknown-linux-musl` | ? | |
336336
`powerpc64-wrs-vxworks` | ? | |
337337
`powerpc64le-unknown-linux-musl` | ? | |
@@ -345,7 +345,7 @@ target | std | host | notes
345345
[`riscv32imac-esp-espidf`](platform-support/esp-idf.md) | ✓ | | RISC-V ESP-IDF
346346
[`riscv32imafc-esp-espidf`](platform-support/esp-idf.md) | ✓ | | RISC-V ESP-IDF
347347
[`riscv64gc-unknown-hermit`](platform-support/hermit.md) | ✓ | | RISC-V Hermit
348-
`riscv64gc-unknown-freebsd` | | | RISC-V FreeBSD
348+
`riscv64gc-unknown-freebsd` | | | RISC-V FreeBSD (version 13.2)
349349
`riscv64gc-unknown-fuchsia` | | | RISC-V Fuchsia
350350
`riscv64gc-unknown-linux-musl` | | | RISC-V Linux (kernel 4.20, musl 1.2.0)
351351
[`riscv64gc-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | RISC-V NetBSD

0 commit comments

Comments
 (0)