Skip to content

crate-ify compiler-rt into compiler-builtins #35021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 14, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Link test to compiler builtins and make unstable
This commit fixes a test which now needs to explicitly link to the
`compiler_builtins` crate as well as makes the `compiler_builtins` crate
unstable.
  • Loading branch information
alexcrichton committed Sep 13, 2016
commit 848cfe20a01b3d43d4c9838bd7d9b0da32dace42
5 changes: 4 additions & 1 deletion src/libcompiler_builtins/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
#![cfg_attr(not(stage0), feature(compiler_builtins))]
#![no_std]
#![cfg_attr(not(stage0), compiler_builtins)]

#![unstable(feature = "compiler_builtins_lib",
reason = "internal implementation detail of rustc right now",
issue = "0")]
#![crate_name = "compiler_builtins"]
#![crate_type = "rlib"]
#![feature(staged_api)]
1 change: 1 addition & 0 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
#![feature(char_internals)]
#![feature(collections)]
#![feature(collections_bound)]
#![feature(compiler_builtins_lib)]
#![feature(const_fn)]
#![feature(core_float)]
#![feature(core_intrinsics)]
Expand Down
3 changes: 2 additions & 1 deletion src/test/run-make/no-duplicate-libs/bar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(lang_items, libc)]
#![feature(lang_items, libc, compiler_builtins_lib)]
#![crate_type = "dylib"]
#![no_std]

extern crate libc;
extern crate compiler_builtins;

#[no_mangle]
pub extern fn bar() {}
Expand Down
3 changes: 2 additions & 1 deletion src/test/run-make/no-duplicate-libs/foo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(lang_items, libc)]
#![feature(lang_items, libc, compiler_builtins_lib)]
#![no_std]
#![crate_type = "dylib"]

extern crate libc;
extern crate compiler_builtins;

#[no_mangle]
pub extern fn foo() {}
Expand Down