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

Rollup of 3 pull requests #60992

Closed
wants to merge 7 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented May 21, 2019

Successful merges:

Failed merges:

r? @ghost

taiki-e and others added 7 commits May 19, 2019 12:31
This commit bumps the `compiler-builtins` dependency to 0.1.15 which
expects to have the source for `compiler-rt` provided externally if the
`c` feature is enabled. This then plumbs through the necessary support
in the build system to ensure that if the `llvm-project` directory is
checked out and present that we enable the `c` feature of
`compiler-builtins` and compile in all the C intrinsics.
… r=Centril

Move arbitrary self types's tests into ui/self

rust-lang#60944 (comment)

r? @Centril
…ns, r=cuviper

Bump compiler-builtins to 0.1.15

This commit bumps the `compiler-builtins` dependency to 0.1.15 which
expects to have the source for `compiler-rt` provided externally if the
`c` feature is enabled. This then plumbs through the necessary support
in the build system to ensure that if the `llvm-project` directory is
checked out and present that we enable the `c` feature of
`compiler-builtins` and compile in all the C intrinsics.
Bump LLVM submodule to fix MSP430 AsmPrinter and assembler syntax mismatch.

Moving on to steps 9 and 10 of the llvm bugfix [guide](https://rust-lang.github.io/rustc-guide/codegen/updating-llvm.html#bugfix-updates), now that Rust's copy of LLVM was [updated](rust-lang/llvm-project#13).

This PR closes issue rust-lang#59077. Nightlies following this PR should have working msp430 codegen again :D.

Thanks for the prompt response even though it took me a while to get this "simple" PR done!
@Centril
Copy link
Contributor Author

Centril commented May 21, 2019

@bors r+ p=3 rollup=never

@bors
Copy link
Contributor

bors commented May 21, 2019

📌 Commit 62afa76 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 21, 2019
@bors
Copy link
Contributor

bors commented May 21, 2019

⌛ Testing commit 62afa76 with merge a2c9ef79ca76c0da27664dafc462f90683370009...

@bors
Copy link
Contributor

bors commented May 21, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-aarch64-linux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:03:52] --- stdout
[00:03:52] TARGET = Some("x86_64-unknown-linux-gnu")
[00:03:52] OPT_LEVEL = Some("2")
[00:03:52] HOST = Some("x86_64-unknown-linux-gnu")
[00:03:52] CC_x86_64-unknown-linux-gnu = Some("sccache cc")
[00:03:52] CFLAGS_x86_64-unknown-linux-gnu = Some("-ffunction-sections -fdata-sections -fPIC -m64")
[00:03:52] CRATE_CC_NO_DEFAULTS = None
[00:03:52] DEBUG = Some("false")
[00:03:52] CARGO_CFG_TARGET_FEATURE = Some("fxsr,mmx,sse,sse2")
[00:03:52] running: "sccache" "cc" "-O2" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-fno-builtin" "-fvisibility=hidden" "-fomit-frame-pointer" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-DCOMPILER_RT_HAS_ATOMICS=1" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/build/profiler_builtins-98e28db5f13c3bec/out/GCDAProfiling.o" "-c" "/cargo/registry/src/github.com-1ecc6299db9ec823/compiler_builtins-0.1.15/compiler-rt/lib/profile/GCDAProfiling.c"
[00:03:52] cargo:warning=cc: error: /cargo/registry/src/github.com-1ecc6299db9ec823/compiler_builtins-0.1.15/compiler-rt/lib/profile/GCDAProfiling.c: No such file or directory
[00:03:52] cargo:warning=cc: warning: '-x c' after last input file has no effect
[00:03:52] cargo:warning=cc: fatal error: no input files
[00:03:52] cargo:warning=compilation terminated.
[00:03:52] 
[00:03:52] --- stderr
[00:03:52] thread 'main' panicked at '
[00:03:52] 
[00:03:52] 
[00:03:52] Internal error occurred: Command "sccache" "cc" "-O2" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-fno-builtin" "-fvisibility=hidden" "-fomit-frame-pointer" "-ffreestanding" "-DVISIBILITY_HIDDEN" "-DCOMPILER_RT_HAS_UNAME=1" "-DCOMPILER_RT_HAS_FCNTL_LCK=1" "-DCOMPILER_RT_HAS_ATOMICS=1" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-std/x86_64-unknown-linux-gnu/release/build/profiler_builtins-98e28db5f13c3bec/out/GCDAProfiling.o" "-c" "/cargo/registry/src/github.com-1ecc6299db9ec823/compiler_builtins-0.1.15/compiler-rt/lib/profile/GCDAProfiling.c" with args "cc" did not execute successfully (status code exit code: 1).
[00:03:52] ', /cargo/registry/src/github.com-1ecc6299db9ec823/cc-1.0.35/src/lib.rs:2398:5
[00:03:52] note: Run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
[00:03:52] 
[00:03:52] warning: build failed, waiting for other jobs to finish...
---
travis_time:end:1e2e92de:start=1558399699876263235,finish=1558399699890322238,duration=14059003
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0a4ee891
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0a0a8324
travis_time:start:0a0a8324
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:00bbd071
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@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 21, 2019
@Centril Centril closed this May 21, 2019
@Centril Centril deleted the rollup-u441n72 branch May 21, 2019 00:51
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup 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.

6 participants