Pass objcopy args for stripping on OSX #135034

Noratrieb · 2025-01-02T16:03:42Z

When -Cstrip was changed in #131405 to use the bundled rust-objcopy instead of /usr/bin/strip on OSX, strip-like arguments were preserved.

But strip and objcopy are, while being the same binary, different, they have different defaults depending on which binary they are. Notably, strip strips everything by default, and objcopy doesn't strip anything by default.

Additionally, -S actually means --strip-all, so debuginfo stripped everything and symbols didn't strip anything.

We now correctly pass --strip-debug and --strip-all.

fixes #135028

try-job: aarch64-apple
try-job: dist-aarch64-apple

Noratrieb · 2025-01-02T16:03:47Z

@bors try

rustbot · 2025-01-02T16:03:52Z

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-01-02T16:03:55Z

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

Pass objcopy args for stripping on OSX When `-Cstrip` was changed in rust-lang#131405 to use the bundled rust-objcopy instead of /usr/bin/strip on OSX, strip-like arguments were preserved. But strip and objcopy are, while being the same binary, different, they have different defaults depending on which binary they are. Notably, strip strips everything by default, and objcopy doesn't strip anything by default. Additionally, `-S` actually means `--strip-all`, so debuginfo stripped everything and symbols didn't strip anything. We now correctly pass `--strip-debug` and `--strip-all`. fixes rust-lang#135028 try-jobs: aarch64-apple

bors · 2025-01-02T16:04:59Z

⌛ Trying commit 26309e5 with merge cc677e6...

klensy · 2025-01-02T16:37:45Z

We want to strip binaries, so we would use llvm-objcopy but not llvm-strip. Can this use llvm-strip instead?

Noratrieb · 2025-01-02T16:39:24Z

That is a possible alternative, but I would prefer to avoid changing bootstrap to ship it as llvm-strip, especially for something that's backported. Just changing the flags works fine.

jieyouxu

Thanks, the changes LGTM with two nits. r=me if try job comes back green. I don't have access to a native macOS environment to try this locally though.

compiler/rustc_codegen_ssa/src/back/link.rs

rustbot · 2025-01-02T16:56:01Z

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

Noratrieb · 2025-01-02T17:01:51Z

@bors try

bors · 2025-01-02T17:03:01Z

⌛ Trying commit 75a5355 with merge efbd1f63fafc97e79d87330dba4f3d04396ecdf3...

Pass objcopy args for stripping on OSX When `-Cstrip` was changed in rust-lang#131405 to use the bundled rust-objcopy instead of /usr/bin/strip on OSX, strip-like arguments were preserved. But strip and objcopy are, while being the same binary, different, they have different defaults depending on which binary they are. Notably, strip strips everything by default, and objcopy doesn't strip anything by default. Additionally, `-S` actually means `--strip-all`, so debuginfo stripped everything and symbols didn't strip anything. We now correctly pass `--strip-debug` and `--strip-all`. fixes rust-lang#135028 try-jobs: aarch64-apple try-jobs: dist-aarch64-apple

bors · 2025-01-02T18:49:49Z

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

Noratrieb · 2025-01-02T18:56:20Z

@bors try

Pass objcopy args for stripping on OSX When `-Cstrip` was changed in rust-lang#131405 to use the bundled rust-objcopy instead of /usr/bin/strip on OSX, strip-like arguments were preserved. But strip and objcopy are, while being the same binary, different, they have different defaults depending on which binary they are. Notably, strip strips everything by default, and objcopy doesn't strip anything by default. Additionally, `-S` actually means `--strip-all`, so debuginfo stripped everything and symbols didn't strip anything. We now correctly pass `--strip-debug` and `--strip-all`. fixes rust-lang#135028 try-job: aarch64-apple try-job: dist-aarch64-apple

bors · 2025-01-02T18:57:30Z

⌛ Trying commit 75a5355 with merge 3f1985a...

bors · 2025-01-02T20:16:14Z

💔 Test failed - checks-actions

When `-Cstrip` was changed to use the bundled rust-objcopy instead of /usr/bin/strip on OSX, strip-like arguments were preserved. But strip and objcopy are, while being the same binary, different, they have different defaults depending on which binary they are. Notably, strip strips everything by default, and objcopy doesn't strip anything by default. Additionally, `-S` actually means `--strip-all`, so debuginfo stripped everything and symbols didn't strip anything. We now correctly pass `--strip-debug` and `--strip-all`.

bors · 2025-01-02T21:26:08Z

⌛ Trying commit 4da3aed with merge 05ab192...

Pass objcopy args for stripping on OSX When `-Cstrip` was changed in rust-lang#131405 to use the bundled rust-objcopy instead of /usr/bin/strip on OSX, strip-like arguments were preserved. But strip and objcopy are, while being the same binary, different, they have different defaults depending on which binary they are. Notably, strip strips everything by default, and objcopy doesn't strip anything by default. Additionally, `-S` actually means `--strip-all`, so debuginfo stripped everything and symbols didn't strip anything. We now correctly pass `--strip-debug` and `--strip-all`. fixes rust-lang#135028 try-job: aarch64-apple try-job: dist-aarch64-apple

bors · 2025-01-02T22:44:09Z

☀️ Try build successful - checks-actions
Build commit: 05ab192 (05ab192fe0df5911298fa2b06c24e558f7d153cc)

Noratrieb · 2025-01-03T11:10:41Z

@orlp did some local testing of this commit and I did as well, it appears to work correctly, doing precisely as much stripping as we asked for. I observed the same working behavior on stable, and the reported broken behavior on beta.

@bors r=jieyouxu

bors · 2025-01-03T11:10:43Z

📌 Commit 4da3aed has been approved by jieyouxu

It is now in the queue for this repository.

jieyouxu · 2025-01-03T11:21:52Z

@bors p=5 rollup=iffy (macos-specific strip, fixes a P-critical regression)

Noratrieb · 2025-01-03T11:52:01Z

@bors p=15 to jump ahead of rollups

Pass objcopy args for stripping on OSX When `-Cstrip` was changed in rust-lang#131405 to use the bundled rust-objcopy instead of /usr/bin/strip on OSX, strip-like arguments were preserved. But strip and objcopy are, while being the same binary, different, they have different defaults depending on which binary they are. Notably, strip strips everything by default, and objcopy doesn't strip anything by default. Additionally, `-S` actually means `--strip-all`, so debuginfo stripped everything and symbols didn't strip anything. We now correctly pass `--strip-debug` and `--strip-all`. fixes rust-lang#135028 try-job: aarch64-apple try-job: dist-aarch64-apple

bors · 2025-01-03T12:18:18Z

⌛ Testing commit 4da3aed with merge 436ab06...

rust-log-analyzer · 2025-01-03T14:13:22Z

The job dist-x86_64-msvc failed! Check out the build log: (web) (plain)

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

[2025-01-03T13:07:42Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-01-03T13:07:42Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Debug, scenario=Some(Full), patch=None, backend=Llvm, phase=benchmark
[2025-01-03T13:07:42Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpWkhKxW#[email protected]" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln"
[2025-01-03T13:07:43Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Debug, scenario=Some(IncrFull), patch=None, backend=Llvm, phase=benchmark
[2025-01-03T13:07:43Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpWkhKxW#[email protected]" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\a\\_temp\\msys64\\tmp\\.tmpWkhKxW\\incremental-state"
[2025-01-03T13:07:43Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Debug, scenario=Some(IncrUnchanged), patch=None, backend=Llvm, phase=benchmark
[2025-01-03T13:07:43Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpWkhKxW#[email protected]" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\a\\_temp\\msys64\\tmp\\.tmpWkhKxW\\incremental-state"
[2025-01-03T13:07:43Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-01-03T13:07:43Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Opt, scenario=Some(Full), patch=None, backend=Llvm, phase=benchmark
[2025-01-03T13:07:43Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpeSuckL#[email protected]" "--release" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln"
[2025-01-03T13:07:44Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrFull), patch=None, backend=Llvm, phase=benchmark
---
   Compiling build_helper v0.1.0 (C:\a\rust\rust\src\build_helper)
   Compiling xz2 v0.1.7
error: linking with `link.exe` failed: exit code: 1104
  |
  = note: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.42.34433\\bin\\HostX64\\x64\\link.exe" "/NOLOGO" "C:\\a\\_temp\\msys64\\tmp\\rustcflV56w\\symbols.o" "<25 object files omitted>" "C:\\a\\rust\\rust\\build\\bootstrap\\debug\\deps/{libcc-d5c8d35fb85b97b9.rlib,libshlex-2473e794facdeeb6.rlib}" "C:\\a\\rust\\rust\\build\\unpacked-dist\\rustc-nightly-x86_64-pc-windows-msvc\\rustc\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib/{libstd-e5892338f3c052bf.rlib,libpanic_unwind-e2e1e25e9c29d5c1.rlib,libwindows_targets-650a9189f256d76e.rlib,librustc_demangle-0019317d0b181fcd.rlib,libstd_detect-b572621cbf6f273f.rlib,libhashbrown-e2aed45f16697a5f.rlib,librustc_std_workspace_alloc-2a3ec57dff547df2.rlib,libunwind-79dc983f2b548f92.rlib,libcfg_if-b8ed0a8dbe393c28.rlib,liballoc-ec76c8035bd3de2e.rlib,librustc_std_workspace_core-5a536bba43fbe272.rlib,libcore-45b7a05b67ddb8c6.rlib,libcompiler_builtins-5fe297e6720ad64e.rlib}" "kernel32.lib" "advapi32.lib" "ole32.lib" "oleaut32.lib" "kernel32.lib" "kernel32.lib" "advapi32.lib" "ntdll.lib" "userenv.lib" "ws2_32.lib" "dbghelp.lib" "/defaultlib:msvcrt" "/NXCOMPAT" "/LIBPATH:C:\\Users\\runneradmin\\.cargo\\registry\\src\\index.crates.io-1949cf8c6b5b557f\\windows_x86_64_msvc-0.52.6\\lib" "/LIBPATH:C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.42.34433\\atlmfc\\lib\\x64" "/LIBPATH:C:\\a\\rust\\rust\\build\\bootstrap\\debug\\build\\lzma-sys-673b8c12147494d3\\out" "/OUT:C:\\a\\rust\\rust\\build\\bootstrap\\debug\\deps\\sccache_plus_cl.exe" "/OPT:REF,NOICF" "/DEBUG" "/PDBALTPATH:%_PDB%" "/NATVIS:C:\\a\\rust\\rust\\build\\unpacked-dist\\rustc-nightly-x86_64-pc-windows-msvc\\rustc\\lib\\rustlib\\etc\\intrinsic.natvis" "/NATVIS:C:\\a\\rust\\rust\\build\\unpacked-dist\\rustc-nightly-x86_64-pc-windows-msvc\\rustc\\lib\\rustlib\\etc\\liballoc.natvis" "/NATVIS:C:\\a\\rust\\rust\\build\\unpacked-dist\\rustc-nightly-x86_64-pc-windows-msvc\\rustc\\lib\\rustlib\\etc\\libcore.natvis" "/NATVIS:C:\\a\\rust\\rust\\build\\unpacked-dist\\rustc-nightly-x86_64-pc-windows-msvc\\rustc\\lib\\rustlib\\etc\\libstd.natvis"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: LINK : fatal error LNK1104: cannot open file 'C:\a\rust\rust\build\bootstrap\debug\deps\sccache_plus_cl.exe'␍


error: could not compile `bootstrap` (bin "sccache-plus-cl") due to 1 previous error
warning: build failed, waiting for other jobs to finish...
failed to run: C:/a/rust/rust/build/unpacked-dist/cargo-nightly-x86_64-pc-windows-msvc/cargo/bin/cargo.exe build --manifest-path C:\a\rust\rust\src/bootstrap/Cargo.toml -Zroot-dir=C:\a\rust\rust
[2025-01-03T14:12:53.455Z INFO  opt_dist::timer] Section `Run tests` ended: FAIL (42.95s)`
[2025-01-03T14:12:53.455Z INFO  opt_dist] Timer results
    -----------------------------------------------------------------
    Stage 1 (Rustc PGO):                            2749.04s (44.93%)

bors · 2025-01-03T14:13:51Z

💔 Test failed - checks-actions

Noratrieb · 2025-01-03T14:15:35Z

@bors retry get better at deleting files, my friend

apiraino · 2025-01-03T14:51:20Z

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle.

@rustbot label +beta-accepted

bors · 2025-01-03T17:20:42Z

⌛ Testing commit 4da3aed with merge 3f43b1a...

bors · 2025-01-03T20:05:26Z

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 3f43b1a to master...

rust-timer · 2025-01-03T21:21:38Z

Finished benchmarking commit (3f43b1a): 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 (primary -1.5%)

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

Cycles

Results (secondary -7.4%)

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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-7.4%	[-8.5%, -6.4%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 762.379s -> 764.245s (0.24%)
Artifact size: 325.63 MiB -> 325.60 MiB (-0.01%)

rustbot assigned jieyouxu Jan 2, 2025

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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 Jan 2, 2025

Noratrieb added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 2, 2025

jieyouxu approved these changes Jan 2, 2025

View reviewed changes

compiler/rustc_codegen_ssa/src/back/link.rs Show resolved Hide resolved

compiler/rustc_codegen_ssa/src/back/link.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Noratrieb force-pushed the strip-correctly branch from 26309e5 to 75a5355 Compare January 2, 2025 16:55

jieyouxu mentioned this pull request Jan 2, 2025

cleanup: use full strip cli args in cg_ssa #135038

Open

This comment has been minimized.

Sign in to view

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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 2, 2025

Noratrieb force-pushed the strip-correctly branch from 75a5355 to 4da3aed Compare January 2, 2025 21:17

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 3, 2025

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 Jan 3, 2025

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 3, 2025

rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 3, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 3, 2025

bors merged commit 3f43b1a into rust-lang:master Jan 3, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 3, 2025

Noratrieb deleted the strip-correctly branch January 3, 2025 20:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pass objcopy args for stripping on OSX #135034

Pass objcopy args for stripping on OSX #135034

Noratrieb commented Jan 2, 2025 •

edited

Loading

Noratrieb commented Jan 2, 2025

rustbot commented Jan 2, 2025

rustbot commented Jan 2, 2025

bors commented Jan 2, 2025

klensy commented Jan 2, 2025

Noratrieb commented Jan 2, 2025

jieyouxu left a comment •

edited

Loading

This comment has been minimized.

rustbot commented Jan 2, 2025

Noratrieb commented Jan 2, 2025

bors commented Jan 2, 2025

bors commented Jan 2, 2025

Noratrieb commented Jan 2, 2025

bors commented Jan 2, 2025

This comment has been minimized.

bors commented Jan 2, 2025

bors commented Jan 2, 2025

bors commented Jan 2, 2025

Noratrieb commented Jan 3, 2025

bors commented Jan 3, 2025

jieyouxu commented Jan 3, 2025

Noratrieb commented Jan 3, 2025

bors commented Jan 3, 2025

rust-log-analyzer commented Jan 3, 2025

bors commented Jan 3, 2025

Noratrieb commented Jan 3, 2025

apiraino commented Jan 3, 2025

bors commented Jan 3, 2025

bors commented Jan 3, 2025

rust-timer commented Jan 3, 2025

Pass objcopy args for stripping on OSX #135034

Pass objcopy args for stripping on OSX #135034

Conversation

Noratrieb commented Jan 2, 2025 • edited Loading

Noratrieb commented Jan 2, 2025

rustbot commented Jan 2, 2025

rustbot commented Jan 2, 2025

bors commented Jan 2, 2025

klensy commented Jan 2, 2025

Noratrieb commented Jan 2, 2025

jieyouxu left a comment • edited Loading

Choose a reason for hiding this comment

This comment has been minimized.

rustbot commented Jan 2, 2025

Noratrieb commented Jan 2, 2025

bors commented Jan 2, 2025

bors commented Jan 2, 2025

Noratrieb commented Jan 2, 2025

bors commented Jan 2, 2025

This comment has been minimized.

bors commented Jan 2, 2025

bors commented Jan 2, 2025

bors commented Jan 2, 2025

Noratrieb commented Jan 3, 2025

bors commented Jan 3, 2025

jieyouxu commented Jan 3, 2025

Noratrieb commented Jan 3, 2025

bors commented Jan 3, 2025

rust-log-analyzer commented Jan 3, 2025

bors commented Jan 3, 2025

Noratrieb commented Jan 3, 2025

apiraino commented Jan 3, 2025

bors commented Jan 3, 2025

bors commented Jan 3, 2025

rust-timer commented Jan 3, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Noratrieb commented Jan 2, 2025 •

edited

Loading

jieyouxu left a comment •

edited

Loading