diff options
| author | bors <bors@rust-lang.org> | 2016-08-01 08:57:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-01 08:57:32 -0700 |
| commit | 28ce3e8a55b21a285f7075612d140a44b42eb889 (patch) | |
| tree | 620b274d225d0b64e48494fb234f16d43a2469c3 /src/librustc_back | |
| parent | 2c1612c62aa59e40cf1a4bddde943938e0147eec (diff) | |
| parent | 5fb13cf13fd76cc475816d12f729d4df7bd12f33 (diff) | |
| download | rust-28ce3e8a55b21a285f7075612d140a44b42eb889.tar.gz rust-28ce3e8a55b21a285f7075612d140a44b42eb889.zip | |
Auto merge of #35163 - sanxiyn:rollup, r=sanxiyn
Rollup of 8 pull requests - Successful merges: #34802, #35033, #35085, #35114, #35134, #35140, #35141, #35157 - Failed merges:
Diffstat (limited to 'src/librustc_back')
| -rw-r--r-- | src/librustc_back/target/x86_64_rumprun_netbsd.rs | 1 | ||||
| -rw-r--r-- | src/librustc_back/target/x86_64_unknown_bitrig.rs | 1 | ||||
| -rw-r--r-- | src/librustc_back/target/x86_64_unknown_netbsd.rs | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/librustc_back/target/x86_64_rumprun_netbsd.rs b/src/librustc_back/target/x86_64_rumprun_netbsd.rs index 537d15f4603..fd6578c2a2a 100644 --- a/src/librustc_back/target/x86_64_rumprun_netbsd.rs +++ b/src/librustc_back/target/x86_64_rumprun_netbsd.rs @@ -12,6 +12,7 @@ use target::{Target, TargetResult}; pub fn target() -> TargetResult { let mut base = super::netbsd_base::opts(); + base.cpu = "x86-64".to_string(); base.pre_link_args.push("-m64".to_string()); base.linker = "x86_64-rumprun-netbsd-gcc".to_string(); base.ar = "x86_64-rumprun-netbsd-ar".to_string(); diff --git a/src/librustc_back/target/x86_64_unknown_bitrig.rs b/src/librustc_back/target/x86_64_unknown_bitrig.rs index 81710b99b80..38209655898 100644 --- a/src/librustc_back/target/x86_64_unknown_bitrig.rs +++ b/src/librustc_back/target/x86_64_unknown_bitrig.rs @@ -12,6 +12,7 @@ use target::{Target, TargetResult}; pub fn target() -> TargetResult { let mut base = super::bitrig_base::opts(); + base.cpu = "x86-64".to_string(); base.max_atomic_width = 64; base.pre_link_args.push("-m64".to_string()); diff --git a/src/librustc_back/target/x86_64_unknown_netbsd.rs b/src/librustc_back/target/x86_64_unknown_netbsd.rs index 5145e52d6b4..2d0b1e2a933 100644 --- a/src/librustc_back/target/x86_64_unknown_netbsd.rs +++ b/src/librustc_back/target/x86_64_unknown_netbsd.rs @@ -12,6 +12,7 @@ use target::{Target, TargetResult}; pub fn target() -> TargetResult { let mut base = super::netbsd_base::opts(); + base.cpu = "x86-64".to_string(); base.max_atomic_width = 64; base.pre_link_args.push("-m64".to_string()); |