Skip to content

Commit

Permalink
Allow setting target_family to multiple values
Browse files Browse the repository at this point in the history 
This enables us to set more generic labels shared between targets. For
example `target_family="wasm"` across all targets that are conceptually
"wasm".

See rust-lang/reference#1006
  • Loading branch information
@nagisa
nagisa committed Apr 10, 2021
1 parent 72c63de commit 4afea69
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 30 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_session/src/config.rs
View file
Expand Up @@ -813,7 +813,7 @@ pub fn default_configuration(sess: &Session) -> CrateConfig {
ret.reserve(6); // the minimum number of insertions
// Target bindings.
ret.insert((sym::target_os, Some(Symbol::intern(os))));
if let Some(ref fam) = sess.target.os_family {
for fam in &sess.target.families {
ret.insert((sym::target_family, Some(Symbol::intern(fam))));
if fam == "windows" {
ret.insert((sym::windows, None));
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/apple_base.rs
View file
Expand Up @@ -23,7 +23,7 @@ pub fn opts(os: &str) -> TargetOptions {
function_sections: false,
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
is_like_osx: true,
dwarf_version: Some(2),
has_rpath: true,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/dragonfly_base.rs
View file
Expand Up @@ -5,7 +5,7 @@ pub fn opts() -> TargetOptions {
os: "dragonfly".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
linker_is_gnu: true,
has_rpath: true,
position_independent_executables: true,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/freebsd_base.rs
View file
Expand Up @@ -5,7 +5,7 @@ pub fn opts() -> TargetOptions {
os: "freebsd".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
linker_is_gnu: true,
has_rpath: true,
position_independent_executables: true,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/fuchsia_base.rs
View file
Expand Up @@ -25,7 +25,7 @@ pub fn opts() -> TargetOptions {
linker: Some("rust-lld".to_owned()),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
is_like_fuchsia: true,
linker_is_gnu: true,
pre_link_args,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/haiku_base.rs
View file
Expand Up @@ -5,7 +5,7 @@ pub fn opts() -> TargetOptions {
os: "haiku".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
relro_level: RelroLevel::Full,
linker_is_gnu: true,
..Default::default()
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/illumos_base.rs
View file
Expand Up @@ -20,7 +20,7 @@ pub fn opts() -> TargetOptions {
dynamic_linking: true,
executables: true,
has_rpath: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
is_like_solaris: true,
limit_rdylib_exports: false, // Linker doesn't support this
eliminate_frame_pointer: false,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/l4re_base.rs
View file
Expand Up @@ -20,7 +20,7 @@ pub fn opts() -> TargetOptions {
executables: true,
panic_strategy: PanicStrategy::Abort,
linker: Some("ld".to_string()),
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
..Default::default()
}
}
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/linux_base.rs
View file
Expand Up @@ -5,7 +5,7 @@ pub fn opts() -> TargetOptions {
os: "linux".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
linker_is_gnu: true,
has_rpath: true,
position_independent_executables: true,
Expand Down
32 changes: 19 additions & 13 deletions compiler/rustc_target/src/spec/mod.rs
View file
Expand Up @@ -1042,8 +1042,12 @@ pub struct TargetOptions {
pub staticlib_prefix: String,
/// String to append to the name of every static library. Defaults to ".a".
pub staticlib_suffix: String,
/// OS family to use for conditional compilation. Valid options: "unix", "windows".
pub os_family: Option<String>,
/// Values of the `target_family` cfg set for this target.
///
/// Common options are: "unix", "windows". Defaults to no families.
///
/// See https://doc.rust-lang.org/reference/conditional-compilation.html#target_family
pub families: Vec<String>,
/// Whether the target toolchain's ABI supports returning small structs as an integer.
pub abi_return_struct_as_int: bool,
/// Whether the target toolchain is like macOS's. Only useful for compiling against iOS/macOS,
Expand Down Expand Up @@ -1293,7 +1297,7 @@ impl Default for TargetOptions {
exe_suffix: String::new(),
staticlib_prefix: "lib".to_string(),
staticlib_suffix: ".a".to_string(),
os_family: None,
families: Vec::new(),
abi_return_struct_as_int: false,
is_like_osx: false,
is_like_solaris: false,
Expand Down Expand Up @@ -1605,14 +1609,6 @@ impl Target {
.map(|s| s.to_string() );
}
} );
($key_name:ident = $json_name:expr, optional) => ( {
let name = $json_name;
if let Some(o) = obj.find(name) {
base.$key_name = o
.as_string()
.map(|s| s.to_string() );
}
} );
($key_name:ident, LldFlavor) => ( {
let name = (stringify!($key_name)).replace("_", "-");
obj.find(&name[..]).and_then(|o| o.as_string().and_then(|s| {
Expand Down Expand Up @@ -1759,6 +1755,16 @@ impl Target {
Some(Ok(()))
})).unwrap_or(Ok(()))
} );
($key_name:ident, TargetFamilies) => ( {
let value = obj.find("target-family");
if let Some(v) = value.and_then(Json::as_array) {
base.$key_name = v.iter()
.map(|a| a.as_string().unwrap().to_string())
.collect();
} else if let Some(v) = value.and_then(Json::as_string) {
base.$key_name = vec![v.to_string()];
}
} );
}

if let Some(s) = obj.find("target-endian").and_then(Json::as_string) {
Expand Down Expand Up @@ -1802,7 +1808,7 @@ impl Target {
key!(exe_suffix);
key!(staticlib_prefix);
key!(staticlib_suffix);
key!(os_family = "target-family", optional);
key!(families, TargetFamilies);
key!(abi_return_struct_as_int, bool);
key!(is_like_osx, bool);
key!(is_like_solaris, bool);
Expand Down Expand Up @@ -2042,7 +2048,7 @@ impl ToJson for Target {
target_option_val!(exe_suffix);
target_option_val!(staticlib_prefix);
target_option_val!(staticlib_suffix);
target_option_val!(os_family, "target-family");
target_option_val!(families, "target-family");
target_option_val!(abi_return_struct_as_int);
target_option_val!(is_like_osx);
target_option_val!(is_like_solaris);
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/netbsd_base.rs
View file
Expand Up @@ -5,7 +5,7 @@ pub fn opts() -> TargetOptions {
os: "netbsd".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
linker_is_gnu: true,
no_default_libraries: false,
has_rpath: true,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/openbsd_base.rs
View file
Expand Up @@ -5,7 +5,7 @@ pub fn opts() -> TargetOptions {
os: "openbsd".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
linker_is_gnu: true,
has_rpath: true,
abi_return_struct_as_int: true,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/redox_base.rs
View file
Expand Up @@ -6,7 +6,7 @@ pub fn opts() -> TargetOptions {
env: "relibc".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
linker_is_gnu: true,
has_rpath: true,
position_independent_executables: true,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/solaris_base.rs
View file
Expand Up @@ -6,7 +6,7 @@ pub fn opts() -> TargetOptions {
dynamic_linking: true,
executables: true,
has_rpath: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
is_like_solaris: true,
limit_rdylib_exports: false, // Linker doesn't support this
eh_frame_header: false,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/vxworks_base.rs
View file
Expand Up @@ -9,7 +9,7 @@ pub fn opts() -> TargetOptions {
exe_suffix: ".vxe".to_string(),
dynamic_linking: true,
executables: true,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
linker_is_gnu: true,
has_rpath: true,
has_elf_tls: true,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/wasm32_unknown_emscripten.rs
View file
Expand Up @@ -38,7 +38,7 @@ pub fn target() -> Target {
is_like_emscripten: true,
panic_strategy: PanicStrategy::Unwind,
post_link_args,
os_family: Some("unix".to_string()),
families: vec!["unix".to_string()],
..options
};
Target {
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/windows_gnu_base.rs
View file
Expand Up @@ -71,7 +71,7 @@ pub fn opts() -> TargetOptions {
dll_prefix: String::new(),
dll_suffix: ".dll".to_string(),
exe_suffix: ".exe".to_string(),
os_family: Some("windows".to_string()),
families: vec!["windows".to_string()],
is_like_windows: true,
allows_weak_linkage: false,
pre_link_args,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/src/spec/windows_msvc_base.rs
View file
Expand Up @@ -13,7 +13,7 @@ pub fn opts() -> TargetOptions {
exe_suffix: ".exe".to_string(),
staticlib_prefix: String::new(),
staticlib_suffix: ".lib".to_string(),
os_family: Some("windows".to_string()),
families: vec!["windows".to_string()],
crt_static_allows_dylibs: true,
crt_static_respected: true,
requires_uwtable: true,
Expand Down

0 comments on commit 4afea69

Please sign in to comment.