Skip to content

Keep the perf trampoline end marker inside its text section #19

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
zaniebot wants to merge 2 commits into from
Closed

Keep the perf trampoline end marker inside its text section #19

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
5082176
Keep the perf trampoline end marker inside its text section
zaniebot Oct 21, 2026
36ee3ab
Link `NEWS` entry to the upstream issue
zaniebot Oct 21, 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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Build/2026-10-21-18-00-00.gh-issue-128883.perf-trampoline.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add a byte after the ELF perf trampoline end marker so it does not share
the following function's address, which BOLT may otherwise move.
1 change: 1 addition & 0 deletions Python/asm_trampoline_aarch64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ __Py_trampoline_func_end:
#else
.globl _Py_trampoline_func_end
_Py_trampoline_func_end:
.byte 0
.section .note.GNU-stack,"",@progbits
#endif

Expand Down
1 change: 1 addition & 0 deletions Python/asm_trampoline_riscv64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ _Py_trampoline_func_start:
jr ra
.globl _Py_trampoline_func_end
_Py_trampoline_func_end:
.byte 0
.section .note.GNU-stack,"",@progbits
1 change: 1 addition & 0 deletions Python/asm_trampoline_x86_64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ __Py_trampoline_func_end:
#else
.globl _Py_trampoline_func_end
_Py_trampoline_func_end:
.byte 0
.section .note.GNU-stack,"",@progbits
#endif
# Note for indicating the assembly code supports CET
Expand Down
Loading