From 01ca4a4a8fc254b27a59db8cad8a959023ad500a Mon Sep 17 00:00:00 2001 From: Andreas Schwab <schwab@suse.de> Date: Tue, 7 Jan 2020 12:38:45 +0100 Subject: [PATCH] Fix alignment of struct pthread_mutexattr_t for riscv64-linux-gnu --- src/unix/linux_like/linux/align.rs | 6 ++++-- src/unix/linux_like/linux/no_align.rs | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/unix/linux_like/linux/align.rs b/src/unix/linux_like/linux/align.rs index 6000b416..09bf8c85 100644 --- a/src/unix/linux_like/linux/align.rs +++ b/src/unix/linux_like/linux/align.rs @@ -7,7 +7,8 @@ macro_rules! expand_align { target_arch = "mips64", target_arch = "s390x", target_arch = "sparc64", - target_arch = "aarch64"), + target_arch = "aarch64", + target_arch = "riscv64"), repr(align(4)))] #[cfg_attr(not(any(target_pointer_width = "32", target_arch = "x86_64", @@ -15,7 +16,8 @@ macro_rules! expand_align { target_arch = "mips64", target_arch = "s390x", target_arch = "sparc64", - target_arch = "aarch64")), + target_arch = "aarch64", + target_arch = "riscv64")), repr(align(8)))] pub struct pthread_mutexattr_t { #[doc(hidden)] diff --git a/src/unix/linux_like/linux/no_align.rs b/src/unix/linux_like/linux/no_align.rs index 13c2b71c..a59edcb9 100644 --- a/src/unix/linux_like/linux/no_align.rs +++ b/src/unix/linux_like/linux/no_align.rs @@ -7,6 +7,7 @@ macro_rules! expand_align { target_arch = "mips64", target_arch = "s390x", target_arch = "sparc64", + target_arch = "riscv64", all(target_arch = "aarch64", target_env = "musl")))] __align: [::c_int; 0], @@ -15,6 +16,7 @@ macro_rules! expand_align { target_arch = "mips64", target_arch = "s390x", target_arch = "sparc64", + target_arch = "riscv64", all(target_arch = "aarch64", target_env = "musl"))))] __align: [::c_long; 0], -- GitLab