Skip to content

Commit

Permalink
Update #[no_core] users with the "freeze" lang item.
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyb committed Apr 21, 2017
1 parent 0adfd81 commit 89bd3f3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/bootstrap/compile.rs
Expand Up @@ -151,6 +151,7 @@ pub fn build_startup_objects(build: &Build, for_compiler: &Compiler, target: &st
if !up_to_date(src_file, dst_file) {
let mut cmd = Command::new(&compiler_path);
build.run(cmd.env("RUSTC_BOOTSTRAP", "1")
.arg("--cfg").arg(format!("stage{}", compiler.stage))
.arg("--target").arg(target)
.arg("--emit=obj")
.arg("--out-dir").arg(dst_dir)
Expand Down
7 changes: 5 additions & 2 deletions src/rtstartup/rsbegin.rs
Expand Up @@ -22,7 +22,7 @@
// object (usually called `crtX.o), which then invokes initialization callbacks
// of other runtime components (registered via yet another special image section).

#![feature(no_core, lang_items)]
#![feature(no_core, lang_items, optin_builtin_traits)]
#![crate_type="rlib"]
#![no_core]
#![allow(non_camel_case_types)]
Expand All @@ -31,9 +31,12 @@
trait Sized {}
#[lang = "sync"]
trait Sync {}
impl Sync for .. {}
#[lang = "copy"]
trait Copy {}
impl<T> Sync for T {}
#[cfg_attr(not(stage0), lang = "freeze")]
trait Freeze {}
impl Freeze for .. {}

#[cfg(all(target_os="windows", target_arch = "x86", target_env="gnu"))]
pub mod eh_frames {
Expand Down
6 changes: 5 additions & 1 deletion src/test/run-make/simd-ffi/simd.rs
Expand Up @@ -12,7 +12,7 @@
#![crate_type = "lib"]
// we can compile to a variety of platforms, because we don't need
// cross-compiled standard libraries.
#![feature(no_core)]
#![feature(no_core, optin_builtin_traits)]
#![no_core]

#![feature(repr_simd, simd_ffi, link_llvm_intrinsics, lang_items)]
Expand Down Expand Up @@ -78,3 +78,7 @@ pub trait Copy { }
pub mod marker {
pub use Copy;
}

#[lang = "freeze"]
trait Freeze {}
impl Freeze for .. {}
6 changes: 5 additions & 1 deletion src/test/run-make/target-specs/foo.rs
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(lang_items, no_core)]
#![feature(lang_items, no_core, optin_builtin_traits)]
#![no_core]

#[lang="copy"]
Expand All @@ -17,6 +17,10 @@ trait Copy { }
#[lang="sized"]
trait Sized { }

#[lang = "freeze"]
trait Freeze {}
impl Freeze for .. {}

#[lang="start"]
fn start(_main: *const u8, _argc: isize, _argv: *const *const u8) -> isize { 0 }

Expand Down

0 comments on commit 89bd3f3

Please sign in to comment.