Skip to content

gh-149800: Fix macOS universal2 build of perf trampoline #150365

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

Closed
eendebakpt wants to merge 2 commits into from
+9 −1
Closed

gh-149800: Fix macOS universal2 build of perf trampoline #150365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d010ee
gh-149800: Fix macOS universal2 build of perf trampoline
eendebakpt May 24, 2026
1ddf61b
Merge branch 'main' into fix-universal2-trampoline
eendebakpt May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3120,8 +3120,13 @@ Python/asm_trampoline_aarch64.o: $(srcdir)/Python/asm_trampoline_aarch64.S
Python/asm_trampoline_riscv64.o: $(srcdir)/Python/asm_trampoline_riscv64.S
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<

# Extract the matching slice from each fat per-arch object before lipo -create,
# which rejects two fat inputs that share architectures.
Python/asm_trampoline_universal2.o: Python/asm_trampoline_aarch64.o Python/asm_trampoline_x86_64.o
lipo -create -output $@ Python/asm_trampoline_aarch64.o Python/asm_trampoline_x86_64.o
lipo -thin arm64 Python/asm_trampoline_aarch64.o -output $@.arm64
lipo -thin x86_64 Python/asm_trampoline_x86_64.o -output $@.x86_64
lipo -create -output $@ $@.arm64 $@.x86_64
rm -f $@.arm64 $@.x86_64

Python/emscripten_trampoline_inner.wasm: $(srcdir)/Python/emscripten_trampoline_inner.c
# emcc has a path that ends with emsdk/upstream/emscripten/emcc, we're looking for emsdk/upstream/bin/clang.
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Build/2026-05-24-19-24-28.gh-issue-149800.Mq994d.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix macOS universal2 build of the perf trampoline. After the per-architecture
split in :gh:`149800`, the ``arm64`` and ``x86_64`` trampoline objects were
each compiled as fat Mach-O files, and ``lipo -create`` refused to merge them.
Loading