From 322f3a3eaac6cbaa3b1e85bca0402d0ff2b6779f Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Sun, 24 Apr 2016 17:43:26 -0400 Subject: [PATCH 1/3] rustc: update Cargo.lock --- src/rustc/Cargo.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rustc/Cargo.lock b/src/rustc/Cargo.lock index a3b0c885d693..1fa4d5398f48 100644 --- a/src/rustc/Cargo.lock +++ b/src/rustc/Cargo.lock @@ -75,6 +75,7 @@ dependencies = [ "rustc_bitflags 0.0.0", "rustc_const_math 0.0.0", "rustc_data_structures 0.0.0", + "rustc_llvm 0.0.0", "serialize 0.0.0", "syntax 0.0.0", ] From 8c65ef7fa075ccd0cbc0b39675f85c2f96f6f3e8 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Fri, 17 Jul 2015 22:03:52 -0400 Subject: [PATCH 2/3] librustc_back: remove explicit linker "cc" is already the default. --- src/librustc_back/target/apple_base.rs | 1 - src/librustc_back/target/bitrig_base.rs | 1 - src/librustc_back/target/dragonfly_base.rs | 1 - src/librustc_back/target/freebsd_base.rs | 1 - src/librustc_back/target/netbsd_base.rs | 1 - src/librustc_back/target/openbsd_base.rs | 1 - src/librustc_back/target/solaris_base.rs | 1 - 7 files changed, 7 deletions(-) diff --git a/src/librustc_back/target/apple_base.rs b/src/librustc_back/target/apple_base.rs index ffcb6f971ae2..b97bc6757e3c 100644 --- a/src/librustc_back/target/apple_base.rs +++ b/src/librustc_back/target/apple_base.rs @@ -35,7 +35,6 @@ pub fn opts() -> TargetOptions { TargetOptions { // OSX has -dead_strip, which doesn't rely on ffunction_sections function_sections: false, - linker: "cc".to_string(), dynamic_linking: true, executables: true, is_like_osx: true, diff --git a/src/librustc_back/target/bitrig_base.rs b/src/librustc_back/target/bitrig_base.rs index 8eed36f99155..7baf80066b27 100644 --- a/src/librustc_back/target/bitrig_base.rs +++ b/src/librustc_back/target/bitrig_base.rs @@ -13,7 +13,6 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), dynamic_linking: true, executables: true, linker_is_gnu: true, diff --git a/src/librustc_back/target/dragonfly_base.rs b/src/librustc_back/target/dragonfly_base.rs index f05319a0cbeb..e2c4003a8b6e 100644 --- a/src/librustc_back/target/dragonfly_base.rs +++ b/src/librustc_back/target/dragonfly_base.rs @@ -13,7 +13,6 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), dynamic_linking: true, executables: true, linker_is_gnu: true, diff --git a/src/librustc_back/target/freebsd_base.rs b/src/librustc_back/target/freebsd_base.rs index f05319a0cbeb..e2c4003a8b6e 100644 --- a/src/librustc_back/target/freebsd_base.rs +++ b/src/librustc_back/target/freebsd_base.rs @@ -13,7 +13,6 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), dynamic_linking: true, executables: true, linker_is_gnu: true, diff --git a/src/librustc_back/target/netbsd_base.rs b/src/librustc_back/target/netbsd_base.rs index bf6a2e1ce756..cc03ed56aa4d 100644 --- a/src/librustc_back/target/netbsd_base.rs +++ b/src/librustc_back/target/netbsd_base.rs @@ -13,7 +13,6 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), dynamic_linking: true, executables: true, linker_is_gnu: true, diff --git a/src/librustc_back/target/openbsd_base.rs b/src/librustc_back/target/openbsd_base.rs index d3db0e48771d..7afdfcd69113 100644 --- a/src/librustc_back/target/openbsd_base.rs +++ b/src/librustc_back/target/openbsd_base.rs @@ -13,7 +13,6 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), dynamic_linking: true, executables: true, linker_is_gnu: true, diff --git a/src/librustc_back/target/solaris_base.rs b/src/librustc_back/target/solaris_base.rs index 4ffa0c69da9b..a7af0462e570 100644 --- a/src/librustc_back/target/solaris_base.rs +++ b/src/librustc_back/target/solaris_base.rs @@ -13,7 +13,6 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), dynamic_linking: true, executables: true, has_rpath: true, From 847d195e3c80e9de4f4acb141884f2fd12c9263d Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Mon, 20 Jul 2015 10:38:54 -0400 Subject: [PATCH 3/3] librustc_back: fix typo --- src/librustc_back/target/apple_base.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc_back/target/apple_base.rs b/src/librustc_back/target/apple_base.rs index b97bc6757e3c..70c7ea99e13d 100644 --- a/src/librustc_back/target/apple_base.rs +++ b/src/librustc_back/target/apple_base.rs @@ -33,7 +33,7 @@ pub fn opts() -> TargetOptions { }).unwrap_or((10, 7)); TargetOptions { - // OSX has -dead_strip, which doesn't rely on ffunction_sections + // OSX has -dead_strip, which doesn't rely on function_sections function_sections: false, dynamic_linking: true, executables: true,