Skip to content

Commit 6066de4

Browse files
authored
Merge branch 'main' into install-compression
2 parents 8c347a1 + cd76eff commit 6066de4

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

Doc/howto/remote_debugging.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ file format structures from the binary file on disk. The ELF header contains a
110110
pointer to the section header table. Each section header contains metadata about
111111
a section including its name (stored in a separate string table), offset, and
112112
size. To find a specific section like .PyRuntime, you need to walk through these
113-
headers and match the section name. The section header then provdes the offset
113+
headers and match the section name. The section header then provides the offset
114114
where that section exists in the file, which can be used to calculate its
115115
runtime address when the binary is loaded into memory.
116116

Doc/library/faulthandler.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ Dumping the C stack
8484
C Stack Compatibility
8585
*********************
8686

87-
If the system does not support the C-level :manpage:`backtrace(3)`,
88-
:manpage:`backtrace_symbols(3)`, or :manpage:`dladdr(3)`, then C stack dumps
89-
will not work. An error will be printed instead of the stack.
87+
If the system does not support the C-level :manpage:`backtrace(3)`
88+
or :manpage:`dladdr1(3)`, then C stack dumps will not work.
89+
An error will be printed instead of the stack.
9090

9191
Additionally, some compilers do not support :term:`CPython's <CPython>`
9292
implementation of C stack dumps. As a result, a different error may be printed

Doc/library/importlib.metadata.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ Distribution files
297297
package is not installed in the current Python environment.
298298

299299
Returns :const:`None` if the distribution is found but the installation
300-
database records reporting the files associated with the distribuion package
300+
database records reporting the files associated with the distribution package
301301
are missing.
302302

303303
.. class:: PackagePath

configure

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

configure.ac

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2986,8 +2986,12 @@ AC_HEADER_DIRENT
29862986
AC_HEADER_MAJOR
29872987

29882988
# for faulthandler
2989-
AC_CHECK_HEADERS([execinfo.h link.h dlfcn.h],
2990-
[AC_CHECK_FUNCS(backtrace backtrace_symbols dladdr1)])
2989+
AC_CHECK_HEADERS([execinfo.h link.h dlfcn.h], [
2990+
AC_CHECK_FUNCS([backtrace dladdr1], [
2991+
# dladdr1 requires -ldl
2992+
AS_VAR_APPEND([LDFLAGS], [" -ldl"])
2993+
])
2994+
])
29912995

29922996
# bluetooth/bluetooth.h has been known to not compile with -std=c99.
29932997
# http://permalink.gmane.org/gmane.linux.bluez.kernel/22294

pyconfig.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,6 @@
9292
/* Define to 1 if you have the 'backtrace' function. */
9393
#undef HAVE_BACKTRACE
9494

95-
/* Define to 1 if you have the 'backtrace_symbols' function. */
96-
#undef HAVE_BACKTRACE_SYMBOLS
97-
9895
/* Define if you have the 'bind' function. */
9996
#undef HAVE_BIND
10097

0 commit comments

Comments
 (0)