Skip to content

bpo-40424: allow makexp_aix to manage parallel build requests #19759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

bpo-40424: allow makexp_aix to manage parallel build requests #19759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60ec425
Make the build utility `makeaix_exp` able to deal with parallel build…
Apr 28, 2020
c0d34c2
Add News blurb
aixtools Jun 2, 2020
39f1361
Fix intermixed output from makexp_aix when run in multi-job mode.
aixtools Jul 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Misc/NEWS.d/next/Build/2020-06-02-21-35-11.bpo-40424.lns33S.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Fix inter-mixed output when run in a multi-job build caused by the first
job overwriting the file with the first echo and all subsequent echos appending
to the end. This causes the symbol list to be defined twice leading to errant
"ld: 0711-224 WARNING: Duplicate symbol" messages from the linker.

Patch by M. Felt and Kevin (kadler).
43 changes: 18 additions & 25 deletions Modules/makexp_aix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh
#!/usr/bin/sh
#
# ===========================================================================
# FILE: makexp_aix
# TYPE: standalone executable
# SYSTEM: AIX 3.2.5 and AIX 4
# SYSTEM: AIX 3.2.5 and AIX 4
#
# DESCRIPTION: This script creates an export list of ALL global symbols
# from a list of object or archive files.
Expand All @@ -18,8 +18,8 @@
# <InputFile> is an object (.o) or an archive file (.a).
#
# HISTORY:
# 3-Apr-1998 -- remove C++ entries of the form Class::method
# Vladimir Marangozov
# 3-Apr-1998 -- remove C++ entries of the form Class::method
# Vladimir Marangozov
#
# 1-Jul-1996 -- added header information
# Vladimir Marangozov
Expand All @@ -32,21 +32,18 @@
expFileName=$1
toAppendStr=$2
shift; shift;
inputFiles=$*
automsg="Generated automatically by makexp_aix"
notemsg="NOTE: lists _all_ global symbols defined in the above file(s)."
curwdir=`pwd`

# run in a sub-shell so the output is written atomically
(
# Create the export file and setup the header info
echo "#!"$toAppendStr > $expFileName
echo "*" >> $expFileName
echo "* $automsg (`date -u`)" >> $expFileName
echo "*" >> $expFileName
echo "* Base Directory: $curwdir" >> $expFileName
echo "* Input File(s) : $inputFiles" >> $expFileName
echo "*" >> $expFileName
echo "* $notemsg" >> $expFileName
echo "*" >> $expFileName
echo "#!"$toAppendStr
echo "*"
echo "* Generated automatically by makexp_aix (`date -u`)"
echo "*"
echo "* Input File(s) : $*"
echo "*"
echo "* NOTE: lists _all_ global symbols defined in the above file(s)."
echo "*"

# Extract the symbol list using 'nm' which produces quite
# different output under AIX 4 than under AIX 3.2.5.
Expand All @@ -71,11 +68,7 @@ echo "*" >> $expFileName
# 7. Eliminate all entries containing two colons, like Class::method
#

# Use -X32_64 if it appears to be implemented in this version of 'nm'.
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' \
| sort | uniq >> $expFileName
/usr/bin/nm -Bex -X32_64 $* \
| sed -e '/ [^BDT] /d' -e '/\./d' -e 's/.* [BDT] //' -e '/::/d' \
| sort | uniq
) > $expFileName