mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rustup to rustc 1.39.0-nightly (2111aed0a 2019-08-17)

Browse Source
This commit is contained in:
bjorn3 2019-08-18 11:30:13 +02:00
parent 21141eb235
commit 43e68319fa
6 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_sysroot/build_sysroot.sh
View File

@ -28,7 +28,7 @@ fi
# Copy files to sysroot
mkdir -p sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
cp target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
cp -r target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
if [[ "$1" == "--release" ]]; then
channel='release'
@ -39,4 +39,4 @@ else
fi
# Copy files to sysroot
cp sysroot_src/src/libtest/target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/
cp -r sysroot_src/src/libtest/target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/

1
src/base.rs
View File

@ -490,7 +490,6 @@ fn trans_stmt<'a, 'tcx: 'a>(
alignstack, // bool
dialect: _, // syntax::ast::AsmDialect
asm_str_style: _,
ctxt: _,
} = asm;
match &*asm_code.as_str() {
"cpuid" | "cpuid\n" => {

3
src/constant.rs
View File

@ -154,7 +154,6 @@ fn trans_const_place<'a, 'tcx: 'a>(
let op = ecx.eval_operand(
&Operand::Constant(Box::new(Constant {
span: DUMMY_SP,
ty: const_.ty,
user_ty: None,
literal: const_,
})),
@ -391,7 +390,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
_: mir::BinOp,
_: ImmTy<'tcx>,
_: ImmTy<'tcx>,
) -> InterpResult<'tcx, (Scalar, bool)> {
) -> InterpResult<'tcx, (Scalar, bool, Ty<'tcx>)> {
panic!();
}

8
src/intrinsics.rs
View File

@ -466,12 +466,12 @@ pub fn codegen_intrinsic_call<'a, 'tcx: 'a>(
);
ret.write_cvalue(fx, res);
};
_ if intrinsic.starts_with("overflowing_"), (c x, c y) {
_ if intrinsic.starts_with("wrapping_"), (c x, c y) {
assert_eq!(x.layout().ty, y.layout().ty);
let bin_op = match intrinsic {
"overflowing_add" => BinOp::Add,
"overflowing_sub" => BinOp::Sub,
"overflowing_mul" => BinOp::Mul,
"wrapping_add" => BinOp::Add,
"wrapping_sub" => BinOp::Sub,
"wrapping_mul" => BinOp::Mul,
_ => unimplemented!("intrinsic {}", intrinsic),
};
let res = crate::num::trans_int_binop(

2
src/main_shim.rs
View File

@ -20,7 +20,7 @@ pub fn maybe_create_entry_wrapper(
None => return,
};
create_entry_fn(tcx, module, main_def_id, use_start_lang_item);;
create_entry_fn(tcx, module, main_def_id, use_start_lang_item);
fn create_entry_fn(
tcx: TyCtxt<'_>,

2
src/num.rs
View File

@ -310,7 +310,7 @@ pub fn trans_ptr_binop<'a, 'tcx: 'a>(
let lhs = in_lhs.load_scalar(fx);
let rhs = in_rhs.load_scalar(fx);
return codegen_compare_bin_op(fx, bin_op, false, lhs, rhs);;
return codegen_compare_bin_op(fx, bin_op, false, lhs, rhs);
}
BinOp::Offset => {
let (base, offset) = (in_lhs, in_rhs.load_scalar(fx));