Skip to content

Rollup of 9 pull requests #51023

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 22 commits into from
May 24, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
32f9b53
NetBSD on EABI ARM does not use ARM EHABI
jakllsch May 18, 2018
908230e
Add armv7-unknown-netbsd-eabihf target
jakllsch May 18, 2018
ec779b9
Add armv6-unknown-netbsd-eabihf target
jakllsch May 18, 2018
f6df174
rust-gdb: work around the re-used -d argument in cgdb
atopia May 22, 2018
599b79e
Make sure that queries have predictable symbol names.
michaelwoerister May 22, 2018
58bf6ac
Update LLVM to pull in another wasm fix
alexcrichton May 22, 2018
54f0668
Add -Z no-parallel-llvm flag
nikic May 22, 2018
d7086ca
Fix span for type-only arguments
Manishearth May 22, 2018
8d0fad5
Shrink `LiveNode`.
nnethercote May 22, 2018
1977c62
move type def out of unsafe block
fbstj May 23, 2018
e3d9f19
rustdoc: hide macro export statements from docs
QuietMisdreavus May 23, 2018
d19b5ed
update "pub-use-extern-macros" test to hide the regular import statement
QuietMisdreavus May 23, 2018
4cf0c5f
fix @!has conditions in pub-use-extern-macros test
QuietMisdreavus May 24, 2018
0bb7335
Rollup merge of #50864 - jakllsch:add-netbsd-arm-target-specs, r=alex…
kennytm May 24, 2018
02d53f2
Rollup merge of #50956 - atopia:rust-gdb-with-cdgb, r=nikomatsakis
kennytm May 24, 2018
4db2241
Rollup merge of #50964 - michaelwoerister:query-symbol-names, r=nikom…
kennytm May 24, 2018
eb26c9b
Rollup merge of #50965 - alexcrichton:update-llvm, r=TimNN
kennytm May 24, 2018
e14bc2d
Rollup merge of #50972 - nikic:no-parallel, r=michaelwoerister
kennytm May 24, 2018
6441ebe
Rollup merge of #50979 - Manishearth:type-only, r=estebank
kennytm May 24, 2018
79a2676
Rollup merge of #50981 - nnethercote:shrink-LiveNode, r=nikomatsakis
kennytm May 24, 2018
99de8ab
Rollup merge of #50995 - fbstj:patch-1, r=cramertj
kennytm May 24, 2018
98606cf
Rollup merge of #51011 - QuietMisdreavus:duplicitous-macros, r=ollie27
kennytm May 24, 2018
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
Next Next commit
Add armv6-unknown-netbsd-eabihf target
  • Loading branch information
jakllsch committed May 18, 2018
commit ec779b9f08a55a88b866d2c9d514cb104af5c052
1 change: 1 addition & 0 deletions src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,7 @@ impl Step for Openssl {
"arm-linux-androideabi" => "android",
"arm-unknown-linux-gnueabi" => "linux-armv4",
"arm-unknown-linux-gnueabihf" => "linux-armv4",
"armv6-unknown-netbsd-eabihf" => "BSD-generic32",
"armv7-linux-androideabi" => "android-armv7",
"armv7-unknown-linux-gnueabihf" => "linux-armv4",
"armv7-unknown-netbsd-eabihf" => "BSD-generic32",
Expand Down
34 changes: 34 additions & 0 deletions src/librustc_target/spec/armv6_unknown_netbsd_eabihf.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use spec::{LinkerFlavor, Target, TargetOptions, TargetResult};

pub fn target() -> TargetResult {
let mut base = super::netbsd_base::opts();
base.max_atomic_width = Some(64);
Ok(Target {
llvm_target: "armv6-unknown-netbsdelf-eabihf".to_string(),
target_endian: "little".to_string(),
target_pointer_width: "32".to_string(),
target_c_int_width: "32".to_string(),
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
arch: "arm".to_string(),
target_os: "netbsd".to_string(),
target_env: "eabihf".to_string(),
target_vendor: "unknown".to_string(),
linker_flavor: LinkerFlavor::Gcc,

options: TargetOptions {
features: "+v6,+vfp2".to_string(),
abi_blacklist: super::arm_base::abi_blacklist(),
.. base
}
})
}
1 change: 1 addition & 0 deletions src/librustc_target/spec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ supported_targets! {
("i686-unknown-openbsd", i686_unknown_openbsd),
("x86_64-unknown-openbsd", x86_64_unknown_openbsd),

("armv6-unknown-netbsd-eabihf", armv6_unknown_netbsd_eabihf),
("armv7-unknown-netbsd-eabihf", armv7_unknown_netbsd_eabihf),
("i686-unknown-netbsd", i686_unknown_netbsd),
("powerpc-unknown-netbsd", powerpc_unknown_netbsd),
Expand Down