about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-22 07:16:22 -0700
committerbors <bors@rust-lang.org>2014-05-22 07:16:22 -0700
commit9411cec580932f38e0e017245ce28ad2ff8e936c (patch)
treec707867dfda0db395dcdc62128b22290b4cd483d /src
parent9ac9148bbddcaeaf6c1b6b8f2e8bae75b038f234 (diff)
parente5d883101c27ab7c7a232337ffebaa85edc9d64f (diff)
downloadrust-9411cec580932f38e0e017245ce28ad2ff8e936c.tar.gz
rust-9411cec580932f38e0e017245ce28ad2ff8e936c.zip
auto merge of #14349 : richo/rust/docs/win64_calling_convention, r=alexcrichton
Wikipedia suggests that windows on x64 has it's own calling convention (Supported by the fact that we implement it)

source: http://en.wikipedia.org/wiki/X86_calling_conventions#x86-64_calling_conventions
Diffstat (limited to 'src')
-rw-r--r--src/doc/guide-ffi.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/doc/guide-ffi.md b/src/doc/guide-ffi.md
index 9f2f2b34c2e..81616c675de 100644
--- a/src/doc/guide-ffi.md
+++ b/src/doc/guide-ffi.md
@@ -493,6 +493,7 @@ are:
 * `rust-intrinsic`
 * `system`
 * `C`
+* `win64`
 
 Most of the abis in this list are self-explanatory, but the `system` abi may
 seem a little odd. This constraint selects whatever the appropriate ABI is for