Bug 1154347 - Don't set -fomit-frame-pointer on all of skia. r=glandium, r=gw280

--HG--
extra : rebase_source : cdc5b1362119d68c29e7a8182f2ed88db9abb122

gfx/skia/generate_mozbuild.py

@@ -138,10 +138,11 @@ if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
-        '-fomit-frame-pointer',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']
+    if CONFIG['CPU_ARCH'] == 'arm':
+        SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
@@ -346,6 +347,7 @@ def write_sources(f, values, indent):
     'SkBlitter_ARGB32.cpp',
     'SkBlitter_RGB16.cpp',
     'SkBlitter_Sprite.cpp',
+    'SkBlitRow_opts_arm.cpp',
     'SkScan_Antihair.cpp',
     'SkCondVar.cpp',
     'SkParse.cpp',

gfx/skia/moz.build

@@ -816,13 +816,15 @@ elif CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
         'trunk/src/core/SkUtilsArm.cpp',
         'trunk/src/opts/SkBitmapProcState_opts_arm.cpp',
         'trunk/src/opts/SkBlitMask_opts_arm.cpp',
-        'trunk/src/opts/SkBlitRow_opts_arm.cpp',
         'trunk/src/opts/SkBlurImage_opts_arm.cpp',
         'trunk/src/opts/SkMorphology_opts_arm.cpp',
         'trunk/src/opts/SkTextureCompression_opts_arm.cpp',
         'trunk/src/opts/SkUtils_opts_arm.cpp',
         'trunk/src/opts/SkXfermode_opts_arm.cpp',
     ]
+    SOURCES += [
+        'trunk/src/opts/SkBlitRow_opts_arm.cpp',
+    ]
     if CONFIG['BUILD_ARM_NEON']:
         SOURCES += [
             'trunk/src/opts/SkBitmapProcState_arm_neon.cpp',
@@ -964,10 +966,11 @@ if CONFIG['GNU_CXX']:
     CXXFLAGS += [
         '-Wno-overloaded-virtual',
         '-Wno-unused-function',
-        '-fomit-frame-pointer',
     ]
     if not CONFIG['CLANG_CXX']:
         CXXFLAGS += ['-Wno-logical-op']
+    if CONFIG['CPU_ARCH'] == 'arm':
+        SOURCES['trunk/src/opts/SkBlitRow_opts_arm.cpp'].flags += ['-fomit-frame-pointer']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 'qt'):
     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']