Merge branch 'csky-unknown-linux-gnuabiv2' of github.com:Dirreke/libc into csky-unknown-linux-gnuabiv2

Author: Dirreke

.cirrus.yml

@@ -29,7 +29,9 @@ task:
 task:
   name: nightly x86_64-unknown-freebsd-14
   freebsd_instance:
-    image: freebsd-14-0-current-amd64-v20230330
+    # FIXME: FreeBSD 14 CI fails due to pkg installation.
+    # Use 14 again once a new image is available on Cirrus CI.
+    image_family: freebsd-13-2
   setup_script:
     - pkg install -y libnghttp2 curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh

.github/workflows/docs.yml

@@ -25,11 +25,13 @@ jobs:
       - name: Generate documentation
         run: LIBC_CI=1 sh ci/dox.sh
       - name: Setup Pages
-        uses: actions/configure-pages@v2
+        uses: actions/configure-pages@v3
+      - name: Fix permissions
+        run: rm -f ./target/doc/.lock
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v2
         with:
           path: 'target/doc'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v2

Cargo.toml

@@ -124,7 +124,7 @@ targets = [
     "x86_64-unknown-redox",
     "x86_64-wrs-vxworks"
 ]
-cargo-args = ["-Zbuild-std"]
+cargo-args = ["-Zbuild-std=core"]
 
 [dependencies]
 rustc-std-workspace-core = { version = "1.0.0", optional = true }

build.rs

@@ -7,6 +7,7 @@ use std::string::String;
 // need to know all the possible cfgs that this script will set. If you need to set another cfg
 // make sure to add it to this list as well.
 const ALLOWED_CFGS: &'static [&'static str] = &[
+    "emscripten_new_stat_abi",
     "freebsd10",
     "freebsd11",
     "freebsd12",
@@ -34,7 +35,7 @@ const ALLOWED_CFGS: &'static [&'static str] = &[
 const CHECK_CFG_EXTRA: &'static [(&'static str, &'static [&'static str])] = &[
     ("target_os", &["switch", "aix", "ohos"]),
     ("target_env", &["illumos", "wasi", "aix", "ohos"]),
-    ("target_arch", &["loongarch64", "csky"]),
+    ("target_arch", &["loongarch64", "mips32r6", "mips64r6", "csky"]),
 ];
 
 fn main() {
@@ -69,6 +70,12 @@ fn main() {
         Some(_) | None => set_cfg("freebsd11"),
     }
 
+    match emcc_version_code() {
+        Some(v) if (v >= 30142) => set_cfg("emscripten_new_stat_abi"),
+        // Non-Emscripten or version < 3.1.42.
+        Some(_) | None => (),
+    }
+
     // On CI: deny all warnings
     if libc_ci {
         set_cfg("libc_deny_warnings");
@@ -238,6 +245,33 @@ fn which_freebsd() -> Option<i32> {
     }
 }
 
+fn emcc_version_code() -> Option<u64> {
+    let output = std::process::Command::new("emcc")
+        .arg("-dumpversion")
+        .output()
+        .ok();
+    if output.is_none() {
+        return None;
+    }
+    let output = output.unwrap();
+    if !output.status.success() {
+        return None;
+    }
+
+    let stdout = String::from_utf8(output.stdout).ok();
+    if stdout.is_none() {
+        return None;
+    }
+    let version = stdout.unwrap();
+    let mut pieces = version.trim().split('.');
+
+    let major = pieces.next().and_then(|x| x.parse().ok()).unwrap_or(0);
+    let minor = pieces.next().and_then(|x| x.parse().ok()).unwrap_or(0);
+    let patch = pieces.next().and_then(|x| x.parse().ok()).unwrap_or(0);
+
+    Some(major * 10000 + minor * 100 + patch)
+}
+
 fn set_cfg(cfg: &str) {
     if !ALLOWED_CFGS.contains(&cfg) {
         panic!("trying to set cfg {}, but it is not in ALLOWED_CFGS", cfg);

ci/build.sh

@@ -102,12 +102,6 @@ i686-linux-android \
 i686-unknown-freebsd \
 i686-unknown-linux-gnu \
 i686-unknown-linux-musl \
-mips-unknown-linux-gnu \
-mips-unknown-linux-musl \
-mips64-unknown-linux-gnuabi64 \
-mips64el-unknown-linux-gnuabi64 \
-mipsel-unknown-linux-gnu \
-mipsel-unknown-linux-musl \
 powerpc-unknown-linux-gnu \
 powerpc64-unknown-linux-gnu \
 powerpc64le-unknown-linux-gnu \
@@ -118,6 +112,14 @@ x86_64-unknown-linux-musl \
 x86_64-unknown-netbsd \
 "
 
+# FIXME: builds of MIPS targets are currently broken on nightly.
+# mips-unknown-linux-gnu \
+# mips-unknown-linux-musl \
+# mips64-unknown-linux-gnuabi64 \
+# mips64el-unknown-linux-gnuabi64 \
+# mipsel-unknown-linux-gnu \
+# mipsel-unknown-linux-musl \
+
 RUST_GT_1_13_LINUX_TARGETS="\
 arm-unknown-linux-musleabi \
 arm-unknown-linux-musleabihf \

ci/install-rust.sh

@@ -12,6 +12,9 @@ else
   # https://github.com/rust-lang/rust/issues/103673 contains related information.
   case "$TARGET" in
     *android*) toolchain=nightly-2022-10-09;;
+    # FIXME: Unpin once mips' components are available on nightly.
+    # https://rust-lang.github.io/rustup-components-history/mips-unknown-linux-gnu.html
+    *mips*) toolchain=nightly-2023-07-04;;
     *) toolchain=nightly;;
   esac
 fi

libc-test/build.rs

@@ -350,6 +350,9 @@ fn test_apple(target: &str) {
             // FIXME: ABI has been changed on recent macOSes.
             "os_unfair_lock_assert_owner" | "os_unfair_lock_assert_not_owner" => true,
 
+            // FIXME: Once the SDK get updated to Ventura's level
+            "freadlink" | "mknodat" | "mkfifoat" => true,
+
             _ => false,
         }
     });
@@ -1802,6 +1805,41 @@ fn test_android(target: &str) {
             // kernel 5.6 minimum required
             "IPPROTO_MPTCP" | "IPPROTO_ETHERNET" => true,
 
+            // FIXME: NDK r22 minimum required
+            | "FDB_NOTIFY_BIT"
+            | "FDB_NOTIFY_INACTIVE_BIT"
+            | "IFLA_ALT_IFNAME"
+            | "IFLA_PERM_ADDRESS"
+            | "IFLA_PROP_LIST"
+            | "IFLA_PROTO_DOWN_REASON"
+            | "NDA_FDB_EXT_ATTRS"
+            | "NDA_NH_ID"
+            | "NFEA_ACTIVITY_NOTIFY"
+            | "NFEA_DONT_REFRESH"
+            | "NFEA_UNSPEC" => true,
+
+            // FIXME: NDK r23 minimum required
+            | "IFLA_PARENT_DEV_BUS_NAME"
+            | "IFLA_PARENT_DEV_NAME" => true,
+
+            // FIXME: NDK r25 minimum required
+            | "IFLA_GRO_MAX_SIZE"
+            | "NDA_FLAGS_EXT"
+            | "NTF_EXT_MANAGED" => true,
+
+            // FIXME: NDK above r25 required
+            | "IFLA_ALLMULTI"
+            | "IFLA_DEVLINK_PORT"
+            | "IFLA_GRO_IPV4_MAX_SIZE"
+            | "IFLA_GSO_IPV4_MAX_SIZE"
+            | "IFLA_TSO_MAX_SEGS"
+            | "IFLA_TSO_MAX_SIZE"
+            | "NDA_NDM_STATE_MASK"
+            | "NDA_NDM_FLAGS_MASK"
+            | "NDTPA_INTERVAL_PROBE_TIME_MS"
+            | "NFQA_UNSPEC"
+            | "NTF_EXT_LOCKED" => true,
+
             _ => false,
         }
     });

libc-test/semver/android.txt

@@ -597,6 +597,8 @@ FD_ISSET
 FD_SET
 FD_SETSIZE
 FD_ZERO
+FDB_NOTIFY_BIT
+FDB_NOTIFY_INACTIVE_BIT
 FF0
 FF1
 FFDLY
@@ -777,6 +779,19 @@ IFLA_CARRIER_DOWN_COUNT
 IFLA_NEW_IFINDEX
 IFLA_MIN_MTU
 IFLA_MAX_MTU
+IFLA_PROP_LIST
+IFLA_ALT_IFNAME
+IFLA_PERM_ADDRESS
+IFLA_PROTO_DOWN_REASON
+IFLA_PARENT_DEV_NAME
+IFLA_PARENT_DEV_BUS_NAME
+IFLA_GRO_MAX_SIZE
+IFLA_TSO_MAX_SIZE
+IFLA_TSO_MAX_SEGS
+IFLA_ALLMULTI
+IFLA_DEVLINK_PORT
+IFLA_GSO_IPV4_MAX_SIZE
+IFLA_GRO_IPV4_MAX_SIZE
 IFLA_INFO_UNSPEC
 IFLA_INFO_KIND
 IFLA_INFO_DATA
@@ -1257,6 +1272,54 @@ MS_SYNCHRONOUS
 MS_UNBINDABLE
 NCCS
 NCP_SUPER_MAGIC
+NDA_CACHEINFO
+NDA_DST
+NDA_FDB_EXT_ATTRS
+NDA_FLAGS_EXT
+NDA_IFINDEX
+NDA_LINK_NETNSID
+NDA_LLADDR
+NDA_MASTER
+NDA_NDM_FLAGS_MASK
+NDA_NDM_STATE_MASK
+NDA_NH_ID
+NDA_PORT
+NDA_PROBES
+NDA_PROTOCOL
+NDA_SRC_VNI
+NDA_UNSPEC
+NDA_VLAN
+NDA_VNI
+NDTA_CONFIG
+NDTA_GC_INTERVAL
+NDTA_NAME
+NDTA_PAD
+NDTA_PARMS
+NDTA_STATS
+NDTA_THRESH1
+NDTA_THRESH2
+NDTA_THRESH3
+NDTA_UNSPEC
+NDTPA_ANYCAST_DELAY
+NDTPA_APP_PROBES
+NDTPA_BASE_REACHABLE_TIME
+NDTPA_DELAY_PROBE_TIME
+NDTPA_GC_STALETIME
+NDTPA_IFINDEX
+NDTPA_INTERVAL_PROBE_TIME_MS
+NDTPA_LOCKTIME
+NDTPA_MCAST_PROBES
+NDTPA_MCAST_REPROBES
+NDTPA_PAD
+NDTPA_PROXY_DELAY
+NDTPA_PROXY_QLEN
+NDTPA_QUEUE_LEN
+NDTPA_QUEUE_LENBYTES
+NDTPA_REACHABLE_TIME
+NDTPA_REFCNT
+NDTPA_RETRANS_TIME
+NDTPA_UCAST_PROBES
+NDTPA_UNSPEC
 NETLINK_ADD_MEMBERSHIP
 NETLINK_AUDIT
 NETLINK_BROADCAST_ERROR
@@ -1622,6 +1685,9 @@ NF_VERDICT_FLAG_QUEUE_BYPASS
 NF_VERDICT_MASK
 NF_VERDICT_QBITS
 NF_VERDICT_QMASK
+NFEA_ACTIVITY_NOTIFY
+NFEA_DONT_REFRESH
+NFEA_UNSPEC
 NI_DGRAM
 NI_MAXHOST
 NI_MAXSERV
@@ -1657,6 +1723,25 @@ NLM_F_REPLACE
 NLM_F_REQUEST
 NLM_F_ROOT
 NOFLSH
+NTF_EXT_LEARNED
+NTF_EXT_LOCKED
+NTF_EXT_MANAGED
+NTF_MASTER
+NTF_OFFLOADED
+NTF_PROXY
+NTF_ROUTER
+NTF_SELF
+NTF_STICKY
+NTF_USE
+NUD_DELAY
+NUD_FAILED
+NUD_INCOMPLETE
+NUD_NOARP
+NUD_NONE
+NUD_PERMANENT
+NUD_PROBE
+NUD_REACHABLE
+NUD_STALE
 OCRNL
 OFDEL
 OFILL
@@ -1818,6 +1903,7 @@ PTRACE_PEEKUSER
 PTRACE_POKEDATA
 PTRACE_POKETEXT
 PTRACE_POKEUSER
+PTRACE_SECCOMP_GET_METADATA
 PTRACE_SETOPTIONS
 PTRACE_SETSIGINFO
 PTRACE_SINGLESTEP
@@ -3430,6 +3516,7 @@ sched_setparam
 sched_setscheduler
 sched_yield
 seccomp_data
+seccomp_metadata
 seekdir
 select
 sem_close

libc-test/semver/apple.txt

@@ -1871,6 +1871,7 @@ flistxattr
 fmemopen
 fmount
 forkpty
+freadlink
 freeifaddrs
 freelocale
 fremovexattr
@@ -1994,6 +1995,8 @@ memset_s
 mem_entry_name_port_t
 mincore
 mkdirat
+mkfifoat
+mknodat
 mkstemps
 mount
 msghdr

src/unix/bsd/apple/mod.rs

@@ -6058,6 +6058,15 @@ extern "C" {
 
     pub fn dirname(path: *mut ::c_char) -> *mut ::c_char;
     pub fn basename(path: *mut ::c_char) -> *mut ::c_char;
+
+    pub fn mkfifoat(dirfd: ::c_int, pathname: *const ::c_char, mode: ::mode_t) -> ::c_int;
+    pub fn mknodat(
+        dirfd: ::c_int,
+        pathname: *const ::c_char,
+        mode: ::mode_t,
+        dev: dev_t,
+    ) -> ::c_int;
+    pub fn freadlink(fd: ::c_int, buf: *mut ::c_char, size: ::size_t) -> ::c_int;
 }
 
 pub unsafe fn mach_task_self() -> ::mach_port_t {