Skip to content

Commit 9f51d6b

Browse files
Remove unsupported syntax for freebsd
1 parent 69f9202 commit 9f51d6b

File tree

3 files changed

+62
-68
lines changed

3 files changed

+62
-68
lines changed

Makefile.pre.in

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3127,21 +3127,11 @@ JIT_DEPS = \
31273127
$(srcdir)/Python/executor_cases.c.h \
31283128
pyconfig.h
31293129

3130-
JIT_STENCIL_HEADER := @JIT_STENCIL_HEADER@
3131-
3132-
ifneq ($(JIT_STENCIL_HEADER),)
3133-
jit_stencils.h $(JIT_STENCIL_HEADER): $(JIT_DEPS)
3134-
@REGEN_JIT_COMMAND@
3135-
3136-
Python/jit.o: $(srcdir)/Python/jit.c jit_stencils.h $(JIT_STENCIL_HEADER)
3137-
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
3138-
else
3139-
jit_stencils.h: $(JIT_DEPS)
3130+
@JIT_STENCILS_H@: $(JIT_DEPS)
31403131
@REGEN_JIT_COMMAND@
31413132

3142-
Python/jit.o: $(srcdir)/Python/jit.c jit_stencils.h
3133+
Python/jit.o: $(srcdir)/Python/jit.c @JIT_STENCILS_H@
31433134
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
3144-
endif
31453135

31463136
.PHONY: regen-jit
31473137
regen-jit:

configure

Lines changed: 30 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2787,11 +2787,13 @@ AS_VAR_IF([jit_flags],
27872787
[AS_VAR_APPEND([CFLAGS_NODIST], [" $jit_flags"])
27882788
AS_VAR_SET([REGEN_JIT_COMMAND],
27892789
["\$(PYTHON_FOR_REGEN) \$(srcdir)/Tools/jit/build.py ${ARCH_TRIPLES:-$host} --output-dir . --pyconfig-dir . --cflags=\"$CFLAGS_JIT\""])
2790+
AS_VAR_SET([JIT_STENCILS_H], ["jit_stencils.h"])
27902791
AS_VAR_IF([Py_DEBUG],
27912792
[true],
27922793
[AS_VAR_APPEND([REGEN_JIT_COMMAND], [" --debug"])],
27932794
[])])
27942795
AC_SUBST([REGEN_JIT_COMMAND])
2796+
AC_SUBST([JIT_STENCILS_H])
27952797
AC_MSG_RESULT([$tier2_flags $jit_flags])
27962798

27972799
if test "$disable_gil" = "yes" -a "$enable_experimental_jit" != "no"; then
@@ -8171,37 +8173,37 @@ dnl Emscripten does not support shared libraries yet.
81718173
PY_STDLIB_MOD([xxlimited], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
81728174
PY_STDLIB_MOD([xxlimited_35], [test "$TEST_MODULES" = yes], [test "$ac_cv_func_dlopen" = yes])
81738175

8174-
# Determine JIT stencil header based on platform
8175-
JIT_STENCIL_HEADER=""
8176+
# Determine JIT stencils header files based on target platform
8177+
JIT_STENCILS_H="jit_stencils.h"
81768178
case "$host" in
8177-
aarch64-apple-darwin*)
8178-
JIT_STENCIL_HEADER="jit_stencils-aarch64-apple-darwin.h"
8179-
;;
8180-
x86_64-apple-darwin*)
8181-
JIT_STENCIL_HEADER="jit_stencils-x86_64-apple-darwin.h"
8182-
;;
8183-
aarch64-pc-windows-msvc)
8184-
JIT_STENCIL_HEADER="jit_stencils-aarch64-pc-windows-msvc.h"
8185-
;;
8186-
i686-pc-windows-msvc)
8187-
JIT_STENCIL_HEADER="jit_stencils-i686-pc-windows-msvc.h"
8188-
;;
8189-
x86_64-pc-windows-msvc)
8190-
JIT_STENCIL_HEADER="jit_stencils-x86_64-pc-windows-msvc.h"
8191-
;;
8192-
aarch64-*-linux-gnu)
8193-
JIT_STENCIL_HEADER="jit_stencils-$host.h"
8194-
;;
8195-
x86_64-*-linux-gnu)
8196-
JIT_STENCIL_HEADER="jit_stencils-$host.h"
8197-
;;
8198-
*)
8199-
# Unsupported platform - leave empty for fallback
8200-
JIT_STENCIL_HEADER=""
8201-
;;
8179+
aarch64-apple-darwin*)
8180+
JIT_STENCILS_H="jit_stencils.h jit_stencils-aarch64-apple-darwin.h"
8181+
;;
8182+
x86_64-apple-darwin*)
8183+
JIT_STENCILS_H="jit_stencils.h jit_stencils-x86_64-apple-darwin.h"
8184+
;;
8185+
aarch64-pc-windows-msvc)
8186+
JIT_STENCILS_H="jit_stencils.h jit_stencils-aarch64-pc-windows-msvc.h"
8187+
;;
8188+
i686-pc-windows-msvc)
8189+
JIT_STENCILS_H="jit_stencils.h jit_stencils-i686-pc-windows-msvc.h"
8190+
;;
8191+
x86_64-pc-windows-msvc)
8192+
JIT_STENCILS_H="jit_stencils.h jit_stencils-x86_64-pc-windows-msvc.h"
8193+
;;
8194+
aarch64-*-linux-gnu)
8195+
JIT_STENCILS_H="jit_stencils.h jit_stencils-$host.h"
8196+
;;
8197+
x86_64-*-linux-gnu)
8198+
JIT_STENCILS_H="jit_stencils.h jit_stencils-$host.h"
8199+
;;
8200+
*)
8201+
# Unsupported platform - use generic header only
8202+
JIT_STENCILS_H="jit_stencils.h"
8203+
;;
82028204
esac
82038205

8204-
AC_SUBST([JIT_STENCIL_HEADER])
8206+
AC_SUBST([JIT_STENCILS_H])
82058207

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

0 commit comments

Comments
 (0)