Skip to content

Rollup of 6 pull requests #54607

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.

Sign up for GitHub

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

Closed
wants to merge 12 commits into from
Closed

Rollup of 6 pull requests #54607

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2447294
Add 1.29.1 release nodes
alexcrichton Sep 25, 2018
e6ea19d
Include path in stamp hash for debuginfo tests
tromey Sep 25, 2018
c0ac5ba
ignore {std,fast,vector,this}call on non-x86 windows
froydnj Sep 25, 2018
2b3e16b
Accept trailing comma in `cfg_attr`
petrochenkov Sep 26, 2018
c8c3395
A few cleanups and minor improvements to typeck
ljedrz Sep 26, 2018
bb0abe9
Remove useless lifetimes from `Pin` `impl`s.
pthariensflame Sep 26, 2018
6460631
Rollup merge of #54564 - alexcrichton:new-notes, r=kennytm
kennytm Sep 27, 2018
762fc05
Rollup merge of #54567 - tromey:paths-in-stamp-hashes, r=Mark-Simulacrum
kennytm Sep 27, 2018
b09408e
Rollup merge of #54576 - froydnj:non-x86-abi-adjustment, r=alexcrichton
kennytm Sep 27, 2018
5303b59
Rollup merge of #54581 - petrochenkov:cfgattr, r=alexcrichton
kennytm Sep 27, 2018
a6ed49c
Rollup merge of #54591 - ljedrz:cleanup_typeck_rest, r=zackmdavis
kennytm Sep 27, 2018
557ddea
Rollup merge of #54598 - pthariensflame:patch-1, r=sfackler
kennytm Sep 27, 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
12 changes: 11 additions & 1 deletion src/librustc_target/spec/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ impl Default for TargetOptions {
}

impl Target {
/// Given a function ABI, turn "System" into the correct ABI for this target.
/// Given a function ABI, turn it into the correct ABI for this target.
pub fn adjust_abi(&self, abi: Abi) -> Abi {
match abi {
Abi::System => {
Expand All @@ -771,6 +771,16 @@ impl Target {
Abi::C
}
},
// These ABI kinds are ignored on non-x86 Windows targets.
// See https://docs.microsoft.com/en-us/cpp/cpp/argument-passing-and-naming-conventions
// and the individual pages for __stdcall et al.
Abi::Stdcall | Abi::Fastcall | Abi::Vectorcall | Abi::Thiscall => {
if self.options.is_like_windows && self.arch != "x86" {
Abi::C
} else {
abi
}
},
abi => abi
}
}
Expand Down