Skip to content

Commit 9d2c10b

Browse files
[3.13] GH-118844: Fix build failures when combining --disable-gil with --enable-experimental-jit (GH-118959)
(cherry picked from commit 5b941e5) Co-authored-by: Savannah Ostrowski <[email protected]>
1 parent 6e855b3 commit 9d2c10b

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

Lib/subprocess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ def __init__(self, args, bufsize=-1, executable=None,
842842
raise TypeError("bufsize must be an integer")
843843

844844
if stdout is STDOUT:
845-
raise ValueError("STDOUT can only be used for stderr")
845+
raise ValueError("STDOUT can only be used for stderr")
846846

847847
if pipesize is None:
848848
pipesize = -1 # Restore default
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix build failures when configuring with both ``--disable-gil`` and ``--enable-experimental-jit``.

Python/jit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "pycore_abstract.h"
66
#include "pycore_call.h"
77
#include "pycore_ceval.h"
8+
#include "pycore_critical_section.h"
89
#include "pycore_dict.h"
910
#include "pycore_intrinsics.h"
1011
#include "pycore_long.h"

Python/perf_jit_trampoline.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ static const uint8_t DwarfDataRel = 0x30;
174174
typedef struct {
175175
unsigned char version;
176176
unsigned char eh_frame_ptr_enc;
177-
unsigned char fde_count_enc;
178-
unsigned char table_enc;
177+
unsigned char fde_count_enc;
178+
unsigned char table_enc;
179179
int32_t eh_frame_ptr;
180180
int32_t eh_fde_count;
181181
int32_t from;

0 commit comments

Comments
 (0)