diff options
| author | bors <bors@rust-lang.org> | 2013-02-04 15:39:10 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-04 15:39:10 -0800 |
| commit | 3c6b9c2363a70a359e8d4b3a111baaa8ec8dabda (patch) | |
| tree | a8eedfd33e662f0c49baa605ecba1fb933934c64 | |
| parent | eb28ce01ed9ac27dfb568feff7c9d669eece1980 (diff) | |
| parent | 6105f09cc163ab728ff0ef18d4f817ad1a34bfb3 (diff) | |
| download | rust-3c6b9c2363a70a359e8d4b3a111baaa8ec8dabda.tar.gz rust-3c6b9c2363a70a359e8d4b3a111baaa8ec8dabda.zip | |
automated merge
| -rw-r--r-- | src/librustc/middle/trans/foreign.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs index 3d441dc973a..9c2245411c6 100644 --- a/src/librustc/middle/trans/foreign.rs +++ b/src/librustc/middle/trans/foreign.rs @@ -42,7 +42,7 @@ use syntax::parse::token::special_idents; fn abi_info(arch: session::arch) -> cabi::ABIInfo { return match arch { - arch_x86_64 => x86_64_abi_info(), + arch_x86_64 | arch_arm => x86_64_abi_info(), _ => cabi::llvm_abi_info() } } |