std: Use target_pointer_width for BACKTRACE_ELF_SIZE #53377
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The former code used `target.contains("64")` to detect Elf64 targets,
but this is inaccurate in a few cases:
- `s390x-unknown-linux-gnu` is 64-bit
- `sparcv9-sun-solaris` is 64-bit
- `x86_64-unknown-linux-gnux32` is 32-bit
Instead the `std` build script can use `CARGO_CFG_TARGET_POINTER_WIDTH`
to reliably detect 64-bit targets for libbacktrace.
Also update to backtrace-sys 0.1.24 for rust-lang/backtrace-rs#122.
|
Fixes #53372 when |
|
@bors: r+ |
|
📌 Commit e0d8364 has been approved by |
bors
added
the
S-waiting-on-bors
cuviper
added
the
beta-nominated
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Aug 16, 2018
…chton
std: Use target_pointer_width for BACKTRACE_ELF_SIZE
The former code used `target.contains("64")` to detect Elf64 targets,
but this is inaccurate in a few cases:
- `s390x-unknown-linux-gnu` is 64-bit
- `sparcv9-sun-solaris` is 64-bit
- `x86_64-unknown-linux-gnux32` is 32-bit
Instead the `std` build script can use `CARGO_CFG_TARGET_POINTER_WIDTH`
to reliably detect 64-bit targets for libbacktrace.
Also update to backtrace-sys 0.1.24 for rust-lang/backtrace-rs#122.
bors
added a commit
that referenced
this pull request
Aug 16, 2018
Rollup of 10 pull requests Successful merges: - #52946 (Documented impl From on line 367 of libserialize/json.rs) - #53234 (Remove Travis shutdown debug scripts, and remove CI-specific DNS settings) - #53313 (Two small improvements) - #53360 (Addressed #51602) - #53364 (Warn if the user tries to use GATs) - #53373 (Tweak unclosed delimiter parser error) - #53377 (std: Use target_pointer_width for BACKTRACE_ELF_SIZE) - #53395 (Use #[non_exhaustive] on internal enums) - #53399 (Tidy: ignore non-Markdown files when linting for the Unstable Book) - #53412 (syntax_ext: remove leftover span_err_if_not_stage0 macro.)
pietroalbini
added
the
T-libs-api
|
Ping @rust-lang/libs, should this PR be backported to beta? |
alexcrichton
added
the
beta-accepted
|
Ah certainly! This is fine to backport |
pietroalbini
removed
the
beta-nominated
bors
added a commit
that referenced
this pull request
Sep 4, 2018
[beta] update backtrace-sys to 0.1.24 This is the other part of #53377 that was missed in the #53880 backport. r? @pietroalbini
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The former code used
target.contains("64")to detect Elf64 targets,but this is inaccurate in a few cases:
s390x-unknown-linux-gnuis 64-bitsparcv9-sun-solarisis 64-bitx86_64-unknown-linux-gnux32is 32-bitInstead the
stdbuild script can useCARGO_CFG_TARGET_POINTER_WIDTHto reliably detect 64-bit targets for libbacktrace.
Also update to backtrace-sys 0.1.24 for rust-lang/backtrace-rs#122.