llvm.org GIT mirror llvm / 4b7da3b
Merging r367846 and r367847: ------------------------------------------------------------------------ r367846 | hans | 2019-08-05 15:04:07 +0200 (Mon, 05 Aug 2019) | 1 line Write the RequiredLibraries for 'all' in LibraryDependencies.inc in a deterministic order (PR42739) ------------------------------------------------------------------------ ------------------------------------------------------------------------ r367847 | hans | 2019-08-05 15:04:12 +0200 (Mon, 05 Aug 2019) | 8 lines test-release.sh: Perform the sed substitution on both files (PR42739) The comparison would otherwise fail if Phase2 occurrs naturally in the object file. It would get replaced with Phase3 in the one .o, but not in the other. We were already running both files through sed to have them processed in this same way; this is a logical extension of that. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_90@367848 91177308-0d34-0410-b5e6-96231b3b80d8 Hans Wennborg 1 year, 2 months ago
2 changed file(s) with 5 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
358358 root_entries = set(e[0] for e in entries)
359359 for _,_,deps,_ in entries:
360360 root_entries -= set(deps)
361 entries.append(('all', None, root_entries, True))
361 entries.append(('all', None, sorted(root_entries), True))
362362
363363 entries.sort()
364364
590590 for p2 in `find $llvmCore_phase2_objdir -name '*.o'` ; do
591591 p3=`echo $p2 | sed -e 's,Phase2,Phase3,'`
592592 # Substitute 'Phase2' for 'Phase3' in the Phase 2 object file in
593 # case there are build paths in the debug info. On some systems,
594 # sed adds a newline to the output, so pass $p3 through sed too.
593 # case there are build paths in the debug info. Do the same sub-
594 # stitution on both files in case the string occurrs naturally.
595595 if ! cmp -s \
596596 <(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p2) \
597 <(env LC_CTYPE=C sed -e '' $p3) 16 16; then
597 <(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p3) \
598 16 16; then
598599 echo "file `basename $p2` differs between phase 2 and phase 3"
599600 fi
600601 done