Index: src/trusted/validator_ragel/unreviewed/validator_test.c |
=================================================================== |
--- src/trusted/validator_ragel/unreviewed/validator_test.c (revision 9911) |
+++ src/trusted/validator_ragel/unreviewed/validator_test.c (working copy) |
@@ -14,7 +14,7 @@ |
#include "native_client/src/include/elf64.h" |
#include "native_client/src/shared/platform/nacl_check.h" |
#include "native_client/src/shared/utils/types.h" |
-#include "native_client/src/trusted/validator_ragel/unreviewed/validator_internal.h" |
+#include "native_client/src/trusted/validator_ragel/validator_internal.h" |
/* This is a copy of NaClLog from shared/platform/nacl_log.c to avoid |
* linking in code in NaCl shared code in the unreviewed/Makefile and be able to |
@@ -257,7 +257,7 @@ |
int main(int argc, char **argv) { |
int index, initial_index = 1, repeat_count = 1; |
- const NaClCPUFeaturesX86 *cpu_features = &full_cpuid_features; |
+ const NaClCPUFeaturesX86 *cpu_features = &kFullCPUIDFeatures; |
int raw_bitness = 0; |
enum validation_options options = 0; |
@@ -276,7 +276,7 @@ |
initial_index += 2; |
} |
else if (!strcmp(arg, "--compatible")) { |
- cpu_features = &validator_cpuid_features; |
+ cpu_features = &kValidatorCPUIDFeatures; |
initial_index++; |
} |
else if (!strcmp(arg, "--nobundles")) { |