mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-28 01:34:21 +00:00
Update compiler_builtins
This commit is contained in:
parent
74c7a7b7c5
commit
8de317dd8f
@ -5,7 +5,7 @@ version = "0.0.0"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
core = { path = "./sysroot_src/src/libcore" }
|
core = { path = "./sysroot_src/src/libcore" }
|
||||||
compiler_builtins = "=0.1.20" # FIXME use "0.1" once libstd has updated for the latest version
|
compiler_builtins = "0.1"
|
||||||
alloc = { path = "./sysroot_src/src/liballoc" }
|
alloc = { path = "./sysroot_src/src/liballoc" }
|
||||||
std = { path = "./sysroot_src/src/libstd", features = ["panic_unwind", "backtrace"] }
|
std = { path = "./sysroot_src/src/libstd", features = ["panic_unwind", "backtrace"] }
|
||||||
test = { path = "./sysroot_src/src/libtest" }
|
test = { path = "./sysroot_src/src/libtest" }
|
||||||
|
@ -364,9 +364,21 @@ fn trans_mono_item<'clif, 'tcx, B: Backend + 'static>(
|
|||||||
MonoItem::Static(def_id) => {
|
MonoItem::Static(def_id) => {
|
||||||
crate::constant::codegen_static(&mut cx.constants_cx, def_id);
|
crate::constant::codegen_static(&mut cx.constants_cx, def_id);
|
||||||
}
|
}
|
||||||
MonoItem::GlobalAsm(node_id) => tcx
|
MonoItem::GlobalAsm(hir_id) => {
|
||||||
.sess
|
let item = tcx.hir().expect_item(hir_id);
|
||||||
.fatal(&format!("Unimplemented global asm mono item {:?}", node_id)),
|
if let rustc_hir::ItemKind::GlobalAsm(rustc_hir::GlobalAsm { asm }) = item.kind {
|
||||||
|
// FIXME implement global asm using an external assembler
|
||||||
|
if asm.as_str().contains("__rust_probestack") {
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
tcx
|
||||||
|
.sess
|
||||||
|
.fatal(&format!("Unimplemented global asm mono item \"{}\"", asm));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
bug!("Expected GlobalAsm found {:?}", item);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user