diff --git a/ci/azure.yml b/ci/azure.yml
index 456ac7f74f05cb4025dbbf740927d66ad56572a2..97f13c9da35791abc794ca67c6a866cb979675f8 100644
--- a/ci/azure.yml
+++ b/ci/azure.yml
@@ -25,7 +25,7 @@ jobs:
TARGET: x86_64-unknown-linux-gnu
- job: DockerLinuxTier2
- dependsOn: DockerLinuxTier1
+ #dependsOn: DockerLinuxTier1
pool:
vmImage: ubuntu-16.04
steps:
diff --git a/libc-test/build.rs b/libc-test/build.rs
index 9eb83e85e17b5c3a691311bf495aafd0ed964b6b..861fc21b093f2b434556e064d49c6dbbcf867d6d 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -31,6 +31,23 @@ fn do_ctest() {
}
}
+fn ctest_cfg() -> ctest::TestGenerator {
+ let mut cfg = ctest::TestGenerator::new();
+ let libc_cfgs = [
+ "libc_priv_mod_use",
+ "libc_union",
+ "libc_const_size_of",
+ "libc_align",
+ "libc_core_cvoid",
+ "libc_packedN",
+ "libc_thread_local",
+ ];
+ for f in &libc_cfgs {
+ cfg.cfg(f, None);
+ }
+ cfg
+}
+
fn main() {
do_cc();
do_ctest();
@@ -59,8 +76,9 @@ macro_rules! headers {
fn test_apple(target: &str) {
assert!(target.contains("apple"));
let x86_64 = target.contains("x86_64");
+ let i686 = target.contains("i686");
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.flag("-Wno-deprecated-declarations");
cfg.define("__APPLE_USE_RFC_3542", None);
@@ -225,13 +243,18 @@ fn test_apple(target: &str) {
}
});
+ cfg.skip_roundtrip(move |s| match s {
+ // FIXME: this type has the wrong ABI
+ "max_align_t" if i686 => true,
+ _ => false,
+ });
cfg.generate("../src/lib.rs", "main.rs");
}
fn test_openbsd(target: &str) {
assert!(target.contains("openbsd"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.flag("-Wno-deprecated-declarations");
headers! { cfg:
@@ -371,7 +394,7 @@ fn test_windows(target: &str) {
assert!(target.contains("windows"));
let gnu = target.contains("gnu");
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.define("_WIN32_WINNT", Some("0x8000"));
headers! { cfg:
@@ -474,7 +497,7 @@ fn test_windows(target: &str) {
fn test_redox(target: &str) {
assert!(target.contains("redox"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.flag("-Wno-deprecated-declarations");
headers! {
@@ -540,7 +563,7 @@ fn test_redox(target: &str) {
fn test_cloudabi(target: &str) {
assert!(target.contains("cloudabi"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.flag("-Wno-deprecated-declarations");
headers! {
@@ -611,7 +634,7 @@ fn test_cloudabi(target: &str) {
fn test_solaris(target: &str) {
assert!(target.contains("solaris"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.flag("-Wno-deprecated-declarations");
cfg.define("_XOPEN_SOURCE", Some("700"));
@@ -722,7 +745,7 @@ fn test_solaris(target: &str) {
fn test_netbsd(target: &str) {
assert!(target.contains("netbsd"));
let rumprun = target.contains("rumprun");
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.flag("-Wno-deprecated-declarations");
cfg.define("_NETBSD_SOURCE", Some("1"));
@@ -922,7 +945,7 @@ fn test_netbsd(target: &str) {
fn test_dragonflybsd(target: &str) {
assert!(target.contains("dragonfly"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.flag("-Wno-deprecated-declarations");
headers! {
@@ -1127,7 +1150,7 @@ fn test_dragonflybsd(target: &str) {
fn test_wasi(target: &str) {
assert!(target.contains("wasi"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.define("_GNU_SOURCE", None);
headers! { cfg:
@@ -1204,7 +1227,7 @@ fn test_android(target: &str) {
};
let x86 = target.contains("i686") || target.contains("x86_64");
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.define("_GNU_SOURCE", None);
headers! { cfg:
@@ -1429,7 +1452,7 @@ fn test_android(target: &str) {
fn test_freebsd(target: &str) {
assert!(target.contains("freebsd"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
let freebsd_ver = which_freebsd();
@@ -1631,7 +1654,7 @@ fn test_freebsd(target: &str) {
fn test_emscripten(target: &str) {
assert!(target.contains("emscripten"));
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.define("_GNU_SOURCE", None); // FIXME: ??
headers! { cfg:
@@ -1852,17 +1875,19 @@ fn test_linux(target: &str) {
}
let arm = target.contains("arm");
- let x86_64 = target.contains("x86_64");
- let x86_32 = target.contains("i686");
- let x32 = target.contains("x32");
+ let i686 = target.contains("i686");
let mips = target.contains("mips");
let mips32 = mips && !target.contains("64");
- let mips64 = mips && target.contains("64");
let mips32_musl = mips32 && musl;
- let sparc64 = target.contains("sparc64");
+ let mips64 = mips && target.contains("64");
+ let ppc64 = target.contains("powerpc64");
let s390x = target.contains("s390x");
+ let sparc64 = target.contains("sparc64");
+ let x32 = target.contains("x32");
+ let x86_32 = target.contains("i686");
+ let x86_64 = target.contains("x86_64");
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.define("_GNU_SOURCE", None);
// This macro re-deifnes fscanf,scanf,sscanf to link to the symbols that are
// deprecated since glibc >= 2.29. This allows Rust binaries to link against
@@ -2286,6 +2311,9 @@ fn test_linux(target: &str) {
true
}
+ // FIXME: the call ABI of max_align_t is incorrect on these platforms:
+ "max_align_t" if i686 || mips64 || ppc64 => true,
+
_ => false,
});
@@ -2305,7 +2333,7 @@ fn test_linux_like_apis(target: &str) {
if linux || android || emscripten {
// test strerror_r from the `string.h` header
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.skip_type(|_| true).skip_static(|_| true);
headers! { cfg: "string.h" }
@@ -2321,7 +2349,7 @@ fn test_linux_like_apis(target: &str) {
if linux || android || emscripten {
// test fcntl - see:
// http://man7.org/linux/man-pages/man2/fcntl.2.html
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
if musl {
cfg.header("fcntl.h");
@@ -2351,7 +2379,7 @@ fn test_linux_like_apis(target: &str) {
if linux || android {
// test termios
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.header("asm/termbits.h");
cfg.skip_type(|_| true)
.skip_static(|_| true)
@@ -2368,7 +2396,7 @@ fn test_linux_like_apis(target: &str) {
if linux || android {
// test IPV6_ constants:
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
headers! {
cfg:
"linux/in6.h"
@@ -2399,7 +2427,7 @@ fn test_linux_like_apis(target: &str) {
// These types have a field called `p_type`, but including
// "resolve.h" defines a `p_type` macro that expands to `__p_type`
// making the tests for these fails when both are included.
- let mut cfg = ctest::TestGenerator::new();
+ let mut cfg = ctest_cfg();
cfg.header("elf.h");
cfg.skip_fn(|_| true)
.skip_static(|_| true)
diff --git a/src/unix/bsd/apple/b32/align.rs b/src/unix/bsd/apple/b32/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ba9bc3ab3e28e50d8613e9aa1f84a3c00116c8bd
--- /dev/null
+++ b/src/unix/bsd/apple/b32/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 2]);
diff --git a/src/unix/bsd/apple/b32.rs b/src/unix/bsd/apple/b32/mod.rs
similarity index 96%
rename from src/unix/bsd/apple/b32.rs
rename to src/unix/bsd/apple/b32/mod.rs
index eacb0307cc106971ddcb5f4cd5c34a363952b590..9248e3adf2853e5012e80b31b6aee9bc8cfead91 100644
--- a/src/unix/bsd/apple/b32.rs
+++ b/src/unix/bsd/apple/b32/mod.rs
@@ -106,3 +106,10 @@ extern "C" {
options: ::c_ulong,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/bsd/apple/b64/align.rs b/src/unix/bsd/apple/b64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ba9bc3ab3e28e50d8613e9aa1f84a3c00116c8bd
--- /dev/null
+++ b/src/unix/bsd/apple/b64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 2]);
diff --git a/src/unix/bsd/apple/b64.rs b/src/unix/bsd/apple/b64/mod.rs
similarity index 97%
rename from src/unix/bsd/apple/b64.rs
rename to src/unix/bsd/apple/b64/mod.rs
index 9019babc7c1ede0c9f013fa04255be6633eb646c..7f7008387b81dcb6cfb53afb850ef72b3ba42e43 100644
--- a/src/unix/bsd/apple/b64.rs
+++ b/src/unix/bsd/apple/b64/mod.rs
@@ -111,3 +111,10 @@ extern "C" {
options: ::c_uint,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7fffedbf9620ded7cca85f69d8affaa207f8e6c8
--- /dev/null
+++ b/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 4]);
diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
similarity index 82%
rename from src/unix/bsd/freebsdlike/freebsd/x86_64.rs
rename to src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
index 5220cde915b780246647a9d9163b286574d49cc1..0769a22f88c7e4dfe44234c3227a1fc9e3e9841b 100644
--- a/src/unix/bsd/freebsdlike/freebsd/x86_64.rs
+++ b/src/unix/bsd/freebsdlike/freebsd/x86_64/mod.rs
@@ -15,3 +15,10 @@ cfg_if! {
}
}
pub const MAP_32BIT: ::c_int = 0x00080000;
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/android/b32/x86/align.rs b/src/unix/linux_like/android/b32/x86/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..ca2085497c16968eb386b4fa77fb5bea2eb3c272
--- /dev/null
+++ b/src/unix/linux_like/android/b32/x86/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(8))]
+pub struct max_align_t([f64; 2]);
diff --git a/src/unix/linux_like/android/b32/x86.rs b/src/unix/linux_like/android/b32/x86/mod.rs
similarity index 99%
rename from src/unix/linux_like/android/b32/x86.rs
rename to src/unix/linux_like/android/b32/x86/mod.rs
index a56fa004542ccbfb8426dbdd0e19f771ae44e2f0..101bf2d51a2d27d9f799d4a72096f0665f0658ae 100644
--- a/src/unix/linux_like/android/b32/x86.rs
+++ b/src/unix/linux_like/android/b32/x86/mod.rs
@@ -413,3 +413,10 @@ pub const CS: ::c_int = 13;
pub const EFL: ::c_int = 14;
pub const UESP: ::c_int = 15;
pub const SS: ::c_int = 16;
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/android/b64/aarch64/align.rs b/src/unix/linux_like/android/b64/aarch64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a71235ab299c0b5828425ffb996c2e4fa0db25ec
--- /dev/null
+++ b/src/unix/linux_like/android/b64/aarch64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f32; 8]);
diff --git a/src/unix/linux_like/android/b64/aarch64.rs b/src/unix/linux_like/android/b64/aarch64/mod.rs
similarity index 99%
rename from src/unix/linux_like/android/b64/aarch64.rs
rename to src/unix/linux_like/android/b64/aarch64/mod.rs
index cb1c81b26057921b99b6f3aeb221f5152a70fc17..b2b91889a2b2af9350e285e7e311925071ded948 100644
--- a/src/unix/linux_like/android/b64/aarch64.rs
+++ b/src/unix/linux_like/android/b64/aarch64/mod.rs
@@ -323,3 +323,10 @@ pub const SYS_pkey_mprotect: ::c_long = 288;
pub const SYS_pkey_alloc: ::c_long = 289;
pub const SYS_pkey_free: ::c_long = 290;
pub const SYS_syscalls: ::c_long = 292;
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/android/b64/x86_64/align.rs b/src/unix/linux_like/android/b64/x86_64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7fffedbf9620ded7cca85f69d8affaa207f8e6c8
--- /dev/null
+++ b/src/unix/linux_like/android/b64/x86_64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 4]);
diff --git a/src/unix/linux_like/android/b64/x86_64.rs b/src/unix/linux_like/android/b64/x86_64/mod.rs
similarity index 99%
rename from src/unix/linux_like/android/b64/x86_64.rs
rename to src/unix/linux_like/android/b64/x86_64/mod.rs
index 2ab6080a6d63fb899c118fceca5e9ffc00702ae8..f5b8b16ea32b596621b3f5db256283fe75c212d7 100644
--- a/src/unix/linux_like/android/b64/x86_64.rs
+++ b/src/unix/linux_like/android/b64/x86_64/mod.rs
@@ -418,3 +418,10 @@ pub const DS: ::c_int = 23;
pub const ES: ::c_int = 24;
pub const FS: ::c_int = 25;
pub const GS: ::c_int = 26;
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/emscripten/align.rs b/src/unix/linux_like/emscripten/align.rs
index 8019b7c3bb7082379dc2f2e66932d4723f937c72..8fa2186fc924cd0bfc327c3ac374796db8d50cb9 100644
--- a/src/unix/linux_like/emscripten/align.rs
+++ b/src/unix/linux_like/emscripten/align.rs
@@ -1,5 +1,9 @@
macro_rules! expand_align {
() => {
+ #[derive(Copy, Clone, Debug, PartialEq)]
+ #[repr(C, align(8))]
+ pub struct max_align_t([f64; 2]);
+
s! {
#[repr(align(4))]
pub struct pthread_mutex_t {
diff --git a/src/unix/linux_like/linux/gnu/b32/arm/align.rs b/src/unix/linux_like/linux/gnu/b32/arm/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..cd887aca9d5cfd78f073faadc949bb524fc08c2b
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b32/arm/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(8))]
+pub struct max_align_t([i64; 2]);
diff --git a/src/unix/linux_like/linux/gnu/b32/arm.rs b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/gnu/b32/arm.rs
rename to src/unix/linux_like/linux/gnu/b32/arm/mod.rs
index 73af4b8116b06e2b6246f4056eedc8e7b785856d..f74b41e315671941d196a81770a8c6b04b74f180 100644
--- a/src/unix/linux_like/linux/gnu/b32/arm.rs
+++ b/src/unix/linux_like/linux/gnu/b32/arm/mod.rs
@@ -859,3 +859,10 @@ pub const SYS_pkey_mprotect: ::c_long = 394;
pub const SYS_pkey_alloc: ::c_long = 395;
pub const SYS_pkey_free: ::c_long = 396;
pub const SYS_statx: ::c_long = 397;
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/gnu/b32/mips/align.rs b/src/unix/linux_like/linux/gnu/b32/mips/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a6e238d77846b8e4eff399ce56a061d19d69c834
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b32/mips/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(8))]
+pub struct max_align_t([f32; 4]);
diff --git a/src/unix/linux_like/linux/gnu/b32/mips.rs b/src/unix/linux_like/linux/gnu/b32/mips/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/gnu/b32/mips.rs
rename to src/unix/linux_like/linux/gnu/b32/mips/mod.rs
index cfe8ef69270518d54bb96ac51bef6bce2687f48c..23b0160bffa01082048c654ca27173645188c21d 100644
--- a/src/unix/linux_like/linux/gnu/b32/mips.rs
+++ b/src/unix/linux_like/linux/gnu/b32/mips/mod.rs
@@ -891,3 +891,10 @@ pub const TIOCM_RNG: ::c_int = 0x200;
pub const TIOCM_DSR: ::c_int = 0x400;
pub const EHWPOISON: ::c_int = 168;
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/gnu/b32/x86/align.rs b/src/unix/linux_like/linux/gnu/b32/x86/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..c9ab8b97841d2c227797896125181319af195992
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b32/x86/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 6]);
diff --git a/src/unix/linux_like/linux/gnu/b32/x86.rs b/src/unix/linux_like/linux/gnu/b32/x86/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/gnu/b32/x86.rs
rename to src/unix/linux_like/linux/gnu/b32/x86/mod.rs
index 67b80b28f7f9c03038bccca7bce7a174bf09856c..05e876067dd89b420de0caacf400771df45b2100 100644
--- a/src/unix/linux_like/linux/gnu/b32/x86.rs
+++ b/src/unix/linux_like/linux/gnu/b32/x86/mod.rs
@@ -1147,3 +1147,10 @@ extern "C" {
ucp: *const ucontext_t,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a71235ab299c0b5828425ffb996c2e4fa0db25ec
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f32; 8]);
diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/gnu/b64/aarch64.rs
rename to src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
index 4769e74e7b3259c4c435623e7bd7d9c6b56c21a3..b980a11b191104004b03fb4850e42457f92cc2f4 100644
--- a/src/unix/linux_like/linux/gnu/b64/aarch64.rs
+++ b/src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs
@@ -936,3 +936,10 @@ extern "C" {
newlen: ::size_t,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/align.rs b/src/unix/linux_like/linux/gnu/b64/mips64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7fffedbf9620ded7cca85f69d8affaa207f8e6c8
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b64/mips64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 4]);
diff --git a/src/unix/linux_like/linux/gnu/b64/mips64.rs b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/gnu/b64/mips64.rs
rename to src/unix/linux_like/linux/gnu/b64/mips64/mod.rs
index a9b49f3c3101996588bc406a0ac9276ed97cc31c..5b3da3cb2dc9093e4438abfa06ee7219d28ff1a2 100644
--- a/src/unix/linux_like/linux/gnu/b64/mips64.rs
+++ b/src/unix/linux_like/linux/gnu/b64/mips64/mod.rs
@@ -999,3 +999,10 @@ extern "C" {
newlen: ::size_t,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..86a5f28f1f520ea611ca13959aa4b5e23fa757fc
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([i64; 4]);
diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/gnu/b64/powerpc64.rs
rename to src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs
index 212062b32af12da4d06b63da9f0af6278ce0a404..bd9089543afdff6ecd0376cca8212ee6de6caef0 100644
--- a/src/unix/linux_like/linux/gnu/b64/powerpc64.rs
+++ b/src/unix/linux_like/linux/gnu/b64/powerpc64/mod.rs
@@ -1035,3 +1035,10 @@ extern "C" {
newlen: ::size_t,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..86a5f28f1f520ea611ca13959aa4b5e23fa757fc
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([i64; 4]);
diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/gnu/b64/sparc64.rs
rename to src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs
index 32489bc33a8b185934ab0640bd10b6449b35f7ae..93b1fa53491791faa63ebe25cbfe3aa666b4570c 100644
--- a/src/unix/linux_like/linux/gnu/b64/sparc64.rs
+++ b/src/unix/linux_like/linux/gnu/b64/sparc64/mod.rs
@@ -970,3 +970,10 @@ extern "C" {
newlen: ::size_t,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7fffedbf9620ded7cca85f69d8affaa207f8e6c8
--- /dev/null
+++ b/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 4]);
diff --git a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
index 2ff0969b0a1434629a3f0ca6161d490bb4126e6a..d1a2294380961e3b086d2402a04bda1d1278e0ce 100644
--- a/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
+++ b/src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs
@@ -906,3 +906,10 @@ cfg_if! {
pub use self::not_x32::*;
}
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/musl/b32/arm/align.rs b/src/unix/linux_like/linux/musl/b32/arm/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..6b5d11820132d7203584f56b1addd0933a2b1080
--- /dev/null
+++ b/src/unix/linux_like/linux/musl/b32/arm/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(8))]
+pub struct max_align_t(i64, i64);
diff --git a/src/unix/linux_like/linux/musl/b32/arm.rs b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/musl/b32/arm.rs
rename to src/unix/linux_like/linux/musl/b32/arm/mod.rs
index 12e977a64e0afdcf23620f022da9e6159e9b6e67..fd1e259fc3b5f1b3254b4c11f41d45a23b06c408 100644
--- a/src/unix/linux_like/linux/musl/b32/arm.rs
+++ b/src/unix/linux_like/linux/musl/b32/arm/mod.rs
@@ -835,3 +835,10 @@ extern "C" {
flags: ::c_uint,
) -> ::ssize_t;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/musl/b32/mips/align.rs b/src/unix/linux_like/linux/musl/b32/mips/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a6e238d77846b8e4eff399ce56a061d19d69c834
--- /dev/null
+++ b/src/unix/linux_like/linux/musl/b32/mips/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(8))]
+pub struct max_align_t([f32; 4]);
diff --git a/src/unix/linux_like/linux/musl/b32/mips.rs b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/musl/b32/mips.rs
rename to src/unix/linux_like/linux/musl/b32/mips/mod.rs
index f574223f9bd1a7370456867353b5335fc728d88a..7fdd121a7ac4ba4b474207aa8a3ba503c8997962 100644
--- a/src/unix/linux_like/linux/musl/b32/mips.rs
+++ b/src/unix/linux_like/linux/musl/b32/mips/mod.rs
@@ -836,3 +836,10 @@ pub const SYS_mlock2: ::c_long = 4000 + 359;
pub const SYS_copy_file_range: ::c_long = 4000 + 360;
pub const SYS_preadv2: ::c_long = 4000 + 361;
pub const SYS_pwritev2: ::c_long = 4000 + 362;
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/musl/b32/x86/align.rs b/src/unix/linux_like/linux/musl/b32/x86/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b203d7e8c87401fcb2e210d5e4380982186d79cf
--- /dev/null
+++ b/src/unix/linux_like/linux/musl/b32/x86/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(8))]
+pub struct max_align_t([f64; 3]);
diff --git a/src/unix/linux_like/linux/musl/b32/x86.rs b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/musl/b32/x86.rs
rename to src/unix/linux_like/linux/musl/b32/x86/mod.rs
index de73b3ebc68ab5ae63d007ad4b18bdf54df76b53..fb5569200c2d7d9365a0fd6aa52a0da0fbbe0577 100644
--- a/src/unix/linux_like/linux/musl/b32/x86.rs
+++ b/src/unix/linux_like/linux/musl/b32/x86/mod.rs
@@ -943,3 +943,10 @@ extern "C" {
flags: ::c_uint,
) -> ::ssize_t;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..a71235ab299c0b5828425ffb996c2e4fa0db25ec
--- /dev/null
+++ b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f32; 8]);
diff --git a/src/unix/linux_like/linux/musl/b64/aarch64.rs b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/musl/b64/aarch64.rs
rename to src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
index caf49ff4ad96e841c5a875ab5c10b3d6796ea5f4..8c286d83ccd21f62dcfbcf7d3afd3e79e8ce006a 100644
--- a/src/unix/linux_like/linux/musl/b64/aarch64.rs
+++ b/src/unix/linux_like/linux/musl/b64/aarch64/mod.rs
@@ -645,3 +645,10 @@ pub const TIOCM_RI: ::c_int = TIOCM_RNG;
extern "C" {
pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/unix/linux_like/linux/musl/b64/x86_64/align.rs b/src/unix/linux_like/linux/musl/b64/x86_64/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..7fffedbf9620ded7cca85f69d8affaa207f8e6c8
--- /dev/null
+++ b/src/unix/linux_like/linux/musl/b64/x86_64/align.rs
@@ -0,0 +1,3 @@
+#[derive(Copy, Clone, Debug, PartialEq)]
+#[repr(C, align(16))]
+pub struct max_align_t([f64; 4]);
diff --git a/src/unix/linux_like/linux/musl/b64/x86_64.rs b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
similarity index 99%
rename from src/unix/linux_like/linux/musl/b64/x86_64.rs
rename to src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
index 9e5a8bf1e95d4ba4f0067fca836e4ee82ee6928a..e4741a3a19830688cd2d7c29483ffeec6363d7b9 100644
--- a/src/unix/linux_like/linux/musl/b64/x86_64.rs
+++ b/src/unix/linux_like/linux/musl/b64/x86_64/mod.rs
@@ -917,3 +917,10 @@ pub const TIOCM_RI: ::c_int = TIOCM_RNG;
extern "C" {
pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}
diff --git a/src/windows/gnu/align.rs b/src/windows/gnu/align.rs
new file mode 100644
index 0000000000000000000000000000000000000000..dd3a3f72d30d03607cc8b3866de41fa34a12a10f
--- /dev/null
+++ b/src/windows/gnu/align.rs
@@ -0,0 +1,9 @@
+cfg_if! {
+ if #[cfg(target_pointer_width = "64")] {
+ #[derive(Copy, Clone, Debug, PartialEq)]
+ #[repr(C, align(16))] pub struct max_align_t([f64; 4]);
+ } else if #[cfg(target_pointer_width = "32")] {
+ #[derive(Copy, Clone, Debug, PartialEq)]
+ #[repr(C, align(16))] pub struct max_align_t([i64; 6]);
+ }
+}
diff --git a/src/windows/gnu.rs b/src/windows/gnu/mod.rs
similarity index 81%
rename from src/windows/gnu.rs
rename to src/windows/gnu/mod.rs
index d6736d87c2ba4016ad6ca5b2ee0e6d5593649c0f..e74628b981e2fe750cb4d0c34c2151446f413fc1 100644
--- a/src/windows/gnu.rs
+++ b/src/windows/gnu/mod.rs
@@ -14,3 +14,10 @@ extern "C" {
n: ::size_t,
) -> ::c_int;
}
+
+cfg_if! {
+ if #[cfg(libc_align)] {
+ mod align;
+ pub use self::align::*;
+ }
+}