kmc-solid: Fix SOLID target by kawadakk · Pull Request #90392 · rust-lang/rust

kawadakk · 2021-10-29T06:32:26Z

This PR is a follow-up for #86191 and necessary to make the *-kmc-solid_* Tier 3 targets actually usable.

Bumps libc to 0.2.106, which includes Add SOLID target support libc#2227.
Applies the change made by Rename std::thread::available_conccurrency to std::thread::available_parallelism #89324 to this target's target-specific code.

rust-highfive · 2021-10-29T06:32:29Z

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2021-10-29T15:18:36Z

@bors r+ rollup

bors · 2021-10-29T15:18:37Z

📌 Commit 6997d66 has been approved by Mark-Simulacrum

…Simulacrum kmc-solid: Fix SOLID target This PR is a follow-up for rust-lang#86191 and necessary to make the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) Tier 3 targets actually usable. - Bumps `libc` to 0.2.105, which includes <rust-lang/libc#2227>. - Applies the change made by rust-lang#89324 to this target's target-specific code.

matthiaskrgr · 2021-10-30T12:36:03Z

@bors r-
Failed in a rollup
#90415 (comment)

Looks like the libc crate update causes some problems.

…rallelism}` Catching up with commit b4615b5

kawadakk · 2021-11-01T01:55:22Z

libc has been bumped to 0.2.106, which should fix the build failure on x86_64-apple (rust-lang/libc#2484).

r? @Mark-Simulacrum

Mark-Simulacrum · 2021-11-01T01:57:47Z

@bors r+ rollup=iffy

bors · 2021-11-01T01:57:48Z

📌 Commit 26a6cc4 has been approved by Mark-Simulacrum

bors · 2021-11-01T17:03:53Z

⌛ Testing commit 26a6cc4 with merge a76572f5b3c072b5aa45b602e4954cf7162e2e1d...

rust-log-analyzer · 2021-11-01T17:14:55Z

The job dist-x86_64-freebsd failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] core test:false 25.362
[RUSTC-TIMING] addr2line test:false 0.491
[RUSTC-TIMING] gimli test:false 5.026
[RUSTC-TIMING] object test:false 5.162
error: linking with `x86_64-unknown-freebsd11-clang` failed: exit status: 1
|
= note: "x86_64-unknown-freebsd11-clang" "-Wl,--version-script=/tmp/rustcTMfqiw/list" "-m64" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/std-1ae97444a67f7a6a.std.b4776720-cgu.0.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/std-1ae97444a67f7a6a.5atogxoi6xx0faz7.rcgu.o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/std-1ae97444a67f7a6a.124kwnzhr2vpbg6o.rcgu.o" "-Wl,--as-needed" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/release/deps" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/build/compiler_builtins-4112ecccb4c4b963/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/build/profiler_builtins-d3e3ed361039c169/out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-freebsd/lib" "-lexecinfo" "-lpthread" "-Wl,-Bstatic" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libpanic_unwind-10f6ade17d2c8cd7.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libminiz_oxide-a23b55dac10cfe0c.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libadler-6c2bc1eea1d9ab98.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libobject-8c3214801652da69.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libmemchr-769d6ab78fa1e74f.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libaddr2line-4cf62080a5eb7c5c.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libgimli-d00b1d976307cbc3.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libstd_detect-acefed2b1ae207e4.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/librustc_demangle-51697ed9df91b6f7.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libhashbrown-35dd819092c68ace.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/librustc_std_workspace_alloc-3b3d40e2b0883322.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libunwind-75c498b6d20774ec.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libcfg_if-ce2863d1cef84933.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/liblibc-74dd87227f02f43f.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/liballoc-bbf2299c4789bf29.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/librustc_std_workspace_core-174ebf435975ffef.rlib" "-Wl,--no-whole-archive" "-Wl,--whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libcore-ce9110d7ae9a5977.rlib" "-Wl,--no-whole-archive" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libcompiler_builtins-69eab8a62240c916.rlib" "-Wl,-Bdynamic" "-lgcc_s" "-lc" "-lm" "-lrt" "-lpthread" "-lrt" "-lutil" "-lexecinfo" "-lkvm" "-lutil" "-lprocstat" "-lrt" "-Wl,--eh-frame-hdr" "-Wl,-znoexecstack" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/x86_64-unknown-freebsd/lib" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-freebsd/release/deps/libstd-1ae97444a67f7a6a.so" "-shared" "-Wl,-zrelro" "-Wl,-znow" "-Wl,-O1" "-nodefaultlibs" "-Wl,-rpath,$ORIGIN/../lib"
= note: /usr/local/x86_64-unknown-freebsd11/bin/ld: cannot find -lkvm
clang: error: linker command failed with exit code 1 (use -v to see invocation)
[RUSTC-TIMING] std test:false 24.492
error: could not compile `std` due to previous error
Build completed unsuccessfully in 0:07:40

bors · 2021-11-01T17:15:56Z

💔 Test failed - checks-actions

kawadakk · 2021-11-04T02:13:32Z

The upstream issue has been fixed by #90495.

r? @Mark-Simulacrum

Mark-Simulacrum · 2021-11-04T02:16:32Z

@bors r+ rollup=iffy

bors · 2021-11-04T02:16:34Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: Add beginner friendly lifetime elision hint to E0623 #90179

bors · 2021-11-04T02:16:35Z

📌 Commit 26a6cc4 has been approved by Mark-Simulacrum

bors · 2021-11-04T03:48:51Z

⌛ Testing commit 26a6cc4 with merge 0b4ac62...

bors · 2021-11-04T06:54:12Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 0b4ac62 to master...

rust-timer · 2021-11-04T08:26:50Z

Finished benchmarking commit (0b4ac62): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

rust-highfive assigned Mark-Simulacrum Oct 29, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 29, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 29, 2021

matthiaskrgr mentioned this pull request Oct 30, 2021
Rollup of 10 pull requests #90415
Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 30, 2021

kawadakk added 2 commits November 1, 2021 10:45

Bump libc dependency of std to 0.2.106
15af067

itron: Rename `itron::thread::{available_conccurrency -> available_pa…
26a6cc4
…rallelism}` Catching up with commit b4615b5

kawadakk force-pushed the fix-solid-support branch from 6997d66 to 26a6cc4Compare November 1, 2021 01:46

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 1, 2021

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 1, 2021

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 4, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2021

bors merged commit 0b4ac62 into rust-lang:masterNov 4, 2021

rustbot added this to the 1.58.0 milestone Nov 4, 2021

bors mentioned this pull request Nov 4, 2021
std: Get the standard library compiling for wasm64 #90382
Merged

kawadakk deleted the fix-solid-support branch November 4, 2021 08:58

Uh oh!

Uh oh!

Conversation

kawadakk commented Oct 29, 2021• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Oct 29, 2021

Uh oh!

Mark-Simulacrum commented Oct 29, 2021

Uh oh!

bors commented Oct 29, 2021

Uh oh!

matthiaskrgr commented Oct 30, 2021

Uh oh!

kawadakk commented Nov 1, 2021

Uh oh!

Mark-Simulacrum commented Nov 1, 2021

Uh oh!

bors commented Nov 1, 2021

Uh oh!

bors commented Nov 1, 2021

Uh oh!

rust-log-analyzer commented Nov 1, 2021

Uh oh!

bors commented Nov 1, 2021

Uh oh!

kawadakk commented Nov 4, 2021

Uh oh!

Mark-Simulacrum commented Nov 4, 2021

Uh oh!

bors commented Nov 4, 2021

Uh oh!

bors commented Nov 4, 2021

Uh oh!

bors commented Nov 4, 2021

Uh oh!

bors commented Nov 4, 2021

Uh oh!

rust-timer commented Nov 4, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

kawadakk commented Oct 29, 2021•
edited
Loading