Add Py_JIT_ENABLED variable to pyconfig.h

Author: Eclips4

PCbuild/_freeze_module.vcxproj

@@ -449,6 +449,12 @@
     <PropertyGroup Condition="$(DisableGil) == 'true'">
       <PyConfigHText>$(PyConfigHText.Replace('#undef Py_GIL_DISABLED', '#define Py_GIL_DISABLED 1'))</PyConfigHText>
     </PropertyGroup>
+    <PropertyGroup Condition="$(UseJIT) == 'true'">
+      <PyConfigHText>$(PyConfigHText.Replace('#undef Py_JIT_ENABLED', '#define Py_JIT_ENABLED 1'))</PyConfigHText>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(UseTIER2) == 'true'">
+      <PyConfigHText>$(PyConfigHText.Replace('#undef Py_JIT_ENABLED', '#define Py_JIT_ENABLED "interpreter"'))</PyConfigHText>
+    </PropertyGroup>
     <Message Text="Updating pyconfig.h" Condition="$(PyConfigHText.TrimEnd()) != $(OldPyConfigH.TrimEnd())" />
     <WriteLinesToFile File="$(IntDir)pyconfig.h"
                       Lines="$(PyConfigHText)"

PCbuild/pythoncore.vcxproj

@@ -705,6 +705,12 @@
     <PropertyGroup Condition="$(DisableGil) == 'true'">
       <PyConfigHText>$(PyConfigHText.Replace('/* #define Py_GIL_DISABLED 1 */', '#define Py_GIL_DISABLED 1'))</PyConfigHText>
     </PropertyGroup>
+    <PropertyGroup Condition="$(UseJIT) == 'true'">
+      <PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED 1 */', '#define Py_JIT_ENABLED 1'))</PyConfigHText>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(UseTIER2) == 'true'">
+      <PyConfigHText>$(PyConfigHText.Replace('/* #define Py_JIT_ENABLED "interpreter" */', '#define Py_JIT_ENABLED "interpreter"'))</PyConfigHText>
+    </PropertyGroup>
     <Message Text="Updating pyconfig.h" Condition="$(PyConfigHText.TrimEnd()) != $(OldPyConfigH.TrimEnd())" />
     <WriteLinesToFile File="$(IntDir)pyconfig.h"
                       Lines="$(PyConfigHText)"

configure

@@ -1820,11 +1820,26 @@ AC_ARG_ENABLE([experimental-jit],
               [],
               [enable_experimental_jit=no])
 case $enable_experimental_jit in
-  no)              jit_flags="";          tier2_flags="" ;;
-  yes)             jit_flags="-D_Py_JIT"; tier2_flags="-D_Py_TIER2=1" ;;
-  yes-off)         jit_flags="-D_Py_JIT"; tier2_flags="-D_Py_TIER2=3" ;;
-  interpreter)     jit_flags="";          tier2_flags="-D_Py_TIER2=4" ;;
-  interpreter-off) jit_flags="";          tier2_flags="-D_Py_TIER2=6" ;;  # Secret option
+  no)
+    jit_flags="";
+    tier2_flags="";
+    AC_DEFINE([Py_JIT_ENABLED], [1], [Define to 1 if you want to build an interpreter with JIT]) ;;
+  yes)
+    jit_flags="-D_Py_JIT";
+    tier2_flags="-D_Py_TIER2=1";
+    AC_DEFINE([Py_JIT_ENABLED], [1], [Define to 1 if you want to build an interpreter with JIT]) ;;
+  yes-off)
+    jit_flags="-D_Py_JIT";
+    tier2_flags="-D_Py_TIER2=3";
+    AC_DEFINE([Py_JIT_ENABLED], [1], [Define to 1 if you want to build an interpreter with JIT]) ;;
+  interpreter)
+    jit_flags="";
+    tier2_flags="-D_Py_TIER2=4";
+    AC_DEFINE([Py_JIT_ENABLED], ["interpreter"], [Define to interpreter if you want to build an interpreter with enabled tier 2 interpreter]) ;;
+  interpreter-off)
+   jit_flags="";
+   tier2_flags="-D_Py_TIER2=6";
+   AC_DEFINE([Py_JIT_ENABLED], ["interpreter"], [Define to interpreter if you want to build an interpreter with enabled tier 2 interpreter]) ;;  # Secret option
   *) AC_MSG_ERROR(
       [invalid argument: --enable-experimental-jit=$enable_experimental_jit; expected no|yes|yes-off|interpreter]) ;;
 esac

configure.ac

@@ -1695,6 +1695,10 @@
 /* Defined if _Complex C type is available. */
 #undef Py_HAVE_C_COMPLEX
 
+/* Define to interpreter if you want to build an interpreter with enabled tier
+   2 interpreter */
+#undef Py_JIT_ENABLED
+
 /* Define if year with century should be normalized for strftime. */
 #undef Py_NORMALIZE_CENTURY