traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36722: Don't define ALT_SOABI for Py_TRACE_REFS build (GH-12973) 

Py_TRACE_REFS ABI is incompatible with release and debug (Py_DEBUG)
ABI.
This commit is contained in:
Victor Stinner 2019-04-26 18:56:19 +02:00 committed by GitHub
parent 4046069740
commit 6d13e5b35b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Include/pyport.h
View File

@ -797,9 +797,9 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
#endif /* Py_BUILD_CORE */ #endif /* Py_BUILD_CORE */
#ifdef __ANDROID__ #ifdef __ANDROID__
/* The Android langinfo.h header is not used. */ /* The Android langinfo.h header is not used. */
#undef HAVE_LANGINFO_H # undef HAVE_LANGINFO_H
#undef CODESET # undef CODESET
#endif #endif
/* Maximum value of the Windows DWORD type */ /* Maximum value of the Windows DWORD type */
@ -810,7 +810,13 @@ extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler;
* for compatibility. * for compatibility.
*/ */
#ifndef WITH_THREAD #ifndef WITH_THREAD
#define WITH_THREAD # define WITH_THREAD
#endif
/* Check that ALT_SOABI is consistent with Py_TRACE_REFS:
./configure --with-trace-refs should must be used to define Py_TRACE_REFS */
#if defined(ALT_SOABI) && defined(Py_TRACE_REFS)
# error "Py_TRACE_REFS ABI is not compatible with release and debug ABI"
#endif #endif
#endif /* Py_PYPORT_H */ #endif /* Py_PYPORT_H */

3
configure vendored
View File

@ -15128,7 +15128,8 @@ SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFO
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
$as_echo "$SOABI" >&6; } $as_echo "$SOABI" >&6; }
if test "$Py_DEBUG" = 'true'; then # Release and debug (Py_DEBUG) ABI are compatible, but not Py_TRACE_REFS ABI
if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
# Similar to SOABI but remove "d" flag from ABIFLAGS # Similar to SOABI but remove "d" flag from ABIFLAGS
ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}

3
configure.ac
View File

@ -4627,7 +4627,8 @@ AC_MSG_CHECKING(SOABI)
SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
AC_MSG_RESULT($SOABI) AC_MSG_RESULT($SOABI)
if test "$Py_DEBUG" = 'true'; then # Release and debug (Py_DEBUG) ABI are compatible, but not Py_TRACE_REFS ABI
if test "$Py_DEBUG" = 'true' -a "$with_trace_refs" != "yes"; then
# Similar to SOABI but remove "d" flag from ABIFLAGS # Similar to SOABI but remove "d" flag from ABIFLAGS
AC_SUBST(ALT_SOABI) AC_SUBST(ALT_SOABI)
ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET} ALT_SOABI='cpython-'`echo $VERSION | tr -d .``echo $ABIFLAGS | tr -d d`${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}