From e1273d6ecfcd1221203633ae55617b536065e4cc Mon Sep 17 00:00:00 2001
From: Petr Viktorin <encukou@gmail.com>
Date: Fri, 6 Jun 2025 13:55:26 +0200
Subject: [PATCH] =?UTF-8?q?[3.14]=20gh-128605:=20Revert=20"Add=20branch=20?=
 =?UTF-8?q?protections=20for=20x86=5F64=20in=20asm=5Ftr=E2=80=A6ampoline.S?=
 =?UTF-8?q?=20(GH-128606)=20(GH-135077)"=20(GH-135175)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 899cca6dbf76bf3e06a99f60a5f996ad6ba0761f,
which broke buildbots.
(cherry picked from commit b477e21d5cb85bc764d6d9d18d122aa703d7b548)

Co-authored-by: Petr Viktorin <encukou@gmail.com>
---
 Python/asm_trampoline.S      | 22 ----------------------
 Python/perf_jit_trampoline.c |  5 -----
 2 files changed, 27 deletions(-)

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 f65b2d487e0c45..0a8945958b4b3c 100644
--- a/Python/perf_jit_trampoline.c
+++ b/Python/perf_jit_trampoline.c
@@ -472,11 +472,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);