Skip to content

Commit

Permalink
Auto merge of #31579 - ollie27:msvc_link, r=alexcrichton
Browse files Browse the repository at this point in the history
/LARGEADDRESSAWARE is already enabled for i686-pc-windows-gnu so we should probably be consistent.
https://msdn.microsoft.com/en-us/library/wz223b1z.aspx

/SAFESEH is a good thing to enable by default.
https://msdn.microsoft.com/en-us/library/9a89h429.aspx
  • Loading branch information
bors committed Feb 13, 2016
2 parents 7fc4df6 + c3320c0 commit 5367776
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions src/librustc_back/target/i686_pc_windows_msvc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ pub fn target() -> Target {
let mut base = super::windows_msvc_base::opts();
base.cpu = "pentium4".to_string();

// Mark all dynamic libraries and executables as compatible with the larger 4GiB address
// space available to x86 Windows binaries on x86_64.
base.pre_link_args.push("/LARGEADDRESSAWARE".to_string());

// Ensure the linker will only produce an image if it can also produce a table of
// the image's safe exception handlers.
// https://msdn.microsoft.com/en-us/library/9a89h429.aspx
base.pre_link_args.push("/SAFESEH".to_string());

Target {
llvm_target: "i686-pc-windows-msvc".to_string(),
target_endian: "little".to_string(),
Expand Down

0 comments on commit 5367776

Please sign in to comment.