From 5b941e57c71d7d0ab983d81a169f892662cfe446 Mon Sep 17 00:00:00 2001
From: Savannah Ostrowski <savannahostrowski@gmail.com>
Date: Sat, 11 May 2024 16:19:31 -0700
Subject: [PATCH] GH-118844: Fix build failures when combining --disable-gil
 with --enable-experimental-jit (GH-118935)

---
 Lib/subprocess.py                                             | 2 +-
 .../2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst            | 1 +
 Python/jit.c                                                  | 1 +
 Python/perf_jit_trampoline.c                                  | 4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 212fdf5b095511..b2dcb1454c139e 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -842,7 +842,7 @@ def __init__(self, args, bufsize=-1, executable=None,
             raise TypeError("bufsize must be an integer")
 
         if stdout is STDOUT:
-             raise ValueError("STDOUT can only be used for stderr")
+            raise ValueError("STDOUT can only be used for stderr")
 
         if pipesize is None:
             pipesize = -1  # Restore default
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst b/Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst
new file mode 100644
index 00000000000000..6e80b773889413
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst	
@@ -0,0 +1 @@
+Fix build failures when configuring with both ``--disable-gil`` and ``--enable-experimental-jit``.
diff --git a/Python/jit.c b/Python/jit.c
index 7c316a410dda6a..d0c0d24f4539e2 100644
--- a/Python/jit.c
+++ b/Python/jit.c
@@ -5,6 +5,7 @@
 #include "pycore_abstract.h"
 #include "pycore_call.h"
 #include "pycore_ceval.h"
+#include "pycore_critical_section.h"
 #include "pycore_dict.h"
 #include "pycore_intrinsics.h"
 #include "pycore_long.h"
diff --git a/Python/perf_jit_trampoline.c b/Python/perf_jit_trampoline.c
index 2a29318b1054a5..0a8945958b4b3c 100644
--- a/Python/perf_jit_trampoline.c
+++ b/Python/perf_jit_trampoline.c
@@ -174,8 +174,8 @@ static const uint8_t DwarfDataRel = 0x30;
 typedef struct {
     unsigned char version;
     unsigned char eh_frame_ptr_enc;
-    unsigned char	fde_count_enc;
-    unsigned char	table_enc;
+    unsigned char fde_count_enc;
+    unsigned char table_enc;
     int32_t eh_frame_ptr;
     int32_t eh_fde_count;
     int32_t from;