https://github.com/python/cpython/commit/b477e21d5cb85bc764d6d9d18d122aa703d7b548
commit: b477e21d5cb85bc764d6d9d18d122aa703d7b548
branch: 3.14
author: Petr Viktorin <[email protected]>
committer: encukou <[email protected]>
date: 2025-06-06T13:55:26+02:00
summary:
[3.14] gh-128605: Revert "Add branch protections for x86_64 in
asm_tr…ampoline.S (#128606) (#135077)" (GH-135175)
This reverts commit 899cca6dbf76bf3e06a99f60a5f996ad6ba0761f,
which broke buildbots.
files:
M Python/asm_trampoline.S
M Python/perf_jit_trampoline.c
diff --git a/Python/asm_trampoline.S b/Python/asm_trampoline.S
index 616752459ba4d9..0a3265dfeee204 100644
--- a/Python/asm_trampoline.S
+++ b/Python/asm_trampoline.S
@@ -9,9 +9,6 @@
# }
_Py_trampoline_func_start:
#ifdef __x86_64__
-#if defined(__CET__) && (__CET__ & 1)
- endbr64
-#endif
sub $8, %rsp
call *%rcx
add $8, %rsp
@@ -37,22 +34,3 @@ _Py_trampoline_func_start:
.globl _Py_trampoline_func_end
_Py_trampoline_func_end:
.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__
diff --git a/Python/perf_jit_trampoline.c b/Python/perf_jit_trampoline.c
index 56878e3bcd8332..1211e0e9f112b7 100644
--- a/Python/perf_jit_trampoline.c
+++ b/Python/perf_jit_trampoline.c
@@ -473,11 +473,6 @@ elf_init_ehframe(ELFObjectContext* ctx)
DWRF_U8(0); /* Augmentation data. */
/* Registers saved in CFRAME. */
#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_def_cfa_offset); DWRF_UV(16);
DWRF_U8(DWRF_CFA_advance_loc | 6);
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
