rust-lang
diff --git a/‎src/librustc_target/abi/call.rs
-214 b/‎src/librustc_target/abi/call.rs
-214
diff --git a/‎src/librustc_trans/cabi_aarch64.rs ‎src/librustc_target/abi/call/aarch64.rs
+2-2 b/‎src/librustc_trans/cabi_aarch64.rs ‎src/librustc_target/abi/call/aarch64.rs
+2-2
diff --git a/‎src/librustc_trans/cabi_arm.rs ‎src/librustc_target/abi/call/arm.rs
+4-5 b/‎src/librustc_trans/cabi_arm.rs ‎src/librustc_target/abi/call/arm.rs
+4-5
diff --git a/‎src/librustc_trans/cabi_asmjs.rs ‎src/librustc_target/abi/call/asmjs.rs
+2-2 b/‎src/librustc_trans/cabi_asmjs.rs ‎src/librustc_target/abi/call/asmjs.rs
+2-2
diff --git a/‎src/librustc_trans/cabi_hexagon.rs ‎src/librustc_target/abi/call/hexagon.rs
+1-1 b/‎src/librustc_trans/cabi_hexagon.rs ‎src/librustc_target/abi/call/hexagon.rs
+1-1
diff --git a/‎src/librustc_trans/cabi_mips.rs ‎src/librustc_target/abi/call/mips.rs
+2-3 b/‎src/librustc_trans/cabi_mips.rs ‎src/librustc_target/abi/call/mips.rs
+2-3
diff --git a/‎src/librustc_trans/cabi_mips64.rs ‎src/librustc_target/abi/call/mips64.rs
+2-2 b/‎src/librustc_trans/cabi_mips64.rs ‎src/librustc_target/abi/call/mips64.rs
+2-2
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use abi::{FnType, ArgType, LayoutExt, Reg, RegKind, Uniform};
-use rustc_target::abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
+use abi::call::{FnType, ArgType, Reg, RegKind, Uniform};
+use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
 
 fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
                                      -> Option<Uniform> 
 
@@ -8,10 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use abi::{FnType, ArgType, LayoutExt, Reg, RegKind, Uniform};
-use rustc_target::abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
-use rustc_target::spec::HasTargetSpec;
-use llvm::CallConv;
+use abi::call::{Conv, FnType, ArgType, Reg, RegKind, Uniform};
+use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
+use spec::HasTargetSpec;
 
 fn is_homogeneous_aggregate<'a, Ty, C>(cx: C, arg: &mut ArgType<'a, Ty>)
                                      -> Option<Uniform> 
@@ -109,7 +108,7 @@ pub fn compute_abi_info<'a, Ty, C>(cx: C, fty: &mut FnType<'a, Ty>)
     // If this is a target with a hard-float ABI, and the function is not explicitly
     // `extern "aapcs"`, then we must use the VFP registers for homogeneous aggregates.
     let vfp = cx.target_spec().llvm_target.ends_with("hf")
-        && fty.cconv != CallConv::ArmAapcsCallConv
+        && fty.conv != Conv::ArmAapcs
         && !fty.variadic;
 
     if !fty.ret.is_ignore() {
 
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use abi::{FnType, ArgType, LayoutExt, Uniform};
-use rustc_target::abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
+use abi::call::{FnType, ArgType, Uniform};
+use abi::{HasDataLayout, LayoutOf, TyLayout, TyLayoutMethods};
 
 // Data layout: e-p:32:32-i64:64-v128:32:128-n32-S128
 
 
@@ -10,7 +10,7 @@
 
 #![allow(non_upper_case_globals)]
 
-use abi::{FnType, ArgType, LayoutExt};
+use abi::call::{FnType, ArgType};
 
 fn classify_ret_ty<Ty>(ret: &mut ArgType<Ty>) {
     if ret.layout.is_aggregate() && ret.layout.size.bits() > 64 {
 
@@ -8,9 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use abi::{ArgType, FnType, LayoutExt, Reg, Uniform};
-
-use rustc_target::abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods};
+use abi::call::{ArgType, FnType, Reg, Uniform};
+use abi::{HasDataLayout, LayoutOf, Size, TyLayoutMethods};
 
 fn classify_ret_ty<'a, Ty, C>(cx: C, ret: &mut ArgType<Ty>, offset: &mut Size)
     where Ty: TyLayoutMethods<'a, C>, C: LayoutOf<Ty = Ty> + HasDataLayout
 
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use abi::{ArgAttribute, ArgType, CastTarget, FnType, LayoutExt, PassMode, Reg, RegKind, Uniform};
-use rustc_target::abi::{self, HasDataLayout, LayoutOf, Size, TyLayout, TyLayoutMethods};
+use abi::call::{ArgAttribute, ArgType, CastTarget, FnType, PassMode, Reg, RegKind, Uniform};
+use abi::{self, HasDataLayout, LayoutOf, Size, TyLayout, TyLayoutMethods};
 
 fn extend_integer_width_mips<Ty>(arg: &mut ArgType<Ty>, bits: u64) {
     // Always sign extend u32 values on 64-bit mips