Move CPU features into its own static library.

src/trusted/platform_qualify/arch/x86/vcpuid.c

 /*
  * 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.
  */
 
 /*
  * vcpuid.c
  *
  * Verify correctness of CPUID implementation.
  *
  * This uses shell status code to indicate its result; non-zero return
  * code indicates the CPUID instruction is not implemented or not
  * implemented correctly.
  *
  * The asm_ tests use inline assembler, which is not supported on
  * 64-bit Windows. We use #if to prevent these routines from being
  * provided on 64-bit Windows.
  *
  * TODO(bradchen): test on a machine with SSE4.
  */
 #include "native_client/src/include/portability.h"
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <signal.h>
-#include "native_client/src/trusted/validator/x86/nacl_cpuid.h"
+#include "native_client/src/trusted/cpu_features/arch/x86/cpu_x86.h"
 #include "native_client/src/trusted/platform_qualify/nacl_cpuwhitelist.h"
 
 /* MAGIC_CONST is a 32 bit constant, somewhat arbitrarily choosen. */
 /* The value should be a valid (i.e. not denormal single-precision */
 /* float; otherwise unexpected FP exceptions are possible.         */
 const int kMagicConst = 0xc01df00d;
 const int kMagicConst_ROUNDSS = 0xc0000000;
 const int kMagicConst_POPCNT = 13;
 const int kMagicConst_CRC32  = 0xb906c3ea;
 
@@ skipping 513 matching lines @@
    * DoTest(asm_HasE3DNow, "E3DNow");
    * what about LZCNT?
    */
   if (rcode != 0) {
     PrintFail("CPUID not implemented correctly.");
     return 0;
   }
   printf("[CPUID implementation looks okay]\n");
   return 1;
 }