From a8185778ca158ee566eb05f7f798e3aa18073142 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Fri, 10 May 2024 20:08:26 -0700 Subject: [PATCH 1/5] Add header --- Lib/subprocess.py | 2 +- Python/jit.c | 1 + Python/perf_jit_trampoline.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) 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/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..76f85d52cd0810 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; From e111e009803bac7d05fbbd3df400fa6c71d10dcc Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Sat, 11 May 2024 14:20:15 -0700 Subject: [PATCH 2/5] Update Python/perf_jit_trampoline.c Co-authored-by: Brandt Bucher --- Python/perf_jit_trampoline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Python/perf_jit_trampoline.c b/Python/perf_jit_trampoline.c index 76f85d52cd0810..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; From 8409154b7810d9220e60ff75bb2ef33bbd5623bd Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Sat, 11 May 2024 21:44:18 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst | 1 + 1 file changed, 1 insertion(+) 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/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..14152c678fcb57 --- /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 @@ +Added `pycore_critical_section.h` to `jit.c` to fix builds with `--disable-gil` & `--enable-experimental-jit` failures on MacOS From ae70d2614103396c823322ee48b4862728a04e28 Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Sat, 11 May 2024 14:46:47 -0700 Subject: [PATCH 4/5] reword blurb --- .../2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 14152c678fcb57..64d72eb27f9292 100644 --- 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 @@ -1 +1 @@ -Added `pycore_critical_section.h` to `jit.c` to fix builds with `--disable-gil` & `--enable-experimental-jit` failures on MacOS +Added ``pycore_critical_section.h`` to ``jit.c`` to fix builds with ``--disable-gil`` and ``--enable-experimental-jit`` failing on MacOS From 4000624a31e199e975d2bd6fa70641db764ec56e Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Sat, 11 May 2024 14:56:28 -0700 Subject: [PATCH 5/5] Update Misc/NEWS.d/next/Core and Builtins/2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst Co-authored-by: Brandt Bucher --- .../2024-05-11-21-44-17.gh-issue-118844.q2H_km.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 64d72eb27f9292..6e80b773889413 100644 --- 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 @@ -1 +1 @@ -Added ``pycore_critical_section.h`` to ``jit.c`` to fix builds with ``--disable-gil`` and ``--enable-experimental-jit`` failing on MacOS +Fix build failures when configuring with both ``--disable-gil`` and ``--enable-experimental-jit``.