From 2ac7ce57fa750c1be16d71399e247e08c1ee06fd Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 5 Oct 2016 19:13:49 -0500 Subject: [PATCH 1/6] downgrade gcc --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c198d9f3c..3da6f17b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ name = "rustc_builtins" version = "0.1.0" [build-dependencies] -gcc = "0.3.35" +gcc = "0.3.27" rustc-cfg = "0.2.0" [dependencies] From 0bbcdfc6d0ba07d8e0b7f9a79b3790e428083999 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 5 Oct 2016 19:15:03 -0500 Subject: [PATCH 2/6] rename this crate to compiler_builtins --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3da6f17b6..ecb86fec1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Jorge Aparicio "] build = "build.rs" -name = "rustc_builtins" +name = "compiler_builtins" version = "0.1.0" [build-dependencies] From ef48875ec6850b3af6cc6fb1ac17788249b6d6ba Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 5 Oct 2016 19:19:11 -0500 Subject: [PATCH 3/6] change version to 0.0.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index ecb86fec1..4a9d0d63d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ authors = ["Jorge Aparicio "] build = "build.rs" name = "compiler_builtins" -version = "0.1.0" +version = "0.0.0" [build-dependencies] gcc = "0.3.27" From 2a371bb4bfe1fee75754ecef8302f3b3a23fe24f Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 5 Oct 2016 19:32:16 -0500 Subject: [PATCH 4/6] add rustbuild feature --- Cargo.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4a9d0d63d..c42fc77e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,9 @@ version = "0.0.0" 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 +25,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] From e20d2b961050015088a7cb4d7fb5896ac30b5d68 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 5 Oct 2016 21:27:35 -0500 Subject: [PATCH 5/6] mv src/* . --- Cargo.toml | 4 ++++ src/arm.rs => arm.rs | 0 {src/bin => bin}/intrinsics.rs | 0 {src/float => float}/add.rs | 0 {src/float => float}/mod.rs | 0 {src/float => float}/pow.rs | 0 {src/int => int}/mod.rs | 0 {src/int => int}/mul.rs | 0 {src/int => int}/sdiv.rs | 0 {src/int => int}/shift.rs | 0 {src/int => int}/udiv.rs | 0 src/lib.rs => lib.rs | 0 src/qc.rs => qc.rs | 0 src/x86_64.rs => x86_64.rs | 0 14 files changed, 4 insertions(+) rename src/arm.rs => arm.rs (100%) rename {src/bin => bin}/intrinsics.rs (100%) rename {src/float => float}/add.rs (100%) rename {src/float => float}/mod.rs (100%) rename {src/float => float}/pow.rs (100%) rename {src/int => int}/mod.rs (100%) rename {src/int => int}/mul.rs (100%) rename {src/int => int}/sdiv.rs (100%) rename {src/int => int}/shift.rs (100%) rename {src/int => int}/udiv.rs (100%) rename src/lib.rs => lib.rs (100%) rename src/qc.rs => qc.rs (100%) rename src/x86_64.rs => x86_64.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index c42fc77e1..0f384bcaa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,10 @@ build = "build.rs" name = "compiler_builtins" version = "0.0.0" +[lib] +name = "compiler_builtins" +path = "lib.rs" + [build-dependencies] gcc = "0.3.27" rustc-cfg = "0.2.0" diff --git a/src/arm.rs b/arm.rs similarity index 100% rename from src/arm.rs rename to arm.rs diff --git a/src/bin/intrinsics.rs b/bin/intrinsics.rs similarity index 100% rename from src/bin/intrinsics.rs rename to bin/intrinsics.rs diff --git a/src/float/add.rs b/float/add.rs similarity index 100% rename from src/float/add.rs rename to float/add.rs diff --git a/src/float/mod.rs b/float/mod.rs similarity index 100% rename from src/float/mod.rs rename to float/mod.rs diff --git a/src/float/pow.rs b/float/pow.rs similarity index 100% rename from src/float/pow.rs rename to float/pow.rs diff --git a/src/int/mod.rs b/int/mod.rs similarity index 100% rename from src/int/mod.rs rename to int/mod.rs diff --git a/src/int/mul.rs b/int/mul.rs similarity index 100% rename from src/int/mul.rs rename to int/mul.rs diff --git a/src/int/sdiv.rs b/int/sdiv.rs similarity index 100% rename from src/int/sdiv.rs rename to int/sdiv.rs diff --git a/src/int/shift.rs b/int/shift.rs similarity index 100% rename from src/int/shift.rs rename to int/shift.rs diff --git a/src/int/udiv.rs b/int/udiv.rs similarity index 100% rename from src/int/udiv.rs rename to int/udiv.rs diff --git a/src/lib.rs b/lib.rs similarity index 100% rename from src/lib.rs rename to lib.rs diff --git a/src/qc.rs b/qc.rs similarity index 100% rename from src/qc.rs rename to qc.rs diff --git a/src/x86_64.rs b/x86_64.rs similarity index 100% rename from src/x86_64.rs rename to x86_64.rs From dde99c72eca30f349d24638941c57bc63cb483bb Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 5 Oct 2016 21:30:07 -0500 Subject: [PATCH 6/6] set crate_name and crate_type --- lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib.rs b/lib.rs index acc56c98a..34d786ca7 100644 --- a/lib.rs +++ b/lib.rs @@ -1,3 +1,5 @@ +#![crate_name = "compiler_builtins"] +#![crate_type = "rlib"] #![feature(asm)] #![feature(core_intrinsics)] #![feature(linkage)]