Version 5.1.281.51 (cherry-pick)

tools/tickprocessor.js

Index: tools/tickprocessor.js
diff --git a/tools/tickprocessor.js b/tools/tickprocessor.js
index 7d07bf6c558a37a63e27e318bebbd9f89efa57d9..ba7401a2236dd3ec25a0ae1ad89cf456f1e51970 100644
--- a/tools/tickprocessor.js
+++ b/tools/tickprocessor.js
@@ -670,8 +670,11 @@ inherits(MacCppEntriesProvider, UnixCppEntriesProvider);
 MacCppEntriesProvider.prototype.loadSymbols = function(libName) {
   this.parsePos = 0;
   libName = this.targetRootFS + libName;
+
+  // It seems that in OS X `nm` thinks that `-f` is a format option, not a
+  // "flat" display option flag.
   try {
-    this.symbols = [os.system(this.nmExec, ['-n', '-f', libName], -1, -1), ''];
+    this.symbols = [os.system(this.nmExec, ['-n', libName], -1, -1), ''];
   } catch (e) {
     // If the library cannot be found on this system let's not panic.
     this.symbols = '';