diff options
| author | bors <bors@rust-lang.org> | 2015-08-03 22:12:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-03 22:12:46 +0000 |
| commit | ceded6adb3a4e172eabef09e1c78717a99c16b14 (patch) | |
| tree | 3cca4bd7b8a31d8c82b6cdf34c668d2dea010aab /src/doc | |
| parent | d877e6540431d99b0945a3d27eeb466b0d693902 (diff) | |
| parent | 96d1db2b1a43a149a1d0436a03a72aa01a39efd2 (diff) | |
| download | rust-ceded6adb3a4e172eabef09e1c78717a99c16b14.tar.gz rust-ceded6adb3a4e172eabef09e1c78717a99c16b14.zip | |
Auto merge of #27210 - vadimcn:win64-eh-pers, r=alexcrichton
After this change, the only remaining symbol we are pulling from libgcc on Win64 is `__chkstk_ms` - the stack probing routine.
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/trpl/lang-items.md | 1 | ||||
| -rw-r--r-- | src/doc/trpl/no-stdlib.md | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/doc/trpl/lang-items.md b/src/doc/trpl/lang-items.md index 8e7504c2f18..39de8920f09 100644 --- a/src/doc/trpl/lang-items.md +++ b/src/doc/trpl/lang-items.md @@ -54,6 +54,7 @@ fn main(argc: isize, argv: *const *const u8) -> isize { #[lang = "stack_exhausted"] extern fn stack_exhausted() {} #[lang = "eh_personality"] extern fn eh_personality() {} #[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} } +# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {} ``` Note the use of `abort`: the `exchange_malloc` lang item is assumed to diff --git a/src/doc/trpl/no-stdlib.md b/src/doc/trpl/no-stdlib.md index 0a985334b5e..e530a9f1051 100644 --- a/src/doc/trpl/no-stdlib.md +++ b/src/doc/trpl/no-stdlib.md @@ -39,6 +39,7 @@ fn start(_argc: isize, _argv: *const *const u8) -> isize { #[lang = "stack_exhausted"] extern fn stack_exhausted() {} #[lang = "eh_personality"] extern fn eh_personality() {} #[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} } +# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {} # // fn main() {} tricked you, rustdoc! ``` @@ -63,6 +64,7 @@ pub extern fn main(argc: i32, argv: *const *const u8) -> i32 { #[lang = "stack_exhausted"] extern fn stack_exhausted() {} #[lang = "eh_personality"] extern fn eh_personality() {} #[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} } +# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {} # // fn main() {} tricked you, rustdoc! ``` @@ -150,6 +152,7 @@ extern fn panic_fmt(args: &core::fmt::Arguments, #[lang = "stack_exhausted"] extern fn stack_exhausted() {} #[lang = "eh_personality"] extern fn eh_personality() {} +# #[lang = "eh_unwind_resume"] extern fn rust_eh_unwind_resume() {} # #[start] fn start(argc: isize, argv: *const *const u8) -> isize { 0 } # fn main() {} ``` |
