ffmpeg disable -fno-omit-frame-pointer to allow valgrind to build without requiring ffmpeg #define HAVE_EBP_AVAILABLE 0 and #define HAVE_EBX_AVAILABLE 0

BUG=37358
TEST=build with valgrind configuration.

Review URL: http://codereview.chromium.org/668011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40574 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 19 insertions, 15 deletions

diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp
index c813da41..3184745 100755
--- a/third_party/ffmpeg/ffmpeg.gyp
+++ b/third_party/ffmpeg/ffmpeg.gyp
@@ -270,6 +270,13 @@
                 'source/patched-ffmpeg-mt/libavcodec/x86/vc1dsp_mmx.c',
               ],
             }],
+            ['target_arch=="ia32"', {
+              'cflags!': [
+                # Turn off valgrind build option that breaks ffmpeg builds.
+		# Allows config.h HAVE_EBP_AVAILABLE 1 and HAVE_EBX_AVAILABLE 1
+                '-fno-omit-frame-pointer',
+              ],
+            }],  # target_arch=="ia32"
             ['target_arch=="x64"', {
               # x64 requires PIC for shared libraries. This is opposite
               # of ia32 where due to a slew of inline assembly using ebx,
@@ -317,9 +324,6 @@
             }],  # target_arch=="arm"
             ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
               'sources': [
-	        # TODO(fbarchard): dsputil_neon code should be used by chromium
-		# for ogg, but with h264 references only if CONFIG_H264_DECODER
-		# is enabled.
                 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_arm.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te.c',
diff --git a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
index 95eb63e..8d35989 100644
--- a/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/linux/ia32/config.h
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0
diff --git a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
index c21832f..2b61c78 100644
--- a/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chrome/mac/ia32/config.h
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0
diff --git a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
index a839811..adb916c 100644
--- a/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromeOS/linux/ia32/config.h
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0
diff --git a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
index 38c6612..fb3ec31 100644
--- a/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/linux/ia32/config.h
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0
diff --git a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
index 52b6b0a..5081567 100644
--- a/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
+++ b/third_party/ffmpeg/source/config/Chromium/mac/ia32/config.h
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0
diff --git a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
index acfed943..42354bd 100644
--- a/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
+++ b/third_party/ffmpeg/source/config/ChromiumOS/linux/ia32/config.h
@@ -69,8 +69,8 @@
 #define HAVE_DLFCN_H 1
 #define HAVE_DLOPEN 1
 #define HAVE_DOS_PATHS 0
-#define HAVE_EBP_AVAILABLE 0
-#define HAVE_EBX_AVAILABLE 0
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
 #define HAVE_EXP2 1
 #define HAVE_EXP2F 1
 #define HAVE_FAST_64BIT 0