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.

Sign up for GitHub

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

Jump to bottom

Split assembly tests for ELF and MachO #120124

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Split assembly tests for ELF and MachO #120124

merged 1 commit into from
Jan 26, 2024

Conversation

nikic
Copy link
Contributor

@nikic nikic commented Jan 19, 2024

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18.

Fixes #120105.

r? @davidtwco

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 19, 2024
@nikic nikic added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Jan 19, 2024
@nikic nikic mentioned this pull request Jan 22, 2024
Merged
@davidtwco
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 23, 2024

📌 Commit c7a77b2 has been approved by davidtwco

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 Jan 23, 2024
fmease added a commit to fmease/rust that referenced this pull request Jan 23, 2024
@fmease
Rollup merge of rust-lang#120124 - nikic:fix-assembly-test, r=davidtwco
ab099a3 
Split assembly tests for ELF and MachO

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18.

Fixes rust-lang#120105.

r? `@davidtwco`
@fmease fmease mentioned this pull request Jan 23, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 23, 2024
@bors
Auto merge of rust-lang#120271 - fmease:rollup-nbm2e8h, r=fmease
8a676e9 
Rollup of 13 pull requests

Successful merges:

 - rust-lang#119028 (Add more weirdness to weird-exprs.rs)
 - rust-lang#119805 (Suggest array::from_fn for array initialization)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120177 (Remove duplicate dependencies for rustc)
 - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions)
 - rust-lang#120188 (compiler: update freebsd and netbsd base specs.)
 - rust-lang#120201 (Bump some deps with syn 1.0 dependencies)
 - rust-lang#120215 (Update some deps with `bitflags` v1 dependencies)
 - rust-lang#120244 (Use `Self` in `NonZero*` implementations.)
 - rust-lang#120246 (Re-add estebank to review rotation)
 - rust-lang#120252 (rename `RawTy` to `LoweredTy`)
 - rust-lang#120255 (correct my mailmap entry)
 - rust-lang#120270 (A bunch of random modifications)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 23, 2024
@bors
Auto merge of rust-lang#120271 - fmease:rollup-nbm2e8h, r=fmease
1f09e7d 
Rollup of 13 pull requests

Successful merges:

 - rust-lang#119028 (Add more weirdness to weird-exprs.rs)
 - rust-lang#119805 (Suggest array::from_fn for array initialization)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120177 (Remove duplicate dependencies for rustc)
 - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions)
 - rust-lang#120188 (compiler: update freebsd and netbsd base specs.)
 - rust-lang#120201 (Bump some deps with syn 1.0 dependencies)
 - rust-lang#120215 (Update some deps with `bitflags` v1 dependencies)
 - rust-lang#120244 (Use `Self` in `NonZero*` implementations.)
 - rust-lang#120246 (Re-add estebank to review rotation)
 - rust-lang#120252 (rename `RawTy` to `LoweredTy`)
 - rust-lang#120255 (correct my mailmap entry)
 - rust-lang#120270 (A bunch of random modifications)

r? `@ghost`
`@rustbot` modify labels: rollup
fmease added a commit to fmease/rust that referenced this pull request Jan 24, 2024
@fmease
Rollup merge of rust-lang#120124 - nikic:fix-assembly-test, r=davidtwco
dceb83c 
Split assembly tests for ELF and MachO

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18.

Fixes rust-lang#120105.

r? ``@davidtwco``
@fmease fmease mentioned this pull request Jan 24, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 24, 2024
@bors
Auto merge of rust-lang#120289 - fmease:rollup-f3qh886, r=fmease
56ebadf 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#119460 (coverage: Never emit improperly-ordered coverage regions)
 - rust-lang#120062 (llvm: change data layout bug to an error and make it trigger more)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions)
 - rust-lang#120265 (Remove no-system-llvm)
 - rust-lang#120277 (Normalize field types before checking validity)
 - rust-lang#120285 (Remove extra # from url in suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
fmease added a commit to fmease/rust that referenced this pull request Jan 24, 2024
@fmease
Rollup merge of rust-lang#120124 - nikic:fix-assembly-test, r=davidtwco
7f80c2a 
Split assembly tests for ELF and MachO

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18.

Fixes rust-lang#120105.

r? ```@davidtwco```
@fmease fmease mentioned this pull request Jan 24, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 24, 2024
@bors
Auto merge of rust-lang#120290 - fmease:rollup-f87t55u, r=fmease
123632e 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#119460 (coverage: Never emit improperly-ordered coverage regions)
 - rust-lang#120062 (llvm: change data layout bug to an error and make it trigger more)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120165 (Switch `NonZero` alias direction.)
 - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions)
 - rust-lang#120265 (Remove no-system-llvm)
 - rust-lang#120285 (Remove extra # from url in suggestion)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease fmease mentioned this pull request Jan 24, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 24, 2024
@bors
Auto merge of rust-lang#120303 - fmease:rollup-to11ql5, r=fmease
fe158e6 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#114764 ([style edition 2024] Combine all delimited exprs as last argument)
 - rust-lang#118326 (Add `NonZero*::count_ones`)
 - rust-lang#118636 (Add the unstable option  to reduce the binary size of dynamic library…)
 - rust-lang#119460 (coverage: Never emit improperly-ordered coverage regions)
 - rust-lang#119616 (Add a new `wasm32-wasi-preview2` target)
 - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions)
 - rust-lang#120265 (Remove no-system-llvm)
 - rust-lang#120284 (privacy: Refactor top-level visiting in `TypePrivacyVisitor`)
 - rust-lang#120285 (Remove extra # from url in suggestion)
 - rust-lang#120299 (Add mw to review rotation and add some owner assignments)

Failed merges:

 - rust-lang#120124 (Split assembly tests for ELF and MachO)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jan 24, 2024

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

@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 Jan 24, 2024
@durin42 durin42 removed the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Jan 25, 2024
@durin42
Copy link
Contributor

durin42 commented Jan 25, 2024

Removed the label so that the LLVM HEAD CI bot can continue to make forward progress while we wait on this to be rebased.

@rustbot
Copy link
Collaborator

rustbot commented Jan 25, 2024

Some changes occurred in src/tools/cargo

cc @ehuss

@nikic
Split assembly tests for ELF and MachO
8866449 
On ELF, the text section is opened with ".text", on MachO with
".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note
section, which is no longer emitted on Solaris starting with
LLVM 18.

Fixes rust-lang#120105.
@nikic
Copy link
Contributor Author

nikic commented Jan 25, 2024

Rebased.

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Jan 25, 2024

📌 Commit 8866449 has been approved by davidtwco

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 25, 2024
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 26, 2024
@compiler-errors
Rollup merge of rust-lang#120124 - nikic:fix-assembly-test, r=davidtwco
d3eda76 
Split assembly tests for ELF and MachO

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18.

Fixes rust-lang#120105.

r? `@davidtwco`
@compiler-errors compiler-errors mentioned this pull request Jan 26, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2024
@bors
Auto merge of rust-lang#120359 - compiler-errors:rollup-3btckn2, r=co…
de9022d 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#118803 (Add the `min_exhaustive_patterns` feature gate)
 - rust-lang#119286 (show linker output even if the linker succeeds)
 - rust-lang#119616 (Add a new `wasm32-wasi-preview2` target)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120201 (Bump some deps with syn 1.0 dependencies)
 - rust-lang#120204 (Builtin macros effectively have implicit #[collapse_debuginfo(yes)])
 - rust-lang#120322 (Don't manually resolve async closures in `rustc_resolve`)
 - rust-lang#120356 (Fix broken markdown in csky-unknown-linux-gnuabiv2.md)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 26, 2024
@matthiaskrgr
Rollup merge of rust-lang#120124 - nikic:fix-assembly-test, r=davidtwco
86031a0 
Split assembly tests for ELF and MachO

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18.

Fixes rust-lang#120105.

r? ``@davidtwco``
This was referenced Jan 26, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2024
@bors
Auto merge of rust-lang#120365 - matthiaskrgr:rollup-ly2w0d5, r=matth…
dbb1d48 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107464 (Add `str::Lines::remainder`)
 - rust-lang#118803 (Add the `min_exhaustive_patterns` feature gate)
 - rust-lang#119466 (Initial implementation of `str::from_raw_parts[_mut]`)
 - rust-lang#120053 (Specialize `Bytes` on `StdinLock<'_>`)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120204 (Builtin macros effectively have implicit #[collapse_debuginfo(yes)])
 - rust-lang#120322 (Don't manually resolve async closures in `rustc_resolve`)
 - rust-lang#120356 (Fix broken markdown in csky-unknown-linux-gnuabiv2.md)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2024
@bors
Auto merge of rust-lang#120365 - matthiaskrgr:rollup-ly2w0d5, r=matth…
1fc46f3 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#107464 (Add `str::Lines::remainder`)
 - rust-lang#118803 (Add the `min_exhaustive_patterns` feature gate)
 - rust-lang#119466 (Initial implementation of `str::from_raw_parts[_mut]`)
 - rust-lang#120053 (Specialize `Bytes` on `StdinLock<'_>`)
 - rust-lang#120124 (Split assembly tests for ELF and MachO)
 - rust-lang#120204 (Builtin macros effectively have implicit #[collapse_debuginfo(yes)])
 - rust-lang#120322 (Don't manually resolve async closures in `rustc_resolve`)
 - rust-lang#120356 (Fix broken markdown in csky-unknown-linux-gnuabiv2.md)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e04cba2 into rust-lang:master Jan 26, 2024
11 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Jan 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2024
@rust-timer
Unrolled build for rust-lang#120124
80b5b1b 
Rollup merge of rust-lang#120124 - nikic:fix-assembly-test, r=davidtwco

Split assembly tests for ELF and MachO

On ELF, the text section is opened with ".text", on MachO with ".section __TEXT,__text".

Previously, on ELF this test was actually matching a GNU note section, which is no longer emitted on Solaris starting with LLVM 18.

Fixes rust-lang#120105.

r? ```@davidtwco```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.77.0
Development

Successfully merging this pull request may close these issues.

LLVM 18: tests/assembly/targets/targets-elf.rs fails
5 participants
@nikic @davidtwco @bors @durin42 @rustbot