Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kmc-solid: Fix SOLID target #90392

Merged
merged 2 commits into from
Nov 4, 2021
Merged

Conversation

kawadakk
Copy link
Contributor

@kawadakk kawadakk commented Oct 29, 2021

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

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

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

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 29, 2021

📌 Commit 6997d66 has been approved by Mark-Simulacrum

@bors 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 added a commit to matthiaskrgr/rust that referenced this pull request Oct 30, 2021
…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
Copy link
Member

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

Looks like the libc crate update causes some problems.

@bors 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
Copy link
Contributor Author

kawadakk commented Nov 1, 2021

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
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Nov 1, 2021

📌 Commit 26a6cc4 has been approved by Mark-Simulacrum

@bors 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
Copy link
Contributor

bors commented Nov 1, 2021

⌛ Testing commit 26a6cc4 with merge a76572f5b3c072b5aa45b602e4954cf7162e2e1d...

@rust-log-analyzer
Copy link
Collaborator

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
Copy link
Contributor

bors commented Nov 1, 2021

💔 Test failed - checks-actions

@bors 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
@kawadakk
Copy link
Contributor Author

kawadakk commented Nov 4, 2021

The upstream issue has been fixed by #90495.

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Nov 4, 2021

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

@bors
Copy link
Contributor

bors commented Nov 4, 2021

📌 Commit 26a6cc4 has been approved by Mark-Simulacrum

@bors 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
Copy link
Contributor

bors commented Nov 4, 2021

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

@bors
Copy link
Contributor

bors commented Nov 4, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 4, 2021
@bors bors merged commit 0b4ac62 into rust-lang:master Nov 4, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 4, 2021
@rust-timer
Copy link
Collaborator

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

@kawadakk kawadakk deleted the fix-solid-support branch November 4, 2021 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants