diff options
| author | Colin Cross <ccross@android.com> | 2023-01-27 04:51:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-27 04:51:12 +0000 |
| commit | 412bfb318d6cd74bf62df6fac64bc00bc242b40f (patch) | |
| tree | 1cdb2f92e3bff97399b5439e86dcdd780bdb99ea | |
| parent | 33e71d2baf5aa8a8f14bd3dc449ef85a7850630d (diff) | |
| parent | c2cb71b15fd8e160ba602f5210355207d3a0af6d (diff) | |
| download | libc-412bfb318d6cd74bf62df6fac64bc00bc242b40f.tar.gz | |
Fix compile error for riscv64-linux-android am: f00ddafb90 am: 0523919514 am: c2cb71b15f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libc/+/2404992
Change-Id: I64b7939a0a0e4edde6539341b37a798786f7d334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/musl_build_fix.patch | 23 | ||||
| -rw-r--r-- | src/unix/linux_like/android/b64/riscv64/mod.rs | 12 |
2 files changed, 29 insertions, 6 deletions
diff --git a/patches/musl_build_fix.patch b/patches/musl_build_fix.patch new file mode 100644 index 00000000..6d0be1c9 --- /dev/null +++ b/patches/musl_build_fix.patch @@ -0,0 +1,23 @@ +diff --git a/src/unix/linux_like/android/b64/riscv64/mod.rs b/src/unix/linux_like/android/b64/riscv64/mod.rs +index 2421792c..a4389ebf 100644 +--- a/src/unix/linux_like/android/b64/riscv64/mod.rs ++++ b/src/unix/linux_like/android/b64/riscv64/mod.rs +@@ -60,12 +60,12 @@ pub const SIGSTKSZ: ::size_t = 8192; + pub const MINSIGSTKSZ: ::size_t = 2048; + + // From NDK's asm/hwcap.h +-pub const COMPAT_HWCAP_ISA_I: ::c_ulong = 1 << ('I' - 'A'); +-pub const COMPAT_HWCAP_ISA_M: ::c_ulong = 1 << ('M' - 'A'); +-pub const COMPAT_HWCAP_ISA_A: ::c_ulong = 1 << ('A' - 'A'); +-pub const COMPAT_HWCAP_ISA_F: ::c_ulong = 1 << ('F' - 'A'); +-pub const COMPAT_HWCAP_ISA_D: ::c_ulong = 1 << ('D' - 'A'); +-pub const COMPAT_HWCAP_ISA_C: ::c_ulong = 1 << ('C' - 'A'); ++pub const COMPAT_HWCAP_ISA_I: ::c_ulong = 1 << (b'I' - b'A'); ++pub const COMPAT_HWCAP_ISA_M: ::c_ulong = 1 << (b'M' - b'A'); ++pub const COMPAT_HWCAP_ISA_A: ::c_ulong = 1 << (b'A' - b'A'); ++pub const COMPAT_HWCAP_ISA_F: ::c_ulong = 1 << (b'F' - b'A'); ++pub const COMPAT_HWCAP_ISA_D: ::c_ulong = 1 << (b'D' - b'A'); ++pub const COMPAT_HWCAP_ISA_C: ::c_ulong = 1 << (b'C' - b'A'); + + pub const SYS_io_setup: ::c_long = 0; + pub const SYS_io_destroy: ::c_long = 1; diff --git a/src/unix/linux_like/android/b64/riscv64/mod.rs b/src/unix/linux_like/android/b64/riscv64/mod.rs index 2421792c..a4389ebf 100644 --- a/src/unix/linux_like/android/b64/riscv64/mod.rs +++ b/src/unix/linux_like/android/b64/riscv64/mod.rs @@ -60,12 +60,12 @@ pub const SIGSTKSZ: ::size_t = 8192; pub const MINSIGSTKSZ: ::size_t = 2048; // From NDK's asm/hwcap.h -pub const COMPAT_HWCAP_ISA_I: ::c_ulong = 1 << ('I' - 'A'); -pub const COMPAT_HWCAP_ISA_M: ::c_ulong = 1 << ('M' - 'A'); -pub const COMPAT_HWCAP_ISA_A: ::c_ulong = 1 << ('A' - 'A'); -pub const COMPAT_HWCAP_ISA_F: ::c_ulong = 1 << ('F' - 'A'); -pub const COMPAT_HWCAP_ISA_D: ::c_ulong = 1 << ('D' - 'A'); -pub const COMPAT_HWCAP_ISA_C: ::c_ulong = 1 << ('C' - 'A'); +pub const COMPAT_HWCAP_ISA_I: ::c_ulong = 1 << (b'I' - b'A'); +pub const COMPAT_HWCAP_ISA_M: ::c_ulong = 1 << (b'M' - b'A'); +pub const COMPAT_HWCAP_ISA_A: ::c_ulong = 1 << (b'A' - b'A'); +pub const COMPAT_HWCAP_ISA_F: ::c_ulong = 1 << (b'F' - b'A'); +pub const COMPAT_HWCAP_ISA_D: ::c_ulong = 1 << (b'D' - b'A'); +pub const COMPAT_HWCAP_ISA_C: ::c_ulong = 1 << (b'C' - b'A'); pub const SYS_io_setup: ::c_long = 0; pub const SYS_io_destroy: ::c_long = 1; |