Require SSE2 for all 32-bit Linux builds and remove disable_sse2 option.

third_party/qcms/qcms.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'qcms',
       'product_name': 'qcms',
       'type': 'static_library',
@@ skipping 12 matching lines @@
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           './src',
         ],
       },
       # Warning (sign-conversion) fixed upstream by large refactoring. Can be
       # removed on next roll.
       'msvs_disabled_warnings': [ 4018 ],
 
-      'variables': {
-        'conditions': [
-          # For x86, turn off SSE2 for non-CrOS *nix Chrome builds.
-          ['disable_sse2==1 or \
-            (branding=="Chrome" and target_arch=="ia32" and \
-             os_posix==1 and OS!="mac" and chromeos==0)', {
-            'qcms_use_sse': 0,
-          }, {
-            'qcms_use_sse': 1,
-          }],
-        ],
-      },
-
       'conditions': [
-        [ 'qcms_use_sse==1', {
+        ['target_arch=="ia32" or target_arch=="x64"', {
           'defines': [
             'SSE2_ENABLE',
           ],
           'sources': [
             'src/transform-sse1.c',
             'src/transform-sse2.c',
           ],
         }],
         # MSVC x64 doesn't support the MMX intrinsics present in the SSE1 code,

[jamesr, 2014/03/11 00:45:57]

when would we ever use sse1?  we use sse2 on all platforms with this patch (sse2
has been enabled on windows since the vs2013 switchover)

[scherkus (not reviewing), 2014/03/11 18:31:01]

ah right -- I forgot that bit about vs2013 and assumed we still might be hitting
sse1 machines on win32 OSes

I made this change yesterday in r256183 so I'm cool simplifying this to always
include SSE2

         # but that's OK since qcms prefers using SSE2 when available.
-        [ 'qcms_use_sse==1 and OS=="win" and target_arch=="x64"', {
+        [ 'OS=="win" and target_arch=="x64"', {
           'sources!': [
             'src/transform-sse1.c',
           ],
         }],
         ['OS == "win" and (MSVS_VERSION == "2013" or MSVS_VERSION == "2013e")', {
           'msvs_disabled_warnings': [
             4056,  # overflow in floating-point constant arithmetic (INFINITY)
             4756,  # overflow in constant arithmetic (INFINITY)
           ],
         }],
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: