[llvm-branch-commits] [llvm-branch] r367848 - Merging r367846 and r367847:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Aug  5 06:10:20 2019
New Revision: 367848

URL: http://llvm.org/viewvc/llvm-project?rev=367848&view=rev
Log:
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.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_90/   (props changed)
    llvm/branches/release_90/utils/llvm-build/llvmbuild/main.py
    llvm/branches/release_90/utils/release/test-release.sh

Propchange: llvm/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  5 06:10:20 2019
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,366431,366481,366487,366527,366570,366868,366925,367030,367062,367124,367215,367292,367304,367314,367340-367341,367394,367396,367398,367417,367662,367753
+/llvm/trunk:155241,366431,366481,366487,366527,366570,366868,366925,367030,367062,367124,367215,367292,367304,367314,367340-367341,367394,367396,367398,367417,367662,367753,367846-367847

Modified: llvm/branches/release_90/utils/llvm-build/llvmbuild/main.py
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/utils/llvm-build/llvmbuild/main.py?rev=367848&r1=367847&r2=367848&view=diff
==============================================================================
--- llvm/branches/release_90/utils/llvm-build/llvmbuild/main.py (original)
+++ llvm/branches/release_90/utils/llvm-build/llvmbuild/main.py Mon Aug  5 06:10:20 2019
@@ -359,7 +359,7 @@ subdirectories = %s
         root_entries = set(e[0] for e in entries)
         for _,_,deps,_ in entries:
             root_entries -= set(deps)
-        entries.append(('all', None, root_entries, True))
+        entries.append(('all', None, sorted(root_entries), True))
 
         entries.sort()
 

Modified: llvm/branches/release_90/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_90/utils/release/test-release.sh?rev=367848&r1=367847&r2=367848&view=diff
==============================================================================
--- llvm/branches/release_90/utils/release/test-release.sh (original)
+++ llvm/branches/release_90/utils/release/test-release.sh Mon Aug  5 06:10:20 2019
@@ -591,11 +591,12 @@ for Flavor in $Flavors ; do
         for p2 in `find $llvmCore_phase2_objdir -name '*.o'` ; do
             p3=`echo $p2 | sed -e 's,Phase2,Phase3,'`
             # Substitute 'Phase2' for 'Phase3' in the Phase 2 object file in
-            # case there are build paths in the debug info. On some systems,
-            # sed adds a newline to the output, so pass $p3 through sed too.
+            # case there are build paths in the debug info. Do the same sub-
+            # stitution on both files in case the string occurrs naturally.
             if ! cmp -s \
                 <(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p2) \
-                <(env LC_CTYPE=C sed -e '' $p3) 16 16; then
+                <(env LC_CTYPE=C sed -e 's,Phase2,Phase3,g' -e 's,Phase1,Phase2,g' $p3) \
+                16 16; then
                 echo "file `basename $p2` differs between phase 2 and phase 3"
             fi
         done