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

Update compiler-builtins to 0.1.42 to get fix for outlined atomics #84764

Closed

Conversation

joshtriplett
Copy link
Member

This should fix linking of other C code (and soon Rust-generated code)
on aarch64 musl.

@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 Apr 30, 2021
@joshtriplett
Copy link
Member Author

r? @Amanieu

@Amanieu
Copy link
Member

Amanieu commented Apr 30, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Apr 30, 2021

📌 Commit 49e67c3 has been approved by Amanieu

@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 Apr 30, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 1, 2021
…ns, r=Amanieu

Update compiler-builtins to 0.1.41 to get fix for outlined atomics

This should fix linking of other C code (and soon Rust-generated code)
on aarch64 musl.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 1, 2021
…ns, r=Amanieu

Update compiler-builtins to 0.1.41 to get fix for outlined atomics

This should fix linking of other C code (and soon Rust-generated code)
on aarch64 musl.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 1, 2021
…ns, r=Amanieu

Update compiler-builtins to 0.1.41 to get fix for outlined atomics

This should fix linking of other C code (and soon Rust-generated code)
on aarch64 musl.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 2, 2021
…ns, r=Amanieu

Update compiler-builtins to 0.1.41 to get fix for outlined atomics

This should fix linking of other C code (and soon Rust-generated code)
on aarch64 musl.
@Dylan-DPC-zz
Copy link

Dylan-DPC-zz commented May 2, 2021

failed in rollup

@bors r-

@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 May 2, 2021
@joshtriplett
Copy link
Member Author

joshtriplett commented May 3, 2021

This needs an update of the CI version of clang to LLVM 12; there was a fix to aarch64 msvc targets in February that allows compiling lse.S and other aarch64 assembly.

joshtriplett added a commit to joshtriplett/rust that referenced this pull request May 4, 2021
Needed for rust-lang#84764 . Tarballs
already uploaded to the CI mirror bucket.
bors added a commit to rust-lang-ci/rust that referenced this pull request May 4, 2021
Update clang to 12.0.0 on Windows and macOS

Needed for rust-lang#84764 . Tarballs
already uploaded to the CI mirror bucket.
@joshtriplett joshtriplett force-pushed the update-compiler-builtins branch from 49e67c3 to 6fd6e23 Compare May 4, 2021 18:51
This should fix linking of other C code (and soon Rust-generated code)
on aarch64 musl.
@joshtriplett joshtriplett force-pushed the update-compiler-builtins branch from 6fd6e23 to 196899a Compare May 4, 2021 18:52
@joshtriplett joshtriplett changed the title Update compiler-builtins to 0.1.41 to get fix for outlined atomics Update compiler-builtins to 0.1.42 to get fix for outlined atomics May 4, 2021
@joshtriplett
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented May 4, 2021

⌛ Trying commit 196899a with merge cd12f15deddfc57f977b023129c75954212a52d2...

@bors
Copy link
Contributor

bors commented May 4, 2021

☀️ Try build successful - checks-actions
Build commit: cd12f15deddfc57f977b023129c75954212a52d2 (cd12f15deddfc57f977b023129c75954212a52d2)

@joshtriplett joshtriplett added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 5, 2021
@joshtriplett
Copy link
Member Author

This is ready now. With the updated clang on Windows, it should pass now, and I have two different confirmations that lse.S does build with clang 12 on Windows.

@Amanieu
Copy link
Member

Amanieu commented May 5, 2021

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented May 5, 2021

📌 Commit 196899a has been approved by Amanieu

@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 May 5, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request May 6, 2021
…ns, r=Amanieu

Update compiler-builtins to 0.1.42 to get fix for outlined atomics

This should fix linking of other C code (and soon Rust-generated code)
on aarch64 musl.
@bors
Copy link
Contributor

bors commented May 7, 2021

⌛ Testing commit 196899a with merge 3033bec18da733899e435defb5bac70a4c739c69...

@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu failed! Check out the build log: (web) (plain)

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

Some tests failed in compiletest suite=run-make-fulldeps mode=run-make host=aarch64-unknown-linux-gnu target=aarch64-unknown-linux-gnu
failures:

---- [run-make] run-make-fulldeps/issue-64153 stdout ----
error: make failed
status: exit status: 2
command: "make"
stdout:
stdout:
------------------------------------------
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153 -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153  --crate-type rlib upstream.rs -o /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153/libupstream.rlib -Ccodegen-units=1
LD_LIBRARY_PATH="/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153:/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-bootstrap-tools/aarch64-unknown-linux-gnu/release/deps:/checkout/obj/build/aarch64-unknown-linux-gnu/stage0/lib" '/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc' --out-dir /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153 -L /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153  --crate-type staticlib downstream.rs -Clto -Ccodegen-units=1 -o /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153/libdownstream.a
# Dump all the symbols from the staticlib into `syms`
"/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin"/llvm-objdump -t /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153/libdownstream.a > /checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153/syms
------------------------------------------
stderr:
------------------------------------------
warning: ignoring --out-dir flag due to -o flag
warning: ignoring --out-dir flag due to -o flag

warning: 1 warning emitted

warning: ignoring --out-dir flag due to -o flag

warning: 1 warning emitted

/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/llvm-objdump: error: '/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps/issue-64153/issue-64153/libdownstream.a': The file was not recognized as a valid object file
make: *** [Makefile:20: all] Error 1
------------------------------------------




failures:
    [run-make] run-make-fulldeps/issue-64153

test result: FAILED. 212 passed; 1 failed; 8 ignored; 0 measured; 0 filtered out; finished in 69.11s



command did not execute successfully: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "--rustdoc-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustdoc" "--rust-demangler-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2-tools-bin/rust-demangler" "--src-base" "/checkout/src/test/run-make-fulldeps" "--build-base" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/run-make-fulldeps" "--stage-id" "stage2-aarch64-unknown-linux-gnu" "--suite" "run-make-fulldeps" "--mode" "run-make" "--target" "aarch64-unknown-linux-gnu" "--host" "aarch64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--llvm-version" "12.0.0-rust-1.54.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hellonew hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--llvm-bin-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin" "--cc" "cc" "--cxx" "c++" "--cflags" "-ffunction-sections -fdata-sections -fPIC" "--ar" "ar" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap --stage 2 test
Build completed unsuccessfully in 1:34:44

@bors
Copy link
Contributor

bors commented May 7, 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 May 7, 2021
@bors
Copy link
Contributor

bors commented May 14, 2021

☔ The latest upstream changes (presumably #84107) made this pull request unmergeable. Please resolve the merge conflicts.

@klensy
Copy link
Contributor

klensy commented May 14, 2021

Already updated to 0.1.43 in #84107

@Amanieu Amanieu closed this May 14, 2021
@joshtriplett joshtriplett deleted the update-compiler-builtins branch May 15, 2021 07:04
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jun 7, 2021
Needed for rust-lang#84764 . Tarballs
already uploaded to the CI mirror bucket.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants