Uh oh!
There was an error while loading. Please reload this page.
Rollup of 11 pull requests - #44417
Closed
GuillaumeGomez wants to merge 23 commits into
Closed
Conversation
GuillaumeGomez
commented
Sep 8, 2017
Member
- Successful merges: Explicitly run perl for OpenSSL Configure #44131, rustc: Separately feature gate repr(i128) #44262, Require rlibs for dependent crates when linking static executables #44279, Use rvalue promotion to 'static instead of static items. #44312, Fix extended bootstrap issues with OpenSSL on NetBSD build hosts #44320, Reduce false positives number in rustdoc html diff #44347, Use memalign instead of posix_memalign for Solaris #44372, std: Fix a segfault on OSX with backtraces #44384, Rotate Travis/AppVeyor S3 keys #44385, Update the libcompiler_builins submodule #44387, std::thread::LocalKey: Document limitation with initializers #44396
- Failed merges:
OpenSSL's Configure script is missing a shebang. On some platforms, execve falls back to execution with the shell. Some other platforms, like musl, will fail with an exec format error. Avoid this by calling perl explicitly (since it's a perl script).
Brought up during the discussion of rust-lang#35118, the support for this is still somewhat buggy and so stabilization likely wants to be considered independently of the type itself.
This handles the case for `CrateTypeExecutable` and `+crt_static`. I reworked the match block to avoid duplicating the `attempt_static` and error checking code again (this case would have been a copy of the `CrateTypeCdylib`/`CrateTypeStaticlib` case). On `linux-musl` targets where `std` was built with `crt_static = false` in `config.toml`, this change brings the test suite from entirely failing to mostly passing. This change should not affect behavior for other crate types, or for targets which do not respect `+crt_static`.
NetBSD doesn't ship with sha256sum. The openssl build will probably try to use perl anyway, so using perl's shasum is reasonable.
Some tar(1) programs—such as NetBSD's—do not automatically decompress.
As pointed out in rust-lang/libc@deb61c8, Solaris 10 does not support posix_memalign. Use memalign for all Solaris versions instead. With this change applied I am able to cross-build rustc for Solaris 10.
Apparently `dladdr` can succeed but still give you NULL pointers! Closesrust-lang#44379
Haven't done this in awhile so seems like a good idea!
Pulls in rust-lang/compiler-builtins#187 for nicer build output :)
Explicitly run perl for OpenSSL Configure OpenSSL's Configure script is missing a shebang. On some platforms, execve falls back to execution with the shell. Some other platforms, like musl, will fail with an exec format error. Avoid this by calling perl explicitly (since it's a perl script).
…atsakis rustc: Separately feature gate repr(i128) Brought up during the discussion of rust-lang#35118, the support for this is still somewhat buggy and so stabilization likely wants to be considered independently of the type itself.
Require rlibs for dependent crates when linking static executables This handles the case for `CrateTypeExecutable` and `+crt_static`. I reworked the match block to avoid duplicating the `attempt_static` and error checking code again (this case would have been a copy of the `CrateTypeCdylib`/`CrateTypeStaticlib` case). On `linux-musl` targets where `std` was built with `crt_static = false` in `config.toml`, this change brings the test suite from entirely failing to mostly passing. This change should not affect behavior for other crate types, or for targets which do not respect `+crt_static`.
…lexcrichton Use rvalue promotion to 'static instead of static items. Fixesrust-lang#44240. Among other things, in crates that do a lot of formatting, this could reduce the number of items, although I haven't measured the performance benefits. If there's a codegen slowdown, that should IMO be solved by caching the output of miri, *not* by using `static`. r? @alexcrichton
…d-8c68-1aecbd570fab, r=alexcrichton Fix extended bootstrap issues with OpenSSL on NetBSD build hosts
…ve, r=QuietMisdreavus Reduce false positives number in rustdoc html diff cc @rust-lang/dev-tools r? @nrc Very simple trick but should lighten html diff a bit
Use memalign instead of posix_memalign for Solaris As pointed out in rust-lang/libc@deb61c8, Solaris 10 does not support posix_memalign. Use memalign for all Solaris versions instead. With this change applied I am able to cross-build rustc for Solaris 10.
std: Fix a segfault on OSX with backtraces Apparently `dladdr` can succeed but still give you NULL pointers! Closesrust-lang#44379
…excrichton Rotate Travis/AppVeyor S3 keys Haven't done this in awhile so seems like a good idea!
…ark-Simulacrum Update the libcompiler_builins submodule Pulls in rust-lang/compiler-builtins#187 for nicer build output :)
std::thread::LocalKey: Document limitation with initializers Document that if a `LocalKey`'s initializer recursively depends on itself, initialization will result in infinite recursion.
rust-highfive
commented
Sep 8, 2017
Contributor
r? @arielb1 (rust_highfive has picked a reviewer for you, use r? to override) |
GuillaumeGomez
commented
Sep 8, 2017
MemberAuthor
@bors: r+ p=1 |
bors
commented
Sep 8, 2017
Collaborator
📌 Commit 2dad4f3 has been approved by |
bors
commented
Sep 8, 2017
Collaborator
🔒 Merge conflict |
bors
commented
Sep 8, 2017
Collaborator
☔ The latest upstream changes (presumably #44142) made this pull request unmergeable. Please resolve the merge conflicts. |
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
12 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.