From fe67d7d9f967ec5bd9271bfbd0b0b7609a5c451e Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Wed, 25 Sep 2019 19:36:04 +0200 Subject: Fix max_align_t --- src/unix/bsd/apple/b32/align.rs | 7 ++++--- src/unix/bsd/apple/b64/align.rs | 7 ++++--- src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs | 7 ++++--- src/unix/linux_like/android/b32/x86/align.rs | 7 ++++--- src/unix/linux_like/android/b64/aarch64/align.rs | 7 ++++--- src/unix/linux_like/android/b64/x86_64/align.rs | 7 ++++--- src/unix/linux_like/emscripten/align.rs | 7 +++---- src/unix/linux_like/linux/gnu/b32/arm/align.rs | 7 ++++--- src/unix/linux_like/linux/gnu/b32/mips/align.rs | 7 ++++--- src/unix/linux_like/linux/gnu/b32/x86/align.rs | 7 ++++--- src/unix/linux_like/linux/gnu/b64/aarch64/align.rs | 7 ++++--- src/unix/linux_like/linux/gnu/b64/mips64/align.rs | 7 ++++--- src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs | 7 ++++--- src/unix/linux_like/linux/gnu/b64/sparc64/align.rs | 7 ++++--- src/unix/linux_like/linux/gnu/b64/x86_64/align.rs | 7 ++++--- src/unix/linux_like/linux/musl/b32/arm/align.rs | 7 ++++--- src/unix/linux_like/linux/musl/b32/mips/align.rs | 7 ++++--- src/unix/linux_like/linux/musl/b32/x86/align.rs | 7 ++++--- src/unix/linux_like/linux/musl/b64/aarch64/align.rs | 7 ++++--- src/unix/linux_like/linux/musl/b64/x86_64/align.rs | 7 ++++--- src/windows/gnu/align.rs | 10 ++++++---- 21 files changed, 85 insertions(+), 65 deletions(-) diff --git a/src/unix/bsd/apple/b32/align.rs b/src/unix/bsd/apple/b32/align.rs index ba9bc3ab3e..374a994b82 100644 --- a/src/unix/bsd/apple/b32/align.rs +++ b/src/unix/bsd/apple/b32/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 2]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 2]); +} diff --git a/src/unix/bsd/apple/b64/align.rs b/src/unix/bsd/apple/b64/align.rs index ba9bc3ab3e..374a994b82 100644 --- a/src/unix/bsd/apple/b64/align.rs +++ b/src/unix/bsd/apple/b64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 2]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 2]); +} diff --git a/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs b/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs index 7fffedbf96..33a0bc5daf 100644 --- a/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs +++ b/src/unix/bsd/freebsdlike/freebsd/x86_64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 4]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 4]); +} diff --git a/src/unix/linux_like/android/b32/x86/align.rs b/src/unix/linux_like/android/b32/x86/align.rs index ca2085497c..b3abe679ae 100644 --- a/src/unix/linux_like/android/b32/x86/align.rs +++ b/src/unix/linux_like/android/b32/x86/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(8))] -pub struct max_align_t([f64; 2]); +s! { + #[repr(align(8))] + pub struct max_align_t([f64; 2]); +} diff --git a/src/unix/linux_like/android/b64/aarch64/align.rs b/src/unix/linux_like/android/b64/aarch64/align.rs index a71235ab29..9531ca4f8b 100644 --- a/src/unix/linux_like/android/b64/aarch64/align.rs +++ b/src/unix/linux_like/android/b64/aarch64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f32; 8]); +s! { + #[repr(align(16))] + pub struct max_align_t([f32; 8]); +} diff --git a/src/unix/linux_like/android/b64/x86_64/align.rs b/src/unix/linux_like/android/b64/x86_64/align.rs index 7fffedbf96..33a0bc5daf 100644 --- a/src/unix/linux_like/android/b64/x86_64/align.rs +++ b/src/unix/linux_like/android/b64/x86_64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 4]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 4]); +} diff --git a/src/unix/linux_like/emscripten/align.rs b/src/unix/linux_like/emscripten/align.rs index 8fa2186fc9..e024ce08c8 100644 --- a/src/unix/linux_like/emscripten/align.rs +++ b/src/unix/linux_like/emscripten/align.rs @@ -1,10 +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(8))] + pub struct max_align_t([f64; 2]); + #[repr(align(4))] pub struct pthread_mutex_t { size: [u8; ::__SIZEOF_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 index cd887aca9d..3817254bff 100644 --- a/src/unix/linux_like/linux/gnu/b32/arm/align.rs +++ b/src/unix/linux_like/linux/gnu/b32/arm/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(8))] -pub struct max_align_t([i64; 2]); +s! { + #[repr(align(8))] + pub struct max_align_t([i64; 2]); +} diff --git a/src/unix/linux_like/linux/gnu/b32/mips/align.rs b/src/unix/linux_like/linux/gnu/b32/mips/align.rs index a6e238d778..8a5f872f5c 100644 --- a/src/unix/linux_like/linux/gnu/b32/mips/align.rs +++ b/src/unix/linux_like/linux/gnu/b32/mips/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(8))] -pub struct max_align_t([f32; 4]); +s! { + #[repr(align(8))] + pub struct max_align_t([f32; 4]); +} diff --git a/src/unix/linux_like/linux/gnu/b32/x86/align.rs b/src/unix/linux_like/linux/gnu/b32/x86/align.rs index c9ab8b9784..afd65bac7d 100644 --- a/src/unix/linux_like/linux/gnu/b32/x86/align.rs +++ b/src/unix/linux_like/linux/gnu/b32/x86/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 6]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 6]); +} diff --git a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs index a71235ab29..9531ca4f8b 100644 --- a/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs +++ b/src/unix/linux_like/linux/gnu/b64/aarch64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f32; 8]); +s! { + #[repr(align(16))] + pub struct max_align_t([f32; 8]); +} diff --git a/src/unix/linux_like/linux/gnu/b64/mips64/align.rs b/src/unix/linux_like/linux/gnu/b64/mips64/align.rs index 7fffedbf96..33a0bc5daf 100644 --- a/src/unix/linux_like/linux/gnu/b64/mips64/align.rs +++ b/src/unix/linux_like/linux/gnu/b64/mips64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 4]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 4]); +} diff --git a/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs b/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs index 86a5f28f1f..56681afce2 100644 --- a/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs +++ b/src/unix/linux_like/linux/gnu/b64/powerpc64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([i64; 4]); +s! { + #[repr(align(16))] + pub struct max_align_t([i64; 4]); +} diff --git a/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs b/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs index 86a5f28f1f..56681afce2 100644 --- a/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs +++ b/src/unix/linux_like/linux/gnu/b64/sparc64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([i64; 4]); +s! { + #[repr(align(16))] + pub struct max_align_t([i64; 4]); +} 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 index 7fffedbf96..33a0bc5daf 100644 --- a/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs +++ b/src/unix/linux_like/linux/gnu/b64/x86_64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 4]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 4]); +} diff --git a/src/unix/linux_like/linux/musl/b32/arm/align.rs b/src/unix/linux_like/linux/musl/b32/arm/align.rs index 6b5d118201..6b2a39c96f 100644 --- a/src/unix/linux_like/linux/musl/b32/arm/align.rs +++ b/src/unix/linux_like/linux/musl/b32/arm/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(8))] -pub struct max_align_t(i64, i64); +s! { + #[repr(align(8))] + pub struct max_align_t(i64, i64); +} diff --git a/src/unix/linux_like/linux/musl/b32/mips/align.rs b/src/unix/linux_like/linux/musl/b32/mips/align.rs index a6e238d778..8a5f872f5c 100644 --- a/src/unix/linux_like/linux/musl/b32/mips/align.rs +++ b/src/unix/linux_like/linux/musl/b32/mips/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(8))] -pub struct max_align_t([f32; 4]); +s! { + #[repr(align(8))] + pub struct max_align_t([f32; 4]); +} diff --git a/src/unix/linux_like/linux/musl/b32/x86/align.rs b/src/unix/linux_like/linux/musl/b32/x86/align.rs index b203d7e8c8..707d113cf7 100644 --- a/src/unix/linux_like/linux/musl/b32/x86/align.rs +++ b/src/unix/linux_like/linux/musl/b32/x86/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(8))] -pub struct max_align_t([f64; 3]); +s! { + #[repr(align(8))] + pub struct max_align_t([f64; 3]); +} diff --git a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs index a71235ab29..9531ca4f8b 100644 --- a/src/unix/linux_like/linux/musl/b64/aarch64/align.rs +++ b/src/unix/linux_like/linux/musl/b64/aarch64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f32; 8]); +s! { + #[repr(align(16))] + pub struct max_align_t([f32; 8]); +} 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 index 7fffedbf96..33a0bc5daf 100644 --- a/src/unix/linux_like/linux/musl/b64/x86_64/align.rs +++ b/src/unix/linux_like/linux/musl/b64/x86_64/align.rs @@ -1,3 +1,4 @@ -#[derive(Copy, Clone, Debug, PartialEq)] -#[repr(C, align(16))] -pub struct max_align_t([f64; 4]); +s! { + #[repr(align(16))] + pub struct max_align_t([f64; 4]); +} diff --git a/src/windows/gnu/align.rs b/src/windows/gnu/align.rs index dd3a3f72d3..5459791ab3 100644 --- a/src/windows/gnu/align.rs +++ b/src/windows/gnu/align.rs @@ -1,9 +1,11 @@ cfg_if! { if #[cfg(target_pointer_width = "64")] { - #[derive(Copy, Clone, Debug, PartialEq)] - #[repr(C, align(16))] pub struct max_align_t([f64; 4]); + s! { + #[repr(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]); + s! { + #[repr(align(16))] pub struct max_align_t([i64; 6]); + } } } -- cgit v1.2.1