Move CPU features into its own static library.

site_scons/site_tools/library_deps.py

 # 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.
 
 """Harness for defining library dependencies for scons files."""
 
 
 # The following is a map from a library, to the corresponding
 # list of dependent libraries that must be included after that library, in
 # the list of libraries.
@@ skipping 27 matching lines @@
         'sel',
         'debug_stub',
         ],
     'sel_main': [
         'sel',
         'debug_stub',
         ],
     'testrunner_browser': [
         'ppapi',
         ],
+    'arm_validator_core': [
+        'cpu_features',
+        ],
     }
 
 # Untrusted only library dependencies.
 # Include names here that otherwise clash with trusted names.
 UNTRUSTED_LIBRARY_DEPENDENCIES = {
     'ppapi_cpp': [
         'ppapi',
         ],
     }
 
@@ skipping 14 matching lines @@
         'ncdis_seg_sfi_verbose_x86_32': [
             'ncdis_seg_sfi_x86_32',
             'ncval_base_verbose_x86_32',
             ],
         'ncvalidate_verbose_x86_32': [
             'ncvalidate_x86_32',
             'ncdis_seg_sfi_verbose_x86_32',
             ],
         'ncvalidate_x86_32': [
             'ncval_seg_sfi_x86_32',
+            'cpu_features',
             ],
         'ncval_base_verbose_x86_32': [
             'ncval_base_x86_32',
             ],
         'ncval_base_x86_32': [
             'platform',
+            'cpu_features',
             ],
         'nc_opcode_modeling_verbose_x86_32': [
             'nc_opcode_modeling_x86_32',
             'ncval_base_verbose_x86_32',
             ],
         'nc_opcode_modeling_x86_32': [
             'ncval_base_x86_32',
             ],
         'ncval_reg_sfi_verbose_x86_32': [
             'ncval_reg_sfi_x86_32',
@@ skipping 32 matching lines @@
         'ncdis_seg_sfi_verbose_x86_64': [
             'ncdis_seg_sfi_x86_64',
             'ncval_base_verbose_x86_64',
             ],
         'ncvalidate_verbose_x86_64': [
             'ncvalidate_x86_64',
             'ncval_reg_sfi_verbose_x86_64',
             ],
         'ncvalidate_x86_64': [
             'ncval_reg_sfi_x86_64',
+            'cpu_features',
             ],
         'ncval_base_verbose_x86_64': [
             'ncval_base_x86_64',
             ],
         'ncval_base_x86_64': [
             'platform',
+            'cpu_features',
             ],
         'nc_opcode_modeling_verbose_x86_64': [
             'nc_opcode_modeling_x86_64',
             'ncval_base_verbose_x86_64',
             ],
         'nc_opcode_modeling_x86_64': [
             'ncval_base_x86_64',
             ],
         'ncval_reg_sfi_verbose_x86_64': [
             'ncval_reg_sfi_x86_64',
             'nc_opcode_modeling_verbose_x86_64',
             ],
         'ncval_reg_sfi_x86_64': [
             'nccopy_x86_64',
             'ncval_base_x86_64',
             'nc_decoder_x86_64',
+            'cpu_features',
             ],
         'ncval_seg_sfi_x86_64': [
             'nccopy_x86_64',
             'ncdis_seg_sfi_x86_64',
             'ncval_base_x86_64',
             ],
         'dfa_validate_caller_x86_64': [
             'ncval_base_x86_64',
             'nccopy_x86_64',
             ],
         },
     'arm': {
         'ncvalidate_arm_v2': [
             'arm_validator_core',
             ],
         'validators': [
             'ncvalidate_arm_v2',
             ],
         },
-    'arm-thumb2': {
-        'ncvalidate_arm_v2': [
-            'arm_validator_core',
-            ],
-        },
     'mips32': {
         'ncvalidate_mips': [
             'mips_validator_core',
+            'cpu_features',
             ],
         'validators': [
             'ncvalidate_mips',
             ],
         },
     }
 
 
 def AddLibDeps(env, platform, libraries):
   """ Adds dependent libraries to list of libraries.
@@ skipping 36 matching lines @@
     closure.append(library)
 
   # Ideally we would just do "VisitList(libraries)" here, but some
   # PPAPI tests (specifically, tests/ppapi_gles_book) list "ppapi_cpp"
   # twice in the link line, and we need to maintain these duplicates.
   for library in reversed(libraries):
     VisitLibrary(library)
 
   closure.reverse()
   return closure