diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-01-07 17:26:55 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-01-08 09:07:55 +1300 |
| commit | dd3e89aaf25c667fa8207f8800c4b60d70d76c1b (patch) | |
| tree | e22fee6b3c1b88bb3d247e89e0349a1781849f74 /src/libstd/sys/common | |
| parent | 9f1ead8fadc56bad30dc74f5cc50d78af4fbc972 (diff) | |
| download | rust-dd3e89aaf25c667fa8207f8800c4b60d70d76c1b.tar.gz rust-dd3e89aaf25c667fa8207f8800c4b60d70d76c1b.zip | |
Rename `target_word_size` to `target_pointer_width`
Closes #20421 [breaking-change]
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/backtrace.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libstd/sys/common/backtrace.rs b/src/libstd/sys/common/backtrace.rs index be44aa99f49..f6161ec193d 100644 --- a/src/libstd/sys/common/backtrace.rs +++ b/src/libstd/sys/common/backtrace.rs @@ -12,8 +12,11 @@ use prelude::v1::*; use io::IoResult; -#[cfg(target_word_size = "64")] pub const HEX_WIDTH: uint = 18; -#[cfg(target_word_size = "32")] pub const HEX_WIDTH: uint = 10; +#[cfg(any(all(stage0, target_word_size = "64"), all(not(stage0), target_pointer_width = "64")))] +pub const HEX_WIDTH: uint = 18; + +#[cfg(any(all(stage0, target_word_size = "32"), all(not(stage0), target_pointer_width = "32")))] +pub const HEX_WIDTH: uint = 10; // All rust symbols are in theory lists of "::"-separated identifiers. Some // assemblers, however, can't handle these characters in symbol names. To get |