rust-lang · japaric · Oct 6, 2016 · Oct 6, 2016 · Oct 6, 2016 · Oct 6, 2016
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,20 @@
 [package]
 authors = ["Jorge Aparicio <[email protected]>"]
 build = "build.rs"
-name = "rustc_builtins"
-version = "0.1.0"
+name = "compiler_builtins"
+version = "0.0.0"
+
+[lib]
+name = "compiler_builtins"
+path = "lib.rs"
 
 [build-dependencies]
-gcc = "0.3.35"
+gcc = "0.3.27"
 rustc-cfg = "0.2.0"
 
-[dependencies]
+[dependencies.core]
+optional = true
+path = "../libcore"
 
 [dependencies.rlibc]
 git = "https://github.com/alexcrichton/rlibc"
@@ -23,6 +29,8 @@ compiler-rt = { path = "compiler-rt" }
 [features]
 # Build the missing intrinsics from compiler-rt C source code
 c = []
+# for integration into rust-lang/rust
+rustbuild = ["core"]
 weak = ["rlibc/weak"]
 
 [workspace]
diff --git a/src/arm.rs → arm.rs b/src/arm.rs → arm.rs
diff --git a/src/bin/intrinsics.rs → bin/intrinsics.rs b/src/bin/intrinsics.rs → bin/intrinsics.rs
diff --git a/src/float/add.rs → float/add.rs b/src/float/add.rs → float/add.rs
diff --git a/src/float/mod.rs → float/mod.rs b/src/float/mod.rs → float/mod.rs
diff --git a/src/float/pow.rs → float/pow.rs b/src/float/pow.rs → float/pow.rs
diff --git a/src/int/mod.rs → int/mod.rs b/src/int/mod.rs → int/mod.rs
diff --git a/src/int/mul.rs → int/mul.rs b/src/int/mul.rs → int/mul.rs
diff --git a/src/int/sdiv.rs → int/sdiv.rs b/src/int/sdiv.rs → int/sdiv.rs
diff --git a/src/int/shift.rs → int/shift.rs b/src/int/shift.rs → int/shift.rs
diff --git a/src/int/udiv.rs → int/udiv.rs b/src/int/udiv.rs → int/udiv.rs
diff --git a/src/lib.rs → lib.rs b/src/lib.rs → lib.rs
@@ -1,3 +1,5 @@
+#![crate_name = "compiler_builtins"]
+#![crate_type = "rlib"]
 #![feature(asm)]
 #![feature(core_intrinsics)]
 #![feature(linkage)]

diff --git a/src/qc.rs → qc.rs b/src/qc.rs → qc.rs
diff --git a/src/x86_64.rs → x86_64.rs b/src/x86_64.rs → x86_64.rs