8000 gh-96143: Move the perf trampoline files to the Python directory (#98… · python/cpython@1f737ed · GitHub
[go: up one dir, main page]
Skip to content

Commit 1f737ed

Browse files
pablogsalpablogsal
authored
gh-96143: Move the perf trampoline files to the Python directory (#98675)
1 parent 0c84593 commit 1f737ed

11 files changed

+18
-18
lines changed

‎Makefile.pre.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ PYTHON_OBJS= \
426426
Python/formatter_unicode.o \
427427
Python/fileutils.o \
428428
Python/suggestions.o \
429+
Python/perf_trampoline.o \
429430
Python/$(DYNLOADFILE) \
430431
$(LIBOBJS) \
431432
$(MACHDEP_OBJS) \
@@ -479,7 +480,6 @@ OBJECT_OBJS= \
479480
Objects/unicodectype.o \
480481
Objects/unionobject.o \
481482
Objects/weakrefobject.o \
482-
Objects/perf_trampoline.o \
483483
@PERF_TRAMPOLINE_OBJ@
484484

485485
DEEPFREEZE_OBJS = Python/deepfreeze/deepfreeze.o
@@ -2370,7 +2370,7 @@ config.status: $(srcdir)/configure
23702370

23712371
.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
23722372

2373-
Objects/asm_trampoline.o: $(srcdir)/Objects/asm_trampoline.S
2373+
Python/asm_trampoline.o: $(srcdir)/Python/asm_trampoline.S
23742374
$(CC) -c $(PY_CORE_CFLAGS) -o $@ $<
23752375

23762376
# Some make's put the object file in the current directory

‎PCbuild/_freeze_module.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
<ClCompile Include="..\Objects\cellobject.c" />
130130
<ClCompile Include="..\Objects\classobject.c" />
131131
<ClCompile Include="..\Objects\codeobject.c" />
132-
<ClCompile Include="..\Objects\perf_trampoline.c" />
133132
<ClCompile Include="..\Objects\complexobject.c" />
134133
<ClCompile Include="..\Objects\descrobject.c" />
135134
<ClCompile Include="..\Objects\dictobject.c" />
@@ -211,6 +210,7 @@
211210
<ClCompile Include="..\Python\mysnprintf.c" />
212211
<ClCompile Include="..\Python\mystrtoul.c" />
213212
<ClCompile Include="..\Python\pathconfig.c" />
213+
<ClCompile Include="..\Python\perf_trampoline.c" />
214214
<ClCompile Include="..\Python\preconfig.c" />
215215
<ClCompile Include="..\Python\pyarena.c" />
216216
<ClCompile Include="..\Python\pyctype.c" />

‎PCbuild/_freeze_module.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<ClCompile Include="..\Objects\codeobject.c">
8686
<Filter>Source Files</Filter>
8787
</ClCompile>
88-
<ClCompile Include="..\Objects\perf_trampoline.c">
88+
<ClCompile Include="..\Python\perf_trampoline.c">
8989
<Filter>Source Files</Filter>
9090
</ClCompile>
9191
<ClCompile Include="..\Python\compile.c">

‎PCbuild/pythoncore.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@
429429
<ClCompile Include="..\Objects\cellobject.c" />
430430
<ClCompile Include="..\Objects\classobject.c" />
431431
<ClCompile Include="..\Objects\codeobject.c" />
432-
<ClCompile Include="..\Objects\perf_trampoline.c" />
433432
<ClCompile Include="..\Objects\complexobject.c" />
434433
<ClCompile Include="..\Objects\descrobject.c" />
435434
<ClCompile Include="..\Objects\dictobject.c" />
@@ -513,6 +512,7 @@
513512
<ClCompile Include="..\Python\mysnprintf.c" />
514513
<ClCompile Include="..\Python\mystrtoul.c" />
515514
<ClCompile Include="..\Python\pathconfig.c" />
515+
<ClCompile Include="..\Python\perf_trampoline.c" />
516516
<ClCompile Include="..\Python\preconfig.c" />
517517
<ClCompile Include="..\Python\pyarena.c" />
518518
<ClCompile Include="..\Python\pyctype.c" />

‎PCbuild/pythoncore.vcxproj.filters

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -923,9 +923,6 @@
923923
<ClCompile Include="..\Objects\codeobject.c">
924924
<Filter>Objects</Filter>
925925
</ClCompile>
926-
<ClCompile Include="..\Objects\perf_trampoline.c">
927-
<Filter>Objects</Filter>
928-
</ClCompile>
929926
<ClCompile Include="..\Objects\complexobject.c">
930927
<Filter>Objects</Filter>
931928
</ClCompile>
@@ -1127,6 +112 9E7A 4,9 @@
11271124
<ClCompile Include="..\Python\pathconfig.c">
11281125
<Filter>Python</Filter>
11291126
</ClCompile>
1127+
<ClCompile Include="..\Python\perf_trampoline.c">
1128+
<Filter>Python</Filter>
1129+
</ClCompile>
11301130
<ClCompile Include="..\Python\preconfig.c">
11311131
<Filter>Python</Filter>
11321132
</ClCompile>

‎Objects/asm_trampoline.S renamed to ‎Python/asm_trampoline.S

File renamed without changes.

‎Objects/perf_trampoline.c renamed to ‎Python/perf_trampoline.c

File renamed without changes.

‎Tools/c-analyzer/cpython/globals-to-fix.tsv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ Objects/floatobject.c - float_format -
380380
Objects/longobject.c long_from_non_binary_base log_base_BASE -
381381
Objects/longobject.c long_from_non_binary_base convwidth_base -
382382
Objects/longobject.c long_from_non_binary_base convmultmax_base -
383-
Objects/perf_trampoline.c - perf_map_file -
383+
Python/perf_trampoline.c - perf_map_file -
384384
Objects/unicodeobject.c - ucnhash_capi -
385385
Parser/action_helpers.c _PyPegen_dummy_name cache -
386386
Python/dtoa.c - p5s -
@@ -456,10 +456,10 @@ Objects/dictobject.c - next_dict_keys_version -
456456
Objects/funcobject.c - next_func_version -
457457
Objects/moduleobject.c - max_module_number -
458458
Objects/object.c - _Py_RefTotal -
459-
Objects/perf_trampoline.c - perf_status -
460-
Objects/perf_trampoline.c - extra_code_index -
461-
Objects/perf_trampoline.c - code_arena -
462-
Objects/perf_trampoline.c - trampoline_api -
459+
Python/perf_trampoline.c - perf_status -
460+
Python/perf_trampoline.c - extra_code_index -
461+
Python/perf_trampoline.c - code_arena -
462+
Python/perf_trampoline.c - trampoline_api -
463463
Objects/typeobject.c - next_version_tag -
464464
Objects/typeobject.c resolve_slotdups ptrs -
465465
Parser/pegen.c - memo_statistics -

‎Tools/c-analyzer/cpython/ignored.tsv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ Objects/object.c - _Py_GenericAliasIterType -
7777
Objects/object.c - _PyMemoryIter_Type -
7878
Objects/object.c - _PyLineIterator -
7979
Objects/object.c - _PyPositionsIterator -
80-
Objects/perf_trampoline.c - _Py_trampoline_func_start -
81-
Objects/perf_trampoline.c - _Py_trampoline_func_end -
80+
Python/perf_trampoline.c - _Py_trampoline_func_start -
81+
Python/perf_trampoline.c - _Py_trampoline_func_end -
8282
Python/importdl.h - _PyImport_DynLoadFiletab -
8383

8484
Modules/expat/xmlrole.c - prolog0 -
@@ -465,7 +465,7 @@ Objects/obmalloc.c - _PyMem_Debug -
465465
Objects/obmalloc.c - _PyMem_Raw -
466466
Objects/obmalloc.c - _PyObject -
467467
Objects/obmalloc.c - usedpools -
468-
Objects/perf_trampoline.c - _Py_perfmap_callbacks -
468+
Python/perf_trampoline.c - _Py_perfmap_callbacks -
469469
Objects/typeobject.c - name_op -
470470
Objects/unicodeobject.c - stripfuncnames -
471471
Objects/unicodeobject.c - utf7_category -

‎configure

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3474,7 +3474,7 @@ AC_MSG_RESULT([$perf_trampoline])
34743474

34753475
AS_VAR_IF([perf_trampoline], [yes], [
34763476
AC_DEFINE([PY_HAVE_PERF_TRAMPOLINE], [1], [Define to 1 if you have the perf trampoline.])
3477-
PERF_TRAMPOLINE_OBJ=Objects/asm_trampoline.o
3477+
PERF_TRAMPOLINE_OBJ=Python/asm_trampoline.o
34783478
34793479
dnl perf needs frame pointers for unwinding, include compiler option in debug builds
34803480
AS_VAR_IF([Py_DEBUG], [true], [

0 commit comments

Comments
 (0)
0