Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 598eddf

Browse files
committedJul 24, 2017
Auto merge of #43454 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 11 pull requests - Successful merges: #43297, #43322, #43342, #43361, #43366, #43374, #43379, #43401, #43421, #43428, #43446 - Failed merges:
2 parents b80e946 + 0bb4291 commit 598eddf

File tree

43 files changed

+275
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+275
-196
lines changed
 

‎configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,8 @@ case "$CFG_RELEASE_CHANNEL" in
560560
*-pc-windows-gnu)
561561
;;
562562
*)
563-
CFG_ENABLE_DEBUGINFO_LINES=1
564-
CFG_ENABLE_DEBUGINFO_ONLY_STD=1
563+
enable_if_not_disabled debuginfo-lines
564+
enable_if_not_disabled debuginfo-only-std
565565
;;
566566
esac
567567

@@ -572,8 +572,8 @@ case "$CFG_RELEASE_CHANNEL" in
572572
*-pc-windows-gnu)
573573
;;
574574
*)
575-
CFG_ENABLE_DEBUGINFO_LINES=1
576-
CFG_ENABLE_DEBUGINFO_ONLY_STD=1
575+
enable_if_not_disabled debuginfo-lines
576+
enable_if_not_disabled debuginfo-only-std
577577
;;
578578
esac
579579
;;

‎src/doc/unstable-book/src/language-features/lang-items.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,14 @@ pub extern fn rust_begin_panic(_msg: core::fmt::Arguments,
194194
}
195195
```
196196

197+
In many cases, you may need to manually link to the `compiler_builtins` crate
198+
when building a `no_std` binary. You may observe this via linker error messages
199+
such as "```undefined reference to `__rust_probestack'```". Using this crate
200+
also requires enabling the library feature `compiler_builtins_lib`. You can read
201+
more about this [here][compiler-builtins-lib].
202+
203+
[compiler-builtins-lib]: library-features/compiler-builtins-lib.html
204+
197205
## More about the language items
198206

199207
The compiler currently makes a few assumptions about symbols which are

0 commit comments

Comments
 (0)
Please sign in to comment.