Skip to content

GH-137218: Fix Makefile to handle FreeBSD (fix for JIT stencil changes) #139170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 22, 2025
Merged

GH-137218: Fix Makefile to handle FreeBSD (fix for JIT stencil changes) #139170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0d69d84
Fix freebsd
savannahostrowski Sep 19, 2025
64ba8f3
Remove indentation
savannahostrowski Sep 19, 2025
b2b95d1
Try again
savannahostrowski Sep 19, 2025
69f9202
move logic back into configure.ac for freebsd
savannahostrowski Sep 19, 2025
9f51d6b
Remove unsupported syntax for freebsd
savannahostrowski Sep 19, 2025
b51c85d
Remove redundant case
savannahostrowski Sep 19, 2025
1a55bdf
Add missing jit_stencils.h
savannahostrowski Sep 19, 2025
656a0a2
Merge branch 'main' into fix-jit-freebsd
savannahostrowski Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3127,27 +3127,11 @@ JIT_DEPS = \
$(srcdir)/Tools/jit/*.py \
$(srcdir)/Python/executor_cases.c.h \
pyconfig.h

ifneq ($(filter aarch64-apple-darwin%,$(HOST_GNU_TYPE)),)
JIT_STENCIL_HEADER := jit_stencils-aarch64-apple-darwin.h
else ifneq ($(filter x86_64-apple-darwin%,$(HOST_GNU_TYPE)),)
JIT_STENCIL_HEADER := jit_stencils-x86_64-apple-darwin.h
else ifeq ($(HOST_GNU_TYPE), aarch64-pc-windows-msvc)
JIT_STENCIL_HEADER := jit_stencils-aarch64-pc-windows-msvc.h
else ifeq ($(HOST_GNU_TYPE), i686-pc-windows-msvc)
JIT_STENCIL_HEADER := jit_stencils-i686-pc-windows-msvc.h
else ifeq ($(HOST_GNU_TYPE), x86_64-pc-windows-msvc)
JIT_STENCIL_HEADER := jit_stencils-x86_64-pc-windows-msvc.h
else ifneq ($(filter aarch64-%-linux-gnu,$(HOST_GNU_TYPE)),)
JIT_STENCIL_HEADER := jit_stencils-$(HOST_GNU_TYPE).h
else ifneq ($(filter x86_64-%-linux-gnu,$(HOST_GNU_TYPE)),)
JIT_STENCIL_HEADER := jit_stencils-$(HOST_GNU_TYPE).h
endif

jit_stencils.h $(JIT_STENCIL_HEADER): $(JIT_DEPS)

jit_stencils.h @JIT_STENCILS_H@: $(JIT_DEPS)
@REGEN_JIT_COMMAND@

Python/jit.o: $(srcdir)/Python/jit.c jit_stencils.h $(JIT_STENCIL_HEADER)
Python/jit.o: $(srcdir)/Python/jit.c jit_stencils.h @JIT_STENCILS_H@
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<

.PHONY: regen-jit
Expand Down
31 changes: 31 additions & 0 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2787,11 +2787,13 @@ AS_VAR_IF([jit_flags],
[AS_VAR_APPEND([CFLAGS_NODIST], [" $jit_flags"])
AS_VAR_SET([REGEN_JIT_COMMAND],
["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py ${ARCH_TRIPLES:-$host} --output-dir . --pyconfig-dir . --cflags=\"$CFLAGS_JIT\""])
AS_VAR_SET([JIT_STENCILS_H], ["jit_stencils.h"])
AS_VAR_IF([Py_DEBUG],
[true],
[AS_VAR_APPEND([REGEN_JIT_COMMAND], [" --debug"])],
[])])
AC_SUBST([REGEN_JIT_COMMAND])
AC_SUBST([JIT_STENCILS_H])
AC_MSG_RESULT([$tier2_flags $jit_flags])

if test "$disable_gil" = "yes" -a "$enable_experimental_jit" != "no"; then
Expand Down Expand Up @@ -8171,6 +8173,34 @@ dnl Emscripten does not support shared libraries yet.
PY_STDLIB_MOD([xxlimited], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([xxlimited_35], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])

# Determine JIT stencils header files based on target platform
JIT_STENCILS_H=""
case "$host" in
aarch64-apple-darwin*)
JIT_STENCILS_H="jit_stencils-aarch64-apple-darwin.h"
;;
x86_64-apple-darwin*)
JIT_STENCILS_H="jit_stencils-x86_64-apple-darwin.h"
;;
aarch64-pc-windows-msvc)
JIT_STENCILS_H="jit_stencils-aarch64-pc-windows-msvc.h"
;;
i686-pc-windows-msvc)
JIT_STENCILS_H="jit_stencils-i686-pc-windows-msvc.h"
;;
x86_64-pc-windows-msvc)
JIT_STENCILS_H="jit_stencils-x86_64-pc-windows-msvc.h"
;;
aarch64-*-linux-gnu)
JIT_STENCILS_H="jit_stencils-$host.h"
;;
x86_64-*-linux-gnu)
JIT_STENCILS_H="jit_stencils-$host.h"
;;
esac

AC_SUBST([JIT_STENCILS_H])

# substitute multiline block, must come after last PY_STDLIB_MOD()
AC_SUBST([MODULE_BLOCK])

Expand Down
Loading