Back out bug 807492 for build bustage.

configure.in

@@ -1404,17 +1404,6 @@ if test "$GNU_CC"; then
     CFLAGS=$_SAVE_CFLAGS
     AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSSE3)
 
-    # Check for -msse4.1 on $CC
-    AC_MSG_CHECKING([if toolchain supports -msse4.1 option])
-    HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=
-    _SAVE_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -msse4.1"
-    AC_TRY_COMPILE([asm ("pmulld %xmm6,%xmm0");],,AC_MSG_RESULT([yes])
-                     [HAVE_TOOLCHAIN_SUPPORT_MSSE4_1=1],
-                     AC_MSG_RESULT([no]))
-    CFLAGS=$_SAVE_CFLAGS
-    AC_SUBST(HAVE_TOOLCHAIN_SUPPORT_MSSE4_1)
-
     # Turn on GNU-specific warnings:
     # -Wall - turn on a lot of warnings
     # -Wpointer-arith - good to have
@@ -9011,11 +9000,6 @@ elif test "${OS_TARGET}" = "Android"; then
    fi
 fi
 
-# Don't try to compile sse4.1 code if toolchain doesn't support
-if test -z "$HAVE_TOOLCHAIN_SUPPORT_MSSE4_1"; then
-  EXTRA_GYP_DEFINES="$EXTRA_GYP_DEFINES -D yuv_disable_asm=1"
-fi
-
 if test -n "$MOZ_WEBRTC"; then
    AC_MSG_RESULT("generating WebRTC Makefiles...")
 

media/webrtc/trunk/build/common.gypi

@@ -80,21 +80,12 @@
             ['use_ash==1', {
               'use_aura%': 1,
             }],
-
-            # A flag for BSD platforms
-            ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or \
-              OS=="openbsd"', {
-              'os_bsd%': 1,
-            }, {
-              'os_bsd%': 0,
-            }],
           ],
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
         'use_aura%': '<(use_aura)',
         'use_ash%': '<(use_ash)',
-        'os_bsd%': '<(os_bsd)',
         'use_openssl%': '<(use_openssl)',
         'use_ibus%': '<(use_ibus)',
         'enable_viewport%': '<(enable_viewport)',
@@ -128,7 +119,7 @@
           }],
 
           # Set toolkit_uses_gtk for the Chromium browser on Linux.
-          ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_aura==0', {
+          ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_aura==0', {
             'toolkit_uses_gtk%': 1,
           }, {
             'toolkit_uses_gtk%': 0,
@@ -153,7 +144,6 @@
       'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
-      'os_bsd%': '<(os_bsd)',
       'use_openssl%': '<(use_openssl)',
       'use_ibus%': '<(use_ibus)',
       'enable_viewport%': '<(enable_viewport)',
@@ -416,8 +406,15 @@
           'os_posix%': 1,
         }],
 
+        # A flag for BSD platforms
+        ['OS=="freebsd" or OS=="openbsd"', {
+          'os_bsd%': 1,
+        }, {
+          'os_bsd%': 0,
+        }],
+
         # NSS usage.
-        ['(OS=="linux" or OS=="solaris" or os_bsd==1) and use_openssl==0', {
+        ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and use_openssl==0', {
           'use_nss%': 1,
         }, {
           'use_nss%': 0,

media/webrtc/trunk/third_party/libyuv/libyuv.gyp

@@ -9,7 +9,6 @@
 {
   'variables': {
      'use_system_libjpeg%': 0,
-+     'yuv_disable_asm%': 0,
   },
   'targets': [
     {
@@ -50,13 +49,6 @@
           '.',
         ],
       },
-      'conditions': [
-        ['yuv_disable_asm==1', {
-          'defines': [
-            'YUV_DISABLE_ASM',
-          ],
-        }],
-      ],
       'conditions': [
         ['build_with_mozilla==1', {
           'include_dirs': [