Skip to content

Commit e1273d6

Browse files
encukoumiss-islington
authored andcommitted
[3.14] gh-128605: Revert "Add branch protections for x86_64 in asm_tr…ampoline.S (GH-128606) (GH-135077)" (GH-135175)
This reverts commit 899cca6, which broke buildbots. (cherry picked from commit b477e21) Co-authored-by: Petr Viktorin <encukou@gmail.com>
1 parent 728a881 commit e1273d6

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

Python/asm_trampoline.S

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
# }
1010
_Py_trampoline_func_start:
1111
#ifdef __x86_64__
12-
#if defined(__CET__) && (__CET__ & 1)
13-
endbr64
14-
#endif
1512
sub $8, %rsp
1613
call *%rcx
1714
add $8, %rsp
@@ -37,22 +34,3 @@ _Py_trampoline_func_start:
3734
.globl _Py_trampoline_func_end
3835
_Py_trampoline_func_end:
3936
.section .note.GNU-stack,"",@progbits
40-
# Note for indicating the assembly code supports CET
41-
#if defined(__x86_64__) && defined(__CET__) && (__CET__ & 1)
42-
.section .note.gnu.property,"a"
43-
.align 8
44-
.long 1f - 0f
45-
.long 4f - 1f
46-
.long 5
47-
0:
48-
.string "GNU"
49-
1:
50-
.align 8
51-
.long 0xc0000002
52-
.long 3f - 2f
53-
2:
54-
.long 0x3
55-
3:
56-
.align 8
57-
4:
58-
#endif // __x86_64__

Python/perf_jit_trampoline.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,6 @@ elf_init_ehframe(ELFObjectContext* ctx)
472472
DWRF_U8(0); /* Augmentation data. */
473473
/* Registers saved in CFRAME. */
474474
#ifdef __x86_64__
475-
# if defined(__CET__) && (__CET__ & 1)
476-
DWRF_U8(DWRF_CFA_advance_loc | 8);
477-
# else
478-
DWRF_U8(DWRF_CFA_advance_loc | 4);
479-
# endif
480475
DWRF_U8(DWRF_CFA_advance_loc | 4);
481476
DWRF_U8(DWRF_CFA_def_cfa_offset); DWRF_UV(16);
482477
DWRF_U8(DWRF_CFA_advance_loc | 6);

0 commit comments

Comments
 (0)