-
Notifications
You must be signed in to change notification settings - Fork 13.1k
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
Add UWP MSVC targets #63155
Add UWP MSVC targets #63155
Changes from 4 commits
5e6619e
54e268c
6e4d023
3c6f6f0
e3d8b68
89044a9
c9da160
1581c43
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
use crate::spec::{LinkerFlavor, Target, TargetResult, PanicStrategy}; | ||
use std::env; | ||
|
||
pub fn target() -> TargetResult { | ||
let mut base = super::windows_uwp_msvc_base::opts(); | ||
base.max_atomic_width = Some(64); | ||
base.has_elf_tls = true; | ||
|
||
// FIXME: this shouldn't be panic=abort, it should be panic=unwind | ||
base.panic_strategy = PanicStrategy::Abort; | ||
|
||
let lib_root_path = env::var("VCToolsInstallDir") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note that we already have a good deal of support for this via the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
.expect("VCToolsInstallDir not found in env"); | ||
|
||
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap() | ||
.push(format!("{}{}{}", | ||
"/LIBPATH:".to_string(), | ||
lib_root_path, | ||
"lib\\arm64\\store".to_string())); | ||
|
||
Ok(Target { | ||
llvm_target: "aarch64-pc-windows-msvc".to_string(), | ||
target_endian: "little".to_string(), | ||
target_pointer_width: "64".to_string(), | ||
target_c_int_width: "32".to_string(), | ||
data_layout: "e-m:w-p:64:64-i32:32-i64:64-i128:128-n32:64-S128".to_string(), | ||
arch: "aarch64".to_string(), | ||
target_os: "windows".to_string(), | ||
target_env: "msvc".to_string(), | ||
target_vendor: "uwp".to_string(), | ||
linker_flavor: LinkerFlavor::Msvc, | ||
options: base, | ||
}) | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
use crate::spec::{LinkerFlavor, Target, TargetResult}; | ||
use std::env; | ||
|
||
pub fn target() -> TargetResult { | ||
let mut base = super::windows_uwp_msvc_base::opts(); | ||
base.cpu = "pentium4".to_string(); | ||
base.max_atomic_width = Some(64); | ||
base.has_elf_tls = true; | ||
|
||
let lib_root_path = env::var("VCToolsInstallDir") | ||
.expect("VCToolsInstallDir not found in env"); | ||
|
||
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap() | ||
.push(format!("{}{}{}", | ||
"/LIBPATH:".to_string(), | ||
lib_root_path, | ||
"lib\\x86\\store".to_string())); | ||
|
||
Ok(Target { | ||
llvm_target: "i686-pc-windows-msvc".to_string(), | ||
target_endian: "little".to_string(), | ||
target_pointer_width: "32".to_string(), | ||
target_c_int_width: "32".to_string(), | ||
data_layout: "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32".to_string(), | ||
arch: "x86".to_string(), | ||
target_os: "windows".to_string(), | ||
target_env: "msvc".to_string(), | ||
target_vendor: "uwp".to_string(), | ||
linker_flavor: LinkerFlavor::Msvc, | ||
options: base, | ||
}) | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
use crate::spec::{LinkArgs, LinkerFlavor, TargetOptions}; | ||
use std::default::Default; | ||
|
||
pub fn opts() -> TargetOptions { | ||
let mut args = LinkArgs::new(); | ||
args.insert(LinkerFlavor::Msvc, | ||
vec!["/NOLOGO".to_string(), | ||
"/NXCOMPAT".to_string(), | ||
"/APPCONTAINER".to_string(), | ||
"mincore.lib".to_string()]); | ||
|
||
TargetOptions { | ||
function_sections: true, | ||
dynamic_linking: true, | ||
executables: true, | ||
dll_prefix: String::new(), | ||
dll_suffix: ".dll".to_string(), | ||
exe_suffix: ".exe".to_string(), | ||
staticlib_prefix: String::new(), | ||
staticlib_suffix: ".lib".to_string(), | ||
target_family: Some("windows".to_string()), | ||
is_like_windows: true, | ||
is_like_msvc: true, | ||
pre_link_args: args, | ||
crt_static_allows_dylibs: true, | ||
crt_static_respected: true, | ||
abi_return_struct_as_int: true, | ||
emit_debug_gdb_scripts: false, | ||
requires_uwtable: true, | ||
|
||
.. Default::default() | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
use crate::spec::{LinkerFlavor, Target, TargetResult}; | ||
use std::env; | ||
|
||
pub fn target() -> TargetResult { | ||
let mut base = super::windows_uwp_msvc_base::opts(); | ||
base.cpu = "x86-64".to_string(); | ||
base.max_atomic_width = Some(64); | ||
base.has_elf_tls = true; | ||
|
||
let lib_root_path = env::var("VCToolsInstallDir") | ||
.expect("VCToolsInstallDir not found in env"); | ||
|
||
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap() | ||
.push(format!("{}{}{}", | ||
"/LIBPATH:".to_string(), | ||
lib_root_path, | ||
"lib\\x64\\store".to_string())); | ||
|
||
Ok(Target { | ||
llvm_target: "x86_64-pc-windows-msvc".to_string(), | ||
target_endian: "little".to_string(), | ||
target_pointer_width: "64".to_string(), | ||
target_c_int_width: "32".to_string(), | ||
data_layout: "e-m:w-i64:64-f80:128-n8:16:32:64-S128".to_string(), | ||
arch: "x86_64".to_string(), | ||
target_os: "windows".to_string(), | ||
target_env: "msvc".to_string(), | ||
target_vendor: "uwp".to_string(), | ||
linker_flavor: LinkerFlavor::Msvc, | ||
options: base, | ||
}) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's the background on this FIXME that causes it to exist? Does that belong in a comment or an issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The AArch64 Windows backend didn't implement SEH unwinding when the aarch64-pc-windows-msvc target was first added, so I suspect this is the same as that. I haven't checked the LLVM backend recently to see if this works.