FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-149800: Fix macOS universal2 build of perf trampoline (GH-149894 follow-up) by pablogsal · Pull Request #150364 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-149800: Fix macOS universal2 build of perf trampoline (GH-149894 follow-up) #150364

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

Merged
pablogsal merged 3 commits into from
May 25, 2026
+14 −2
Conversation 4 Commits 3 Checks 41 Files changed 1
Merged

gh-149800: Fix macOS universal2 build of perf trampoline (GH-149894 follow-up) #150364

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf94a02
gh-149800: Fix macOS universal2 build of perf trampoline (GH-149894 f…
pablogsal May 24, 2026
1c7c906
Update Makefile.pre.in
pablogsal May 24, 2026
b957e29
Update Makefile.pre.in
pablogsal May 25, 2026
File filter

Filter by extension

Filter by extension .in  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
16 changes: 14 additions & 2 deletions Makefile.pre.in
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3120,8 +3120,20 @@ 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 $@ $<

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
# On macOS universal2 builds, $(PY_CORE_CFLAGS) contains "-arch arm64 -arch x86_64",
# which would produce fat .o files containing both architectures for each .S input.
# lipo -create then refuses to combine them because they share architectures.
# Build each per-arch object with a single -arch flag before merging with lipo.
Python/asm_trampoline_universal2.o: $(srcdir)/Python/asm_trampoline_aarch64.S $(srcdir)/Python/asm_trampoline_x86_64.S
$(CC) -c $(filter-out -arch arm64 x86_64,$(PY_CORE_CFLAGS)) -arch arm64 \
-o Python/asm_trampoline_arm64-apple-darwin.o $(srcdir)/Python/asm_trampoline_aarch64.S
$(CC) -c $(filter-out -arch arm64 x86_64,$(PY_CORE_CFLAGS)) -arch x86_64 \
-o Python/asm_trampoline_x86_64-apple-darwin.o $(srcdir)/Python/asm_trampoline_x86_64.S
lipo -create -output $@ \
Python/asm_trampoline_arm64-apple-darwin.o \
Python/asm_trampoline_x86_64-apple-darwin.o
Comment thread
pablogsal marked this conversation as resolved.
Comment thread
pablogsal marked this conversation as resolved.
rm -f Python/asm_trampoline_arm64-apple-darwin.o \
Python/asm_trampoline_x86_64-apple-darwin.o

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
Loading
Back | FazBrowse Home | New Git URL