Move CPU features into its own static library.

src/trusted/cpu_features/cpu_features.gyp

Index: src/trusted/cpu_features/cpu_features.gyp
diff --git a/src/trusted/validator_arm/validator_arm.gyp b/src/trusted/cpu_features/cpu_features.gyp
similarity index 50%
copy from src/trusted/validator_arm/validator_arm.gyp
copy to src/trusted/cpu_features/cpu_features.gyp
index 90ceda5c868b7cc5c04dfef425609013a918998a..194bcf1baa492824d3894110c096d1e994635d88 100644
--- a/src/trusted/validator_arm/validator_arm.gyp
+++ b/src/trusted/cpu_features/cpu_features.gyp
@@ -1,5 +1,4 @@
-# Copyright 2010, Google Inc.
-# Copyright 2009 The Native Client Authors.  All rights reserved.
+# Copyright 2013 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.
 
@@ -37,34 +36,51 @@
   'targets': [
     # ----------------------------------------------------------------------
     {
-      'target_name': 'arm_validator_core',
+      'target_name': 'cpu_features',
       'type': 'static_library',
-      'sources': [
-        'address_set.cc',
-        'actual_classes.cc',
-        'baseline_classes.cc',
-        'cpuid_arm.c',
-        'inst_classes.cc',
-        'model.cc',
-        'validator.cc',
-        'gen/arm32_decode.cc',
-        'gen/arm32_decode_actuals.cc'
+      # TODO(jfb) See TODO in build.scons on why x86 is built this way.
+      'conditions': [
+        ['target_arch=="ia32" or target_arch=="x64"', {
+          'sources': [
+            'arch/arm/cpu_arm.c',
+            'arch/mips/cpu_mips.c',
+            'arch/x86/cpu_x86.c',
+            'arch/x86/cpu_xgetbv.S',
+          ],
+        }],
+        ['target_arch=="arm" or target_arch=="mips"', {
+          'sources': [
+            'arch/arm/cpu_arm.c',
+            'arch/mips/cpu_mips.c',
+          ],
+        }],
       ],
-    },
-    # ----------------------------------------------------------------------
-    {
-      'target_name': 'ncvalidate_arm_v2',
-      'type': 'static_library',
-      'sources': [ 'ncvalidate.cc' ],
       'dependencies': [
-        'arm_validator_core'
+        '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
       ],
     },
-    # ----------------------------------------------------------------------
-    {
-      'target_name': 'arm_validator_reporters',
-      'type': 'static_library',
-      'sources': [ 'problem_reporter.cc' ],
+  ],
+  'conditions': [
+    ['OS=="win" and target_arch=="ia32"', {
+      'targets': [
+        {
+          'target_name': 'cpu_features64',
+          'type': 'static_library',
+          'variables': {
+            'win_target': 'x64',
+          },
+          'sources': [
+            'arch/arm/cpu_arm.c',
+            'arch/mips/cpu_mips.c',
+            'arch/x86/cpu_x86.c',
+            'arch/x86/cpu_xgetbv.S',
+          ],
+          'dependencies': [
+            '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform64',
+          ],
+        },
+      ],
     },
+   ],
   ],
 }