Rollup of 4 pull requests #117336

workingjubilee · 2023-10-29T00:10:31Z

Successful merges:

Add support for i586-unknown-netbsd as target. #117170 (Add support for i586-unknown-netbsd as target.)
Declare rustc_target's dependency on object/macho #117259 (Declare rustc_target's dependency on object/macho)
change default output mode of BootstrapCommand #117322 (change default output mode of BootstrapCommand)
Small ty::print cleanups #117325 (Small ty::print cleanups)

r? @ghost
@rustbot modify labels: rollup

This restricts instructions to those offered by Pentium, to support e.g. AMD Geode. There is already an entry for this target in the NetBSD platform support page at src/doc/rustc/src/platform-support/netbsd.md ...so this should forestall its removal. Additional fixes are needed for some vendored modules, this is the changes in the rust compiler core itself.

...explaining why we need -latomic (gcc & g++ built for i486, and LLVM insisting on use of 64-bit atomics).

This hopefully fixes the CI run after integration of this target.

This triggers a consistency check in rust (that all linker flavours must have identical arguments), and on NetBSD/i386, the 32-bitness is implicitly chosen through the chosen toolchain, and appears to not be required. So drop it, and also drop the imports of the now-no-longer-used identifiers.

Signed-off-by: onur-ozkan <[email protected]>

Add support for i586-unknown-netbsd as target. This restricts instructions to those offered by Pentium, to support e.g. AMD Geode. There is already an entry for this target in the NetBSD platform support page at src/doc/rustc/src/platform-support/netbsd.md ...so this should forestall its removal. Additional fixes are needed for some vendored modules, this is the changes in the rust compiler core itself.

Declare rustc_target's dependency on object/macho Without this, `cargo check` fails in crates that depend on rustc_target. <details> <summary>`cargo check` diagnostics</summary> ```console Checking rustc_target v0.0.0 error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:176:17 | 176 | object::macho::PLATFORM_MACOS => Some((13, 1)), | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:177:17 | 177 | object::macho::PLATFORM_IOS | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:178:19 | 178 | | object::macho::PLATFORM_IOSSIMULATOR | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:179:19 | 179 | | object::macho::PLATFORM_TVOS | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:180:19 | 180 | | object::macho::PLATFORM_TVOSSIMULATOR | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:181:19 | 181 | | object::macho::PLATFORM_MACCATALYST => Some((16, 2)), | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:182:17 | 182 | object::macho::PLATFORM_WATCHOS | object::macho::PLATFORM_WATCHOSSIMULATOR => Some((9, 1)), | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:182:51 | 182 | object::macho::PLATFORM_WATCHOS | object::macho::PLATFORM_WATCHOSSIMULATOR => Some((9, 1)), | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:189:33 | 189 | ("macos", _) => object::macho::PLATFORM_MACOS, | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:190:38 | 190 | ("ios", "macabi") => object::macho::PLATFORM_MACCATALYST, | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:191:35 | 191 | ("ios", "sim") => object::macho::PLATFORM_IOSSIMULATOR, | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:192:31 | 192 | ("ios", _) => object::macho::PLATFORM_IOS, | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:193:39 | 193 | ("watchos", "sim") => object::macho::PLATFORM_WATCHOSSIMULATOR, | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:194:35 | 194 | ("watchos", _) => object::macho::PLATFORM_WATCHOS, | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:195:36 | 195 | ("tvos", "sim") => object::macho::PLATFORM_TVOSSIMULATOR, | ^^^^^ could not find `macho` in `object` error[E0433]: failed to resolve: could not find `macho` in `object` --> compiler/rustc_target/src/spec/apple_base.rs:196:32 | 196 | ("tvos", _) => object::macho::PLATFORM_TVOS, | ^^^^^ could not find `macho` in `object` ``` </details> `rustc_target` unconditionally contains its `spec` module (i.e. there is no `#[cfg]` on the `mod spec;`). The `spec/mod.rs` also does not start with `#![cfg]`. https://github.com/rust-lang/rust/blob/aa91057796695679e95329947d9f497cb5bdc5da/compiler/rustc_target/src/lib.rs#L37 Similarly, the `spec` module unconditionally contains `apple_base`. https://github.com/rust-lang/rust/blob/aa91057796695679e95329947d9f497cb5bdc5da/compiler/rustc_target/src/spec/mod.rs#L62 And, `apple_base` unconditionally refers to `object::macho`. https://github.com/rust-lang/rust/blob/aa91057796695679e95329947d9f497cb5bdc5da/compiler/rustc_target/src/spec/apple_base.rs#L176 So I figure there is no way `object::macho` isn't needed by rustc. `object::macho` only exists if the `object` crate's "macho" feature is enabled. https://github.com/gimli-rs/object/blob/0.32.0/src/lib.rs#L111-L112

… r=Kobzol change default output mode of `BootstrapCommand` `SuppressOnSuccess` on `BootstrapCommand` is a problematic default mode as it affects the logs during the bootstrapping (as shown in the screenshot below). The default behavior should be to print everything unless we explicitly modify the behavior within build steps. ![image](https://github.com/rust-lang/rust/assets/39852038/8dbaaeb2-0656-4ff9-8e48-1ac0734a913f) Fixes rust-lang#117315 cc `@Kobzol`

…r-errors Small ty::print cleanups

workingjubilee · 2023-10-29T00:11:12Z

Should follow in after #117335
@bors r+ rollup=never p=4

bors · 2023-10-29T00:11:14Z

📌 Commit 505bc85 has been approved by workingjubilee

It is now in the queue for this repository.

workingjubilee · 2023-10-29T00:16:50Z

Note the use of a different set of PRs, so that their sets are disjoint. Together these are only 1 more than #117333 and the split is because the abort in that one was undiagnosable for me, so while it would be nice for the queue to move fast, it would also be nice to know where the bug is if there is one. Thus two rollups, on the chance that the failure reoccurs: I suspect it is spurious.

bors · 2023-10-29T03:53:39Z

⌛ Testing commit 505bc85 with merge bbcc169...

bors · 2023-10-29T05:50:55Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing bbcc169 to master...

rust-timer · 2023-10-29T05:52:04Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#117170	Add support for i586-unknown-netbsd as target.	`e9f0d987d35513ee6dad1955585d1d3114d75142` (link)
#117259	Declare rustc_target's dependency on object/macho	`94ddaf428fcdee174fd0bf6e1a8182c8edebb52a` (link)
#117322	change default output mode of `BootstrapCommand`	`0d52265d3627dd19913dfee9d3268087bbfb80a6` (link)
#117325	Small ty::print cleanups	`dc6ca0c947d85994fe7238937ef5cd94936d2abf` (link)

previous master: 2106b63b7b

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-29T08:34:09Z

Finished benchmarking commit (bbcc169): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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
Regressions ❌ (secondary)	2.5%	[2.5%, 2.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.2%	[-4.2%, -4.2%]	1
All ❌✅ (primary)	-	-	0

Cycles

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)	4.4%	[4.4%, 4.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.3%	[-3.3%, -3.3%]	2
All ❌✅ (primary)	4.4%	[4.4%, 4.4%]	1

Binary size

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

Bootstrap: 635.14s -> 636.381s (0.20%)
Artifact size: 304.41 MiB -> 304.39 MiB (-0.01%)

he32 and others added 17 commits October 25, 2023 15:23

rustc_llvm/build.rs: improve comment for NetBSD/i386 targets

391b472

...explaining why we need -latomic (gcc & g++ built for i486, and LLVM insisting on use of 64-bit atomics).

Declare rustc_target dependency on object/macho

0a82920

i586_unknown_netbsd.rs: fix formatting.

893e726

This hopefully fixes the CI run after integration of this target.

For i586/NetBSD: fix another formatting insistence.

0f04e2d

i586-unknown-netbsd: add entry in platform-support.md.

d9ddad3

change default output mode of BootstrapCommand

3bb0c94

Signed-off-by: onur-ozkan <[email protected]>

i586-unknown-netbsd platform-support.md: fix typo.

f5fa36f

set BootstrapCommand output mode for submodules

236f6ba

Signed-off-by: onur-ozkan <[email protected]>

Remove needless print ctx defs

56643ec

Move macros to usage

4dada60

Remove needless allows

4e2bbfe

Rollup merge of rust-lang#117325 - Nilstrieb:pretty-macros, r=compile…

505bc85

…r-errors Small ty::print cleanups

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, 2023

workingjubilee mentioned this pull request Oct 29, 2023

Rollup of 5 pull requests #117335

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 29, 2023

bors merged commit bbcc169 into rust-lang:master Oct 29, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 29, 2023

workingjubilee deleted the rollup-6negquv branch October 29, 2023 06:26

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #117336

Rollup of 4 pull requests #117336

workingjubilee commented Oct 29, 2023

workingjubilee commented Oct 29, 2023

bors commented Oct 29, 2023

workingjubilee commented Oct 29, 2023 •

edited

Loading

bors commented Oct 29, 2023

bors commented Oct 29, 2023

rust-timer commented Oct 29, 2023

rust-timer commented Oct 29, 2023

Rollup of 4 pull requests #117336

Rollup of 4 pull requests #117336

Conversation

workingjubilee commented Oct 29, 2023

workingjubilee commented Oct 29, 2023

bors commented Oct 29, 2023

workingjubilee commented Oct 29, 2023 • edited Loading

bors commented Oct 29, 2023

bors commented Oct 29, 2023

rust-timer commented Oct 29, 2023

rust-timer commented Oct 29, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

workingjubilee commented Oct 29, 2023 •

edited

Loading