Skip to content

Commit 6f839fb

Browse files
committedDec 19, 2018
Auto merge of #56977 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests Successful merges: - #56363 (Defactored Bytes::read) - #56663 (Remove lifetime from Resolver) - #56689 (add a lint group for lints emitted by rustdoc) - #56772 (fix issue 54153 by not testing issue-18804 on Windows nor OS X.) - #56820 (format-related tweaks) - #56881 (Implement Eq, PartialEq and Hash for atomic::Ordering) - #56907 (Fix grammar in compiler error for array iterators) - #56908 (rustc: Don't ICE on usage of two new target features) - #56910 (Do not point at delim spans for complete correct blocks) - #56913 (Enable stack probes for UEFI images) - #56918 (Profiler: simplify total_duration, improve readability) - #56931 (Update release notes for Rust 1.31.1) - #56947 (Add targets thumbv7neon-linux-androideabi and thumbv7neon-unknown-linux-gnueabihf) - #56948 (Update LLVM submodule) - #56959 (Fix mobile menu rendering collision with tooltip.) Failed merges: - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) r? @ghost
2 parents 74ebf02 + 1ba6ec4 commit 6f839fb

Some content is hidden

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

53 files changed

+471
-255
lines changed
 

‎RELEASES.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 1.31.1 (2018-12-20)
2+
===========================
3+
4+
- [Fix Rust failing to build on `powerpc-unknown-netbsd`][56562]
5+
- [Fix broken go-to-definition in RLS][rls/1171]
6+
- [Fix infinite loop on hover in RLS][rls/1170]
7+
8+
[56562]: https://github.com/rust-lang/rust/pull/56562
9+
[rls/1171]: https://github.com/rust-lang/rls/issues/1171
10+
[rls/1170]: https://github.com/rust-lang/rls/pull/1170
11+
112
Version 1.31.0 (2018-12-06)
213
==========================
314

‎src/bootstrap/cc_detect.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ fn set_compiler(cfg: &mut cc::Build,
143143
// compiler already takes into account the triple in question.
144144
t if t.contains("android") => {
145145
if let Some(ndk) = config.and_then(|c| c.ndk.as_ref()) {
146-
let target = target.replace("armv7", "arm");
146+
let target = target.replace("armv7neon", "arm")
147+
.replace("armv7", "arm")
148+
.replace("thumbv7neon", "arm")
149+
.replace("thumbv7", "arm");
147150
let compiler = format!("{}-{}", target, compiler.clang());
148151
cfg.compiler(ndk.join("bin").join(compiler));
149152
}

0 commit comments

Comments
 (0)
Please sign in to comment.