bpo-42087: Remove support for AIX 5.3 and below (GH-22830)

As AIX 5.3 and below do not support thread_cputime, it was decided in
https://bugs.python.org/issue40680 to require AIX 6.1 and above. This
commit removes workarounds for — and references to — older, unsupported
AIX versions.
This commit is contained in:
Kevin Adler 2020-11-16 09:16:10 -06:00 committed by GitHub
parent ae6cd7cfda
commit c79667ff79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 64 deletions

View File

@ -1639,7 +1639,7 @@ libainstall: @DEF_MAKE_RULE@ python-config
$(INSTALL_SCRIPT) Modules/ld_so_aix \ $(INSTALL_SCRIPT) Modules/ld_so_aix \
$(DESTDIR)$(LIBPL)/ld_so_aix; \ $(DESTDIR)$(LIBPL)/ld_so_aix; \
echo "$(LIBPL)/ld_so_aix"; \ echo "$(LIBPL)/ld_so_aix"; \
echo; echo "See Misc/AIX-NOTES for details."; \ echo; echo "See Misc/README.AIX for details."; \
else true; \ else true; \
fi fi

View File

@ -0,0 +1 @@
Support was removed for AIX 5.3 and below. See :issue:`40680`.

View File

@ -37,11 +37,6 @@ cd Python-3.2
CC=xlc_r OPT="-O2 -qmaxmem=70000" ./configure --without-computed-gotos --enable-shared CC=xlc_r OPT="-O2 -qmaxmem=70000" ./configure --without-computed-gotos --enable-shared
make make
Note:
On AIX 5.3 and earlier, you will also need to specify the
"--disable-ipv6" flag to configure. This has been corrected in AIX
6.1.
====================================================================== ======================================================================
Memory Limitations Memory Limitations

View File

@ -556,7 +556,6 @@ static struct langinfo_constant{
LANGINFO(PM_STR), LANGINFO(PM_STR),
/* The following constants are available only with XPG4, but... /* The following constants are available only with XPG4, but...
AIX 3.2. only has CODESET.
OpenBSD doesn't have CODESET but has T_FMT_AMPM, and doesn't have OpenBSD doesn't have CODESET but has T_FMT_AMPM, and doesn't have
a few of the others. a few of the others.
Solution: ifdef-test them all. */ Solution: ifdef-test them all. */

View File

@ -3,7 +3,7 @@
# =========================================================================== # ===========================================================================
# FILE: makexp_aix # FILE: makexp_aix
# TYPE: standalone executable # TYPE: standalone executable
# SYSTEM: AIX 3.2.5 and AIX 4 # SYSTEM: AIX
# #
# DESCRIPTION: This script creates an export list of ALL global symbols # DESCRIPTION: This script creates an export list of ALL global symbols
# from a list of object or archive files. # from a list of object or archive files.
@ -48,34 +48,24 @@ echo "*" >> $expFileName
echo "* $notemsg" >> $expFileName echo "* $notemsg" >> $expFileName
echo "*" >> $expFileName echo "*" >> $expFileName
# Extract the symbol list using 'nm' which produces quite # Extract the symbol list using 'nm'
# different output under AIX 4 than under AIX 3.2.5.
# The following handles both versions by using a common flagset.
# Here are some hidden tricks: # Here are some hidden tricks:
# 1. Use /usr/ccs/bin/nm. Relevant to AIX 3.2.5 which has # - Use the -B flag to have a standard BSD representation
# another version under /usr/ucb/bin/nm. # of the symbol list.
# 2. Use the -B flag to have a standard BSD representation # - Use the -x flag to have a hex representation of the symbol
# of the symbol list on both AIX 3.2.5 and AIX 4. The "-B" # values. This fills the leading whitespaces, thus simplifying
# flag is missing in the AIX 3.2.5 online usage help of 'nm'. # the sed statement.
# 3. Use the -x flag to have a hex representation of the symbol # - Eliminate all entries except those with either "B", "D"
# values. This fills the leading whitespaces on AIX 4,
# thus simplifying the sed statement.
# 4. Eliminate all entries except those with either "B", "D"
# or "T" key letters. We are interested only in the global # or "T" key letters. We are interested only in the global
# (extern) BSS, DATA and TEXT symbols. With the same statement # (extern) BSS, DATA and TEXT symbols. With the same statement
# we eliminate object member lines relevant to AIX 4. # we eliminate object member lines relevant to AIX 4.
# 5. Eliminate entries containing a dot. We can have a dot only # - Eliminate entries containing a dot. We can have a dot only
# as a symbol prefix, but such symbols are undefined externs. # as a symbol prefix, but such symbols are undefined externs.
# 6. Eliminate everything including the key letter, so that we're # - Eliminate everything including the key letter, so that we're
# left with just the symbol name. # left with just the symbol name.
# 7. Eliminate all entries containing two colons, like Class::method # - Eliminate all entries containing two colons, like Class::method
# #
# Use -X32_64 if it appears to be implemented in this version of 'nm'. /usr/ccs/bin/nm -Bex -X32_64 $inputFiles \
NM=/usr/ccs/bin/nm
xopt=-X32_64
$NM -e $xopt $1 >/dev/null 2>&1 || xopt=""
$NM -Bex $xopt $inputFiles \
| sed -e '/ [^BDT] /d' -e '/\./d' -e 's/.* [BDT] //' -e '/::/d' \ | sed -e '/ [^BDT] /d' -e '/\./d' -e 's/.* [BDT] //' -e '/::/d' \
| sort | uniq >> $expFileName | sort | uniq >> $expFileName

15
configure vendored
View File

@ -3430,16 +3430,6 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
define_xopen_source=no;; define_xopen_source=no;;
Darwin/[12][0-9].*) Darwin/[12][0-9].*)
define_xopen_source=no;; define_xopen_source=no;;
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
# or has another value. By not (re)defining it, the defaults come in place.
AIX/4)
define_xopen_source=no;;
AIX/5)
if test `uname -r` -eq 1; then
define_xopen_source=no
fi
;;
# On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
# defining NI_NUMERICHOST. # defining NI_NUMERICHOST.
QNX/6.3.2) QNX/6.3.2)
@ -5828,10 +5818,7 @@ $as_echo_n "checking EXPORTSYMS... " >&6; }
case $ac_sys_system in case $ac_sys_system in
AIX*) AIX*)
EXPORTSYMS="Modules/python.exp" EXPORTSYMS="Modules/python.exp"
if test $ac_sys_release -ge 5 -o \
$ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then
EXPORTSFROM=. # the main executable EXPORTSFROM=. # the main executable
fi
;; ;;
esac esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPORTSYMS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPORTSYMS" >&5
@ -11657,7 +11644,7 @@ fi
DLINCLDIR=. DLINCLDIR=.
# the dlopen() function means we might want to use dynload_shlib.o. some # the dlopen() function means we might want to use dynload_shlib.o. some
# platforms, such as AIX, have dlopen(), but don't want to use it. # platforms have dlopen(), but don't want to use it.
for ac_func in dlopen for ac_func in dlopen
do : do :
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"

View File

@ -512,16 +512,6 @@ case $ac_sys_system/$ac_sys_release in
define_xopen_source=no;; define_xopen_source=no;;
Darwin/@<:@[12]@:>@@<:@0-9@:>@.*) Darwin/@<:@[12]@:>@@<:@0-9@:>@.*)
define_xopen_source=no;; define_xopen_source=no;;
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
# or has another value. By not (re)defining it, the defaults come in place.
AIX/4)
define_xopen_source=no;;
AIX/5)
if test `uname -r` -eq 1; then
define_xopen_source=no
fi
;;
# On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from # On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
# defining NI_NUMERICHOST. # defining NI_NUMERICHOST.
QNX/6.3.2) QNX/6.3.2)
@ -1048,10 +1038,7 @@ AC_MSG_CHECKING(EXPORTSYMS)
case $ac_sys_system in case $ac_sys_system in
AIX*) AIX*)
EXPORTSYMS="Modules/python.exp" EXPORTSYMS="Modules/python.exp"
if test $ac_sys_release -ge 5 -o \
$ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then
EXPORTSFROM=. # the main executable EXPORTSFROM=. # the main executable
fi
;; ;;
esac esac
AC_MSG_RESULT($EXPORTSYMS) AC_MSG_RESULT($EXPORTSYMS)
@ -3631,7 +3618,7 @@ AC_SUBST(DLINCLDIR)
DLINCLDIR=. DLINCLDIR=.
# the dlopen() function means we might want to use dynload_shlib.o. some # the dlopen() function means we might want to use dynload_shlib.o. some
# platforms, such as AIX, have dlopen(), but don't want to use it. # platforms have dlopen(), but don't want to use it.
AC_CHECK_FUNCS(dlopen) AC_CHECK_FUNCS(dlopen)
# DYNLOADFILE specifies which dynload_*.o file we will use for dynamic # DYNLOADFILE specifies which dynload_*.o file we will use for dynamic