Move CPU features into its own static library.

src/trusted/platform_qualify/platform_qualify.gyp

-# -*- python -*-
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
   },
   'includes': [
     '../../../build/common.gypi',
   ],
@@ skipping 59 matching lines @@
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'platform_qual_lib',
       'type': 'static_library',
       'variables': {
         'target_base': 'pqlib',
       },
-      # For nacl_cpuid used by nacl_cpuwhitelist.
-      'conditions': [
-        ['target_arch=="ia32"', {
-          'dependencies': [
-          '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:ncval_base_x86_32',
-          ],
-        }],
-        ['target_arch=="x64"', {
-          'dependencies': [
-          '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:ncval_base_x86_64',
-          ],
-        }],
+      'dependencies': [
+        '<(DEPTH)/native_client/src/trusted/cpu_features/cpu_features.gyp:cpu_features',
       ],
     },
   ],
   'conditions': [
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'platform_qual_lib64',
           'type': 'static_library',
           'variables': {
             'target_base': 'pqlib',
             'win_target': 'x64',
           },
           'dependencies': [
-            # For nacl_cpuid used by nacl_cpuwhitelist.
-            '<(DEPTH)/native_client/src/trusted/validator/x86/validate_x86.gyp:ncval_base_x86_64',
+            '<(DEPTH)/native_client/src/trusted/cpu_features/cpu_features.gyp:cpu_features64',
           ],
         },
       ],
     }],
   ],
 }
 
 # TODO:
 # # Currently, this is only defined for x86, so only compile if x86.
 # if env['TARGET_ARCHITECTURE'] != 'x86':
 #   Return()
 #vcpuid_env = env.Clone()
 #if env.Bit('mac'):
 #  vcpuid_env.Append(CCFLAGS = ['-mdynamic-no-pic'])
 #if env.Bit('linux'):
 #  vcpuid_env.Append(CCFLAGS = ['-msse3'])
 #nacl_vcpuid = vcpuid_env.ComponentLibrary('vcpuid', 'vcpuid.c')
 #env.Append(LIBS = ['vcpuid', 'platform_qual_lib', 'ncvalidate'])
 #
 #env.ComponentProgram('platform_qual_test', 'platform_qual_test.c')
 #env.ComponentProgram('nacl_cpuwhitelist_test', 'nacl_cpuwhitelist_test.c')
 #