Skip to content

Commit 4939bb2

Browse files
committed
Auto merge of #892 - EdSchouten:cloudabi-arm, r=alexcrichton
Minor fixes for CloudABI ARM support In the initial set of fixes for CloudABI, it looks like support for 32-bit ARM was left out, even though it is supported for C/C++. While there, fix up `c_char` for ARM64, which currently has the wrong sign.
2 parents 2b4cd10 + dad866d commit 4939bb2

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/cloudabi/aarch64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub type c_char = i8;
1+
pub type c_char = u8;
22
pub type c_long = i64;
33
pub type c_ulong = u64;
44
pub type wchar_t = u32;

src/cloudabi/arm.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
pub type c_char = u8;
2+
pub type c_long = i32;
3+
pub type c_ulong = u32;
4+
pub type wchar_t = u32;

src/cloudabi/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ cfg_if! {
151151
if #[cfg(target_arch = "aarch64")] {
152152
mod aarch64;
153153
pub use self::aarch64::*;
154+
} else if #[cfg(any(target_arch = "arm"))] {
155+
mod arm;
156+
pub use self::arm::*;
154157
} else if #[cfg(any(target_arch = "x86"))] {
155158
mod x86;
156159
pub use self::x86::*;

0 commit comments

Comments
 (0)