mirror of https://github.com/python/cpython
gh-96143: Move the perf trampoline files to the Python directory (#98675)
This commit is contained in:
parent
0c84593275
commit
1f737edb67
|
@ -426,6 +426,7 @@ PYTHON_OBJS= \
|
|||
Python/formatter_unicode.o \
|
||||
Python/fileutils.o \
|
||||
Python/suggestions.o \
|
||||
Python/perf_trampoline.o \
|
||||
Python/$(DYNLOADFILE) \
|
||||
$(LIBOBJS) \
|
||||
$(MACHDEP_OBJS) \
|
||||
|
@ -479,7 +480,6 @@ OBJECT_OBJS= \
|
|||
Objects/unicodectype.o \
|
||||
Objects/unionobject.o \
|
||||
Objects/weakrefobject.o \
|
||||
Objects/perf_trampoline.o \
|
||||
@PERF_TRAMPOLINE_OBJ@
|
||||
|
||||
DEEPFREEZE_OBJS = Python/deepfreeze/deepfreeze.o
|
||||
|
@ -2370,7 +2370,7 @@ config.status: $(srcdir)/configure
|
|||
|
||||
.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
|
||||
|
||||
Objects/asm_trampoline.o: $(srcdir)/Objects/asm_trampoline.S
|
||||
Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S
|
||||
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
|
||||
|
||||
# Some make's put the object file in the current directory
|
||||
|
|
|
@ -129,7 +129,6 @@
|
|||
<ClCompile Include="..\Objects\cellobject.c" />
|
||||
<ClCompile Include="..\Objects\classobject.c" />
|
||||
<ClCompile Include="..\Objects\codeobject.c" />
|
||||
<ClCompile Include="..\Objects\perf_trampoline.c" />
|
||||
<ClCompile Include="..\Objects\complexobject.c" />
|
||||
<ClCompile Include="..\Objects\descrobject.c" />
|
||||
<ClCompile Include="..\Objects\dictobject.c" />
|
||||
|
@ -211,6 +210,7 @@
|
|||
<ClCompile Include="..\Python\mysnprintf.c" />
|
||||
<ClCompile Include="..\Python\mystrtoul.c" />
|
||||
<ClCompile Include="..\Python\pathconfig.c" />
|
||||
<ClCompile Include="..\Python\perf_trampoline.c" />
|
||||
<ClCompile Include="..\Python\preconfig.c" />
|
||||
<ClCompile Include="..\Python\pyarena.c" />
|
||||
<ClCompile Include="..\Python\pyctype.c" />
|
||||
|
|
|
@ -85,7 +85,7 @@
|
|||
<ClCompile Include="..\Objects\codeobject.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Objects\perf_trampoline.c">
|
||||
<ClCompile Include="..\Python\perf_trampoline.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Python\compile.c">
|
||||
|
|
|
@ -429,7 +429,6 @@
|
|||
<ClCompile Include="..\Objects\cellobject.c" />
|
||||
<ClCompile Include="..\Objects\classobject.c" />
|
||||
<ClCompile Include="..\Objects\codeobject.c" />
|
||||
<ClCompile Include="..\Objects\perf_trampoline.c" />
|
||||
<ClCompile Include="..\Objects\complexobject.c" />
|
||||
<ClCompile Include="..\Objects\descrobject.c" />
|
||||
<ClCompile Include="..\Objects\dictobject.c" />
|
||||
|
@ -513,6 +512,7 @@
|
|||
<ClCompile Include="..\Python\mysnprintf.c" />
|
||||
<ClCompile Include="..\Python\mystrtoul.c" />
|
||||
<ClCompile Include="..\Python\pathconfig.c" />
|
||||
<ClCompile Include="..\Python\perf_trampoline.c" />
|
||||
<ClCompile Include="..\Python\preconfig.c" />
|
||||
<ClCompile Include="..\Python\pyarena.c" />
|
||||
<ClCompile Include="..\Python\pyctype.c" />
|
||||
|
|
|
@ -923,9 +923,6 @@
|
|||
<ClCompile Include="..\Objects\codeobject.c">
|
||||
<Filter>Objects</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Objects\perf_trampoline.c">
|
||||
<Filter>Objects</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Objects\complexobject.c">
|
||||
<Filter>Objects</Filter>
|
||||
</ClCompile>
|
||||
|
@ -1127,6 +1124,9 @@
|
|||
<ClCompile Include="..\Python\pathconfig.c">
|
||||
<Filter>Python</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Python\perf_trampoline.c">
|
||||
<Filter>Python</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Python\preconfig.c">
|
||||
<Filter>Python</Filter>
|
||||
</ClCompile>
|
||||
|
|
|
@ -380,7 +380,7 @@ Objects/floatobject.c - float_format -
|
|||
Objects/longobject.c long_from_non_binary_base log_base_BASE -
|
||||
Objects/longobject.c long_from_non_binary_base convwidth_base -
|
||||
Objects/longobject.c long_from_non_binary_base convmultmax_base -
|
||||
Objects/perf_trampoline.c - perf_map_file -
|
||||
Python/perf_trampoline.c - perf_map_file -
|
||||
Objects/unicodeobject.c - ucnhash_capi -
|
||||
Parser/action_helpers.c _PyPegen_dummy_name cache -
|
||||
Python/dtoa.c - p5s -
|
||||
|
@ -456,10 +456,10 @@ Objects/dictobject.c - next_dict_keys_version -
|
|||
Objects/funcobject.c - next_func_version -
|
||||
Objects/moduleobject.c - max_module_number -
|
||||
Objects/object.c - _Py_RefTotal -
|
||||
Objects/perf_trampoline.c - perf_status -
|
||||
Objects/perf_trampoline.c - extra_code_index -
|
||||
Objects/perf_trampoline.c - code_arena -
|
||||
Objects/perf_trampoline.c - trampoline_api -
|
||||
Python/perf_trampoline.c - perf_status -
|
||||
Python/perf_trampoline.c - extra_code_index -
|
||||
Python/perf_trampoline.c - code_arena -
|
||||
Python/perf_trampoline.c - trampoline_api -
|
||||
Objects/typeobject.c - next_version_tag -
|
||||
Objects/typeobject.c resolve_slotdups ptrs -
|
||||
Parser/pegen.c - memo_statistics -
|
||||
|
|
Can't render this file because it has a wrong number of fields in line 4.
|
|
@ -77,8 +77,8 @@ Objects/object.c - _Py_GenericAliasIterType -
|
|||
Objects/object.c - _PyMemoryIter_Type -
|
||||
Objects/object.c - _PyLineIterator -
|
||||
Objects/object.c - _PyPositionsIterator -
|
||||
Objects/perf_trampoline.c - _Py_trampoline_func_start -
|
||||
Objects/perf_trampoline.c - _Py_trampoline_func_end -
|
||||
Python/perf_trampoline.c - _Py_trampoline_func_start -
|
||||
Python/perf_trampoline.c - _Py_trampoline_func_end -
|
||||
Python/importdl.h - _PyImport_DynLoadFiletab -
|
||||
|
||||
Modules/expat/xmlrole.c - prolog0 -
|
||||
|
@ -465,7 +465,7 @@ Objects/obmalloc.c - _PyMem_Debug -
|
|||
Objects/obmalloc.c - _PyMem_Raw -
|
||||
Objects/obmalloc.c - _PyObject -
|
||||
Objects/obmalloc.c - usedpools -
|
||||
Objects/perf_trampoline.c - _Py_perfmap_callbacks -
|
||||
Python/perf_trampoline.c - _Py_perfmap_callbacks -
|
||||
Objects/typeobject.c - name_op -
|
||||
Objects/unicodeobject.c - stripfuncnames -
|
||||
Objects/unicodeobject.c - utf7_category -
|
||||
|
|
Can't render this file because it has a wrong number of fields in line 4.
|
|
@ -11629,7 +11629,7 @@ if test "x$perf_trampoline" = xyes; then :
|
|||
|
||||
$as_echo "#define PY_HAVE_PERF_TRAMPOLINE 1" >>confdefs.h
|
||||
|
||||
PERF_TRAMPOLINE_OBJ=Objects/asm_trampoline.o
|
||||
PERF_TRAMPOLINE_OBJ=Python/asm_trampoline.o
|
||||
|
||||
if test "x$Py_DEBUG" = xtrue; then :
|
||||
|
||||
|
|
|
@ -3474,7 +3474,7 @@ AC_MSG_RESULT([$perf_trampoline])
|
|||
|
||||
AS_VAR_IF([perf_trampoline], [yes], [
|
||||
AC_DEFINE([PY_HAVE_PERF_TRAMPOLINE], [1], [Define to 1 if you have the perf trampoline.])
|
||||
PERF_TRAMPOLINE_OBJ=Objects/asm_trampoline.o
|
||||
PERF_TRAMPOLINE_OBJ=Python/asm_trampoline.o
|
||||
|
||||
dnl perf needs frame pointers for unwinding, include compiler option in debug builds
|
||||
AS_VAR_IF([Py_DEBUG], [true], [
|
||||
|
|
Loading…
Reference in New Issue