bpo-42087: Remove support for AIX 5.3 and below (GH-22830) · python/cpython@c79667f · GitHub
Skip to content

Commit c79667f

Browse files
kadlerkadler
authored
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.
1 parent ae6cd7c commit c79667f

7 files changed

Lines changed: 23 additions & 64 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 1 addition & 1 deletion

‎Misc/NEWS.d/next/Build/2020-10-19-15-41-05.bpo-42087.2AhRFP.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Support was removed for AIX 5.3 and below. See :issue:`40680`.

‎Misc/README.AIX‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ cd Python-3.2
3737
CC=xlc_r OPT="-O2 -qmaxmem=70000" ./configure --without-computed-gotos --enable-shared
3838
make
3939

40-
Note:
41-
On AIX 5.3 and earlier, you will also need to specify the
42-
"--disable-ipv6" flag to configure. This has been corrected in AIX
43-
6.1.
44-
4540

4641
======================================================================
4742
Memory Limitations

‎Modules/_localemodule.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ static struct langinfo_constant{
556556
LANGINFO(PM_STR),
557557

558558
/* The following constants are available only with XPG4, but...
559-
AIX 3.2. only has CODESET.
560559
OpenBSD doesn't have CODESET but has T_FMT_AMPM, and doesn't have
561560
a few of the others.
562561
Solution: ifdef-test them all. */

‎Modules/makexp_aix‎

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# ===========================================================================
44
# FILE: makexp_aix
55
# TYPE: standalone executable
6-
# SYSTEM: AIX 3.2.5 and AIX 4
6+
# SYSTEM: AIX
77
#
88
# DESCRIPTION: This script creates an export list of ALL global symbols
99
# from a list of object or archive files.
@@ -48,34 +48,24 @@ echo "*" >> $expFileName
4848
echo "* $notemsg" >> $expFileName
4949
echo "*" >> $expFileName
5050

51-
# Extract the symbol list using 'nm' which produces quite
52-
# different output under AIX 4 than under AIX 3.2.5.
53-
# The following handles both versions by using a common flagset.
51+
# Extract the symbol list using 'nm'
5452
# Here are some hidden tricks:
55-
# 1. Use /usr/ccs/bin/nm. Relevant to AIX 3.2.5 which has
56-
# another version under /usr/ucb/bin/nm.
57-
# 2. Use the -B flag to have a standard BSD representation
58-
# of the symbol list on both AIX 3.2.5 and AIX 4. The "-B"
59-
# flag is missing in the AIX 3.2.5 online usage help of 'nm'.
60-
# 3. Use the -x flag to have a hex representation of the symbol
61-
# values. This fills the leading whitespaces on AIX 4,
62-
# thus simplifying the sed statement.
63-
# 4. Eliminate all entries except those with either "B", "D"
64-
# or "T" key letters. We are interested only in the global
65-
# (extern) BSS, DATA and TEXT symbols. With the same statement
66-
# we eliminate object member lines relevant to AIX 4.
67-
# 5. Eliminate entries containing a dot. We can have a dot only
68-
# as a symbol prefix, but such symbols are undefined externs.
69-
# 6. Eliminate everything including the key letter, so that we're
70-
# left with just the symbol name.
71-
# 7. Eliminate all entries containing two colons, like Class::method
53+
# - Use the -B flag to have a standard BSD representation
54+
# of the symbol list.
55+
# - Use the -x flag to have a hex representation of the symbol
56+
# values. This fills the leading whitespaces, thus simplifying
57+
# the sed statement.
58+
# - Eliminate all entries except those with either "B", "D"
59+
# or "T" key letters. We are interested only in the global
60+
# (extern) BSS, DATA and TEXT symbols. With the same statement
61+
# we eliminate object member lines relevant to AIX 4.
62+
# - Eliminate entries containing a dot. We can have a dot only
63+
# as a symbol prefix, but such symbols are undefined externs.
64+
# - Eliminate everything including the key letter, so that we're
65+
# left with just the symbol name.
66+
# - Eliminate all entries containing two colons, like Class::method
7267
#
7368

74-
# Use -X32_64 if it appears to be implemented in this version of 'nm'.
75-
NM=/usr/ccs/bin/nm
76-
xopt=-X32_64
77-
$NM -e $xopt $1 >/dev/null 2>&1 || xopt=""
78-
79-
$NM -Bex $xopt $inputFiles \
69+
/usr/ccs/bin/nm -Bex -X32_64 $inputFiles \
8070
| sed -e '/ [^BDT] /d' -e '/\./d' -e 's/.* [BDT] //' -e '/::/d' \
8171
| sort | uniq >> $expFileName

‎configure‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3430,16 +3430,6 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
34303430
define_xopen_source=no;;
34313431
Darwin/[12][0-9].*)
34323432
define_xopen_source=no;;
3433-
# On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
3434-
# used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
3435-
# or has another value. By not (re)defining it, the defaults come in place.
3436-
AIX/4)
3437-
define_xopen_source=no;;
3438-
AIX/5)
3439-
if test `uname -r` -eq 1; then
3440-
define_xopen_source=no
3441-
fi
3442-
;;
34433433
# On QNX 6.3.2, defining _XOPEN_SOURCE prevents netdb.h from
34443434
# defining NI_NUMERICHOST.
34453435
QNX/6.3.2)
@@ -5828,10 +5818,7 @@ $as_echo_n "checking EXPORTSYMS... " >&6; }
58285818
case $ac_sys_system in
58295819
AIX*)
58305820
EXPORTSYMS="Modules/python.exp"
5831-
if test $ac_sys_release -ge 5 -o \
5832-
$ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then
5833-
EXPORTSFROM=. # the main executable
5834-
fi
5821+
EXPORTSFROM=. # the main executable
58355822
;;
58365823
esac
58375824
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPORTSYMS" >&5
@@ -11657,7 +11644,7 @@ fi
1165711644
DLINCLDIR=.
1165811645

1165911646
# the dlopen() function means we might want to use dynload_shlib.o. some
11660-
# platforms, such as AIX, have dlopen(), but don't want to use it.
11647+
# platforms have dlopen(), but don't want to use it.
1166111648
for ac_func in dlopen
1166211649
do :
1166311650
ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"

‎configure.ac‎

Lines changed: 2 additions & 15 deletions

0 commit comments

Comments
 (0)