Move CPU features into its own static library.

src/trusted/platform_qualify/arch/x86/nacl_cpuwhitelist.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.
  */
 
 /*
  * An implementation of CPU whitelisting for x86's CPUID identification scheme.
  */
 
 #include "native_client/src/include/portability.h"
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
 #include "native_client/src/include/nacl_macros.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"
 
 
 static int idcmp(const void *s1, const void *s2) {
   return strncmp((char *)s1, *(char **)s2, kCPUIDStringLength);
 }
 
 /* NOTE: The blacklist must be in alphabetical order. */
 static const char* const kNaclCpuBlacklist[] = {
 /*          1         2        */
@@ skipping 82 matching lines @@
 
 int NaCl_ThisCPUIsBlacklisted(void) {
   NaClCPUData data;
   const char* myid;
   NaClCPUDataGet(&data);
   myid = GetCPUIDString(&data);
   return IsCpuInList(myid,
                      kNaclCpuBlacklist,
                      NACL_ARRAY_SIZE(kNaclCpuBlacklist));
 }