[0.2] Combined CI fixes

.github/workflows/full_ci.yml

@@ -140,45 +140,6 @@ jobs:
       - name: Execute run-docker.sh
         run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
 
-  # These targets are tier 3 or otherwise need to have CI build std via -Zbuild-std.
-  # Because of this, only the nightly compiler can be used on these targets.
-  docker_linux_build_std:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
-    if: ${{ false }} # This is currently broken
-    name: Docker Linux Build-Std Targets
-    needs: [docker_linux_tier1, style_check]
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: true
-      max-parallel: 12
-      matrix:
-        target: [
-          armv7-unknown-linux-uclibceabihf
-        ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        run: TOOLCHAIN=nightly INSTALL_RUST_SRC=1 sh ./ci/install-rust.sh
-      - name: Execute run-docker.sh
-        run: LIBC_CI=1 TOOLCHAIN=nightly LIBC_CI_ZBUILD_STD=1 sh ./ci/run-docker.sh ${{ matrix.target }}
-
-  # devkitpro's pacman needs to be connected from Docker.
-  docker_switch:
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-
-    name: Docker Switch
-    needs: [docker_linux_tier1, style_check]
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust toolchain
-        run: sh ./ci/install-rust.sh
-      - name: Execute run-docker.sh
-        run: LIBC_CI=1 sh ./ci/run-docker.sh switch
-
   build_channels_linux:
     permissions:
       contents: read # to fetch code (actions/checkout)
@@ -283,11 +244,9 @@ jobs:
     needs: [
       docker_linux_tier1,
       docker_linux_tier2,
-      #docker_linux_build_std,
       macos,
       windows,
       style_check,
-      docker_switch,
       build_channels_linux,
       build_channels_macos,
       build_channels_windows,

Cargo.toml

@@ -46,7 +46,8 @@ targets = [
     "armv7-wrs-vxworks-eabihf",
     "armv7r-none-eabi",
     "armv7r-none-eabihf",
-    "hexagon-unknown-linux-musl",
+    # FIXME(hexagon): excluded due to duplicate symbol errors
+    # "hexagon-unknown-linux-musl",
     "i586-pc-windows-msvc",
     "i586-unknown-linux-gnu",
     "i586-unknown-linux-musl",

ci/build.sh

@@ -212,6 +212,8 @@ for TARGET in $TARGETS; do
 done
 
 # Targets which are not available via rustup and must be built with -Zbuild-std
+# FIXME(hexagon): hexagon-unknown-linux-musl should be tested but currently has
+# duplicate symbol errors from `compiler_builtins`.
 RUST_LINUX_NO_CORE_TARGETS="\
 aarch64-pc-windows-msvc \
 aarch64-unknown-freebsd \
@@ -224,7 +226,6 @@ armebv7r-none-eabihf \
 armv7-wrs-vxworks-eabihf \
 armv7r-none-eabi \
 armv7r-none-eabihf \
-hexagon-unknown-linux-musl \
 i586-pc-windows-msvc \
 i686-pc-windows-msvc \
 i686-unknown-haiku \

libc-test/build.rs

@@ -2311,6 +2311,12 @@ fn test_freebsd(target: &str) {
             // should've been used anywhere anyway.
             "TDF_UNUSED23" => true,
 
+            // Removed in FreeBSD 15
+            "TDF_CANSWAP" | "TDF_SWAPINREQ" => true,
+
+            // Unaccessible in FreeBSD 15
+            "TDI_SWAPPED" | "P_SWAPPINGOUT" | "P_SWAPPINGIN" => true,
+
             // Removed in FreeBSD 14 (git a6b55ee6be1)
             "IFF_KNOWSEPOCH" => true,