mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-15 05:06:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

[3.14] gh-128605: Revert "Add branch protections for x86_64 in asm_tr…ampoline.S (#128606) (#135077)" (GH-135175)

Browse source 
This reverts commit 899cca6dbf,
which broke buildbots.
This commit is contained in:
Petr Viktorin 2025-06-06 13:55:26 +02:00 • committed by GitHub
parent 897b81500c
commit b477e21d5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Python/asm_trampoline.S
View file

@ -9,9 +9,6 @@
# } # }
_Py_trampoline_func_start: _Py_trampoline_func_start:
#ifdef __x86_64__ #ifdef __x86_64__
#if defined(__CET__) && (__CET__ & 1)
endbr64
#endif
sub $8, %rsp sub $8, %rsp
call *%rcx call *%rcx
add $8, %rsp add $8, %rsp
@ -37,22 +34,3 @@ _Py_trampoline_func_start:
.globl _Py_trampoline_func_end .globl _Py_trampoline_func_end
_Py_trampoline_func_end: _Py_trampoline_func_end:
.section .note.GNU-stack,"",@progbits .section .note.GNU-stack,"",@progbits
# Note for indicating the assembly code supports CET
#if defined(__x86_64__) && defined(__CET__) && (__CET__ & 1)
.section .note.gnu.property,"a"
.align 8
.long 1f - 0f
.long 4f - 1f
.long 5
0:
.string "GNU"
1:
.align 8
.long 0xc0000002
.long 3f - 2f
2:
.long 0x3
3:
.align 8
4:
#endif // __x86_64__

5
Python/perf_jit_trampoline.c
View file

@ -473,11 +473,6 @@ elf_init_ehframe(ELFObjectContext* ctx)
DWRF_U8(0); /* Augmentation data. */ DWRF_U8(0); /* Augmentation data. */
/* Registers saved in CFRAME. */ /* Registers saved in CFRAME. */
#ifdef __x86_64__ #ifdef __x86_64__
# if defined(__CET__) && (__CET__ & 1)
DWRF_U8(DWRF_CFA_advance_loc | 8);
# else
DWRF_U8(DWRF_CFA_advance_loc | 4);
# endif
DWRF_U8(DWRF_CFA_advance_loc | 4); DWRF_U8(DWRF_CFA_advance_loc | 4);
DWRF_U8(DWRF_CFA_def_cfa_offset); DWRF_UV(16); DWRF_U8(DWRF_CFA_def_cfa_offset); DWRF_UV(16);
DWRF_U8(DWRF_CFA_advance_loc | 6); DWRF_U8(DWRF_CFA_advance_loc | 6);