user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustc_target: Inherit windows_uwp_gnu_base from windows_gnu_base

Browse source
This commit is contained in:
Vadim Petrochenkov 2020-04-11 17:07:39 +03:00
parent fd0e2987ed
commit 88c480279b
1 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/librustc_target/spec/windows_uwp_gnu_base.rs
View file

@ -1,6 +1,9 @@
use crate::spec::{LinkArgs, LinkerFlavor, TargetOptions};
pub fn opts() -> TargetOptions {
let base = super::windows_gnu_base::opts();
// FIXME: Consider adding `-nostdlib` and inheriting from `windows_gnu_base`.
let mut pre_link_args = LinkArgs::new();
pre_link_args.insert(
LinkerFlavor::Gcc,
@ -13,7 +16,10 @@ pub fn opts() -> TargetOptions {
],
);
// FIXME: Should UWP target be updated for the exception machinery changes from #67502?
let mut late_link_args = LinkArgs::new();
let late_link_args_dynamic = LinkArgs::new();
let late_link_args_static = LinkArgs::new();
late_link_args.insert(
LinkerFlavor::Gcc,
vec![
@ -32,31 +38,17 @@ pub fn opts() -> TargetOptions {
);
TargetOptions {
// FIXME(#13846) this should be enabled for windows
function_sections: false,
linker: Some("gcc".to_string()),
dynamic_linking: true,
executables: false,
dll_prefix: String::new(),
dll_suffix: ".dll".to_string(),
exe_suffix: ".exe".to_string(),
staticlib_prefix: "lib".to_string(),
staticlib_suffix: ".a".to_string(),
target_family: Some("windows".to_string()),
is_like_windows: true,
allows_weak_linkage: false,
limit_rdylib_exports: false,
pre_link_args,
pre_link_objects_exe: vec![
"rsbegin.o".to_string(), // Rust compiler runtime initialization, see rsbegin.rs
],
// FIXME: Consider adding `-nostdlib` and inheriting from `windows_gnu_base`.
pre_link_objects_exe: vec!["rsbegin.o".to_string()],
// FIXME: Consider adding `-nostdlib` and inheriting from `windows_gnu_base`.
pre_link_objects_dll: vec!["rsbegin.o".to_string()],
late_link_args,
post_link_objects: vec!["rsend.o".to_string()],
abi_return_struct_as_int: true,
emit_debug_gdb_scripts: false,
requires_uwtable: true,
limit_rdylib_exports: false,
late_link_args_dynamic,
late_link_args_static,
..Default::default()
..base
}
}