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

Revert relax_elf_relocations default change #115267

Merged
merged 1 commit into from
Aug 28, 2023

Conversation

nikic
Copy link
Contributor

@nikic nikic commented Aug 27, 2023

This reverts commit 4410868 (#106511).

The change caused linker failures with the binutils version used by cross (#115239), as well as miscompilations when using the mold linker (https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/SIGILL.20in.20build-script-build.20with.20nightly-2023-08-25/near/387506479).

This reverts commit 4410868, reversing
changes made to 249595b.

This causes linker failures with the binutils version used by
cross (rust-lang#115239), as well as miscompilations when using the mold
linker.
@rustbot
Copy link
Collaborator

rustbot commented Aug 27, 2023

r? @TaKO8Ki

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 27, 2023
@rustbot
Copy link
Collaborator

rustbot commented Aug 27, 2023

These commits modify compiler targets.
(See the Target Tier Policy.)

@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Aug 27, 2023

📌 Commit 1b7cf24 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Aug 27, 2023
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Aug 27, 2023
…piler-errors

Revert relax_elf_relocations default change

This reverts commit 4410868 (rust-lang#106511).

The change caused linker failures with the binutils version used by cross (rust-lang#115239), as well as miscompilations when using the mold linker (https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/SIGILL.20in.20build-script-build.20with.20nightly-2023-08-25/near/387506479).
@bors
Copy link
Contributor

bors commented Aug 28, 2023

⌛ Testing commit 1b7cf24 with merge f7dd70c...

@bors
Copy link
Contributor

bors commented Aug 28, 2023

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing f7dd70c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 28, 2023
@bors bors merged commit f7dd70c into rust-lang:master Aug 28, 2023
@rustbot rustbot added this to the 1.74.0 milestone Aug 28, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f7dd70c): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.7% [-0.7%, -0.7%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.7% [-0.7%, -0.7%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.1% [0.1%, 0.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-4.3% [-4.3%, -4.3%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.1% [-4.3%, 0.1%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.6% [0.4%, 1.0%] 16
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.6% [0.4%, 1.0%] 16

Bootstrap: 631.903s -> 632.239s (0.05%)
Artifact size: 316.08 MiB -> 316.22 MiB (0.04%)

bors added a commit to rust-lang/hashbrown that referenced this pull request Aug 31, 2023
Migrate from `actions-rs/toolchain@v1` to `dtolnay/rust-toolchain@master` and remove `Cross.toml`

This PR replace the usage of [actions-rs/toolchain@v1](https://github.com/actions-rs/toolchain) with [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) as it is no longer maintained and uses the deprecated GitHub Actions API. The [dtolnay/rust-toolchain](https://github.com/dtolnay/rust-toolchain) provides similar functionality and also provides some additional features such as colored output.

Regarding the `Cross.toml` file, it is no longer needed after merging rust-lang/rust#115267.
sunfishcode added a commit to sunfishcode/origin that referenced this pull request Sep 9, 2023
As of rust-lang/rust#115267, the call from
`rustix::param::init` to `backend::param::auxv::init` goes through the GOT,
which is not yet relocated when the `relocate` code runs.

Change the `relocate` code to read the AUX values itself instead of using
rustix, and make it avoid using any other calls, and move the `relocate`
call before the `rustix::param::init` call.
sunfishcode added a commit to sunfishcode/origin that referenced this pull request Sep 9, 2023
* Update to the latest Rust nightly.

* Change the relocation code to avoid making any calls.

As of rust-lang/rust#115267, the call from
`rustix::param::init` to `backend::param::auxv::init` goes through the GOT,
which is not yet relocated when the `relocate` code runs.

Change the `relocate` code to read the AUX values itself instead of using
rustix, and make it avoid using any other calls, and move the `relocate`
call before the `rustix::param::init` call.
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants