Move CPU features into its own static library.

src/trusted/service_runtime/arch/x86_32/sel_ldr_x86_32.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.
  */
 
 #include "native_client/src/include/portability_string.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_platform.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/service_runtime/sel_memory.h"
 #include "native_client/src/trusted/service_runtime/springboard.h"
 #include "native_client/src/trusted/service_runtime/arch/x86/sel_ldr_x86.h"
 #include "native_client/src/trusted/service_runtime/arch/x86_32/sel_rt_32.h"
 #include "native_client/src/trusted/service_runtime/arch/x86_32/tramp_32.h"
-#include "native_client/src/trusted/validator/x86/nacl_cpuid.h"
+#include "native_client/src/trusted/cpu_features/arch/x86/cpu_x86.h"
 
 struct NaClPcrelThunkGlobals {
   struct NaClThreadContext **user;
 };
 
 static struct NaClPcrelThunkGlobals nacl_pcrel_globals;
 
 /*
  * Create thunk for use by syscall trampoline code.
  */
@@ skipping 147 matching lines @@
 }
 
 void NaClLoadSpringboard(struct NaClApp  *nap) {
   LoadSpringboard(nap, &nap->syscall_return_springboard,
                   &NaCl_springboard, &NaCl_springboard_end, 1);
 
   LoadSpringboard(nap, &nap->all_regs_springboard,
                   &NaCl_springboard_all_regs,
                   &NaCl_springboard_all_regs_end, 2);
 }