diff --git a/common.gypi b/common.gypi
index 2a8beb34c1c..3f708d89b1e 100644
--- a/common.gypi
+++ b/common.gypi
@@ -204,7 +204,6 @@
             ],
           }],
           ['OS=="solaris"', {
-           'cflags': [ '-fno-omit-frame-pointer' ],
             # pull in V8's postmortem metadata
             'ldflags': [ '-Wl,-z,allextract' ]
           }],
@@ -212,6 +211,12 @@
             # increase performance, number from experimentation
             'cflags': [ '-qINLINE=::150:100000' ]
           }],
+          ['OS!="mac" and OS!="win" and OS!="zos"', {
+            # -fno-omit-frame-pointer is necessary for the --perf_basic_prof
+            # flag to work correctly. perf(1) gets confused about JS stack
+            # frames otherwise, even with --call-graph dwarf.
+            'cflags': [ '-fno-omit-frame-pointer' ],
+          }],
           ['OS=="linux"', {
             'conditions': [
               ['enable_pgo_generate=="true"', {