OLD | NEW |
---|---|
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
750 UnixCppEntriesProvider.call(this, nmExec, targetRootFS); | 750 UnixCppEntriesProvider.call(this, nmExec, targetRootFS); |
751 // Note an empty group. It is required, as UnixCppEntriesProvider expects 3 gr oups. | 751 // Note an empty group. It is required, as UnixCppEntriesProvider expects 3 gr oups. |
752 this.FUNC_RE = /^([0-9a-fA-F]{8,16}) ()[iItT] (.*)$/; | 752 this.FUNC_RE = /^([0-9a-fA-F]{8,16}) ()[iItT] (.*)$/; |
753 }; | 753 }; |
754 inherits(MacCppEntriesProvider, UnixCppEntriesProvider); | 754 inherits(MacCppEntriesProvider, UnixCppEntriesProvider); |
755 | 755 |
756 | 756 |
757 MacCppEntriesProvider.prototype.loadSymbols = function(libName) { | 757 MacCppEntriesProvider.prototype.loadSymbols = function(libName) { |
758 this.parsePos = 0; | 758 this.parsePos = 0; |
759 libName = this.targetRootFS + libName; | 759 libName = this.targetRootFS + libName; |
760 | |
761 // It seems that in OS X `nm` thinks that `-f` is a format option, not a | |
762 // "flat" display option flag. | |
noordhuis
2016/03/28 18:32:24
It sounds like you were picking up the GNU version
fedor.indutny
2016/03/28 21:20:46
It could be this, but sounds very unlikely conside
Michael Achenbach
2016/04/06 06:53:52
I logged onto a random mac 10.9.5 bot and typed:
w
fedor.indutny
2016/04/07 15:07:41
I guess there are some differences between `nm` su
| |
760 try { | 763 try { |
761 this.symbols = [os.system(this.nmExec, ['-n', '-f', libName], -1, -1), '']; | 764 this.symbols = [os.system(this.nmExec, ['-n', libName], -1, -1), '']; |
762 } catch (e) { | 765 } catch (e) { |
763 // If the library cannot be found on this system let's not panic. | 766 // If the library cannot be found on this system let's not panic. |
764 this.symbols = ''; | 767 this.symbols = ''; |
765 } | 768 } |
766 }; | 769 }; |
767 | 770 |
768 | 771 |
769 function WindowsCppEntriesProvider(_ignored_nmExec, targetRootFS) { | 772 function WindowsCppEntriesProvider(_ignored_nmExec, targetRootFS) { |
770 this.targetRootFS = targetRootFS; | 773 this.targetRootFS = targetRootFS; |
771 this.symbols = ''; | 774 this.symbols = ''; |
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
971 for (var synArg in this.argsDispatch_) { | 974 for (var synArg in this.argsDispatch_) { |
972 if (arg !== synArg && dispatch === this.argsDispatch_[synArg]) { | 975 if (arg !== synArg && dispatch === this.argsDispatch_[synArg]) { |
973 synonyms.push(synArg); | 976 synonyms.push(synArg); |
974 delete this.argsDispatch_[synArg]; | 977 delete this.argsDispatch_[synArg]; |
975 } | 978 } |
976 } | 979 } |
977 print(' ' + padRight(synonyms.join(', '), 20) + " " + dispatch[2]); | 980 print(' ' + padRight(synonyms.join(', '), 20) + " " + dispatch[2]); |
978 } | 981 } |
979 quit(2); | 982 quit(2); |
980 }; | 983 }; |
OLD | NEW |