diff options
| author | David Morrison <drmorr@evokewonder.com> | 2021-11-10 20:14:23 -0800 |
|---|---|---|
| committer | David Morrison <drmorr@evokewonder.com> | 2022-04-02 17:21:08 -0700 |
| commit | aa670166243e264985f95a21490f92c91addf48c (patch) | |
| tree | 10b46e2f285c1472fff7e506f97be809c0e6d1b5 /compiler/rustc_codegen_llvm/src/intrinsic.rs | |
| parent | 8f96ef4bb56f5d905ed89ed569ef97f50731c977 (diff) | |
| download | rust-aa670166243e264985f95a21490f92c91addf48c.tar.gz rust-aa670166243e264985f95a21490f92c91addf48c.zip | |
make memcmp return a value of c_int_width instead of i32
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/intrinsic.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/intrinsic.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs index 10df671baa2..fe149b4c8c2 100644 --- a/compiler/rustc_codegen_llvm/src/intrinsic.rs +++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs @@ -329,7 +329,10 @@ impl<'ll, 'tcx> IntrinsicCallMethods<'tcx> for Builder<'_, 'll, 'tcx> { let b_ptr = self.bitcast(b, i8p_ty); let n = self.const_usize(layout.size().bytes()); let cmp = self.call_intrinsic("memcmp", &[a_ptr, b_ptr, n]); - self.icmp(IntPredicate::IntEQ, cmp, self.const_i32(0)) + match self.cx.sess().target.arch.as_str() { + "avr" | "msp430" => self.icmp(IntPredicate::IntEQ, cmp, self.const_i16(0)), + _ => self.icmp(IntPredicate::IntEQ, cmp, self.const_i32(0)), + } } } |