Bug 840661 - Fix ExpandArgsMore._getFoldedSections. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 14 Feb 2013 08:18:34 +0100
changeset 121729 d5dcdeae4bd22d33496c9a6eeca54d61238666b7
parent 121728 c73747cd5eba5353f0ea5d132738fc077ae63981
child 121730 fe298855f9d229520b0ada53035bb19cd90f7fd9
push id24304
push usermh@glandium.org
push dateThu, 14 Feb 2013 07:20:26 +0000
treeherdermozilla-central@d5dcdeae4bd2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs840661
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 840661 - Fix ExpandArgsMore._getFoldedSections. r=ted
config/expandlibs_exec.py
js/src/config/expandlibs_exec.py
--- a/config/expandlibs_exec.py
+++ b/config/expandlibs_exec.py
@@ -124,17 +124,17 @@ class ExpandArgsMore(ExpandArgs):
         # gold's --print-icf-sections output looks like the following:
         # ld: ICF folding section '.section' in file 'file.o'into '.section' in file 'file.o'
         # In terms of words, chances are this will change in the future,
         # especially considering "into" is misplaced. Splitting on quotes
         # seems safer.
         for l in stderr.split('\n'):
             quoted = l.split("'")
             if len(quoted) > 5 and quoted[1] != quoted[5]:
-                result[quoted[1]] = quoted[5]
+                result[quoted[1]] = [quoted[5]]
                 if quoted[5] in result:
                     result[quoted[5]].append(quoted[1])
                 else:
                     result[quoted[5]] = [quoted[1]]
         return result
 
     def _getOrderedSections(self, ordered_symbols):
         '''Given an ordered list of symbols, returns the corresponding list
--- a/js/src/config/expandlibs_exec.py
+++ b/js/src/config/expandlibs_exec.py
@@ -124,17 +124,17 @@ class ExpandArgsMore(ExpandArgs):
         # gold's --print-icf-sections output looks like the following:
         # ld: ICF folding section '.section' in file 'file.o'into '.section' in file 'file.o'
         # In terms of words, chances are this will change in the future,
         # especially considering "into" is misplaced. Splitting on quotes
         # seems safer.
         for l in stderr.split('\n'):
             quoted = l.split("'")
             if len(quoted) > 5 and quoted[1] != quoted[5]:
-                result[quoted[1]] = quoted[5]
+                result[quoted[1]] = [quoted[5]]
                 if quoted[5] in result:
                     result[quoted[5]].append(quoted[1])
                 else:
                     result[quoted[5]] = [quoted[1]]
         return result
 
     def _getOrderedSections(self, ordered_symbols):
         '''Given an ordered list of symbols, returns the corresponding list