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/context.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/context.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index 2b76bfdb5ec..712431ca9ae 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -859,7 +859,10 @@ impl<'ll> CodegenCx<'ll, '_> { // This isn't an "LLVM intrinsic", but LLVM's optimization passes // recognize it like one and we assume it exists in `core::slice::cmp` - ifn!("memcmp", fn(i8p, i8p, t_isize) -> t_i32); + match self.sess().target.arch.as_str() { + "avr" | "msp430" => ifn!("memcmp", fn(i8p, i8p, t_isize) -> t_i16), + _ => ifn!("memcmp", fn(i8p, i8p, t_isize) -> t_i32), + } // variadic intrinsics ifn!("llvm.va_start", fn(i8p) -> void); |