Index: src/trusted/validator/validator_init.c |
diff --git a/src/trusted/validator/validator_init.c b/src/trusted/validator/validator_init.c |
index 5e2d22af5d08f3055cd798ecd91ae85f50baa858..6b937f9b1cf11783c8105241b7f7fc10ed75ce9d 100644 |
--- a/src/trusted/validator/validator_init.c |
+++ b/src/trusted/validator/validator_init.c |
@@ -7,11 +7,6 @@ |
#include "native_client/src/shared/platform/nacl_log.h" |
#include "native_client/src/trusted/validator/ncvalidate.h" |
-#if !defined(NACL_VALIDATOR_RAGEL) && NACL_ARCH(NACL_TARGET_ARCH) == NACL_x86 |
-static INLINE void EmitObsoleteValidatorWarning(void) { |
- NaClLog(LOG_WARNING, "USING OBSOLETE NON-DFA-BASED VALIDATOR!\n"); |
-} |
-#endif |
const struct NaClValidatorInterface *NaClCreateValidator(void) { |
#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm |
@@ -20,19 +15,9 @@ const struct NaClValidatorInterface *NaClCreateValidator(void) { |
return NaClValidatorCreateMips(); |
#elif NACL_ARCH(NACL_TARGET_ARCH) == NACL_x86 |
# if NACL_TARGET_SUBARCH == 64 |
-# if defined(NACL_VALIDATOR_RAGEL) |
return NaClDfaValidatorCreate_x86_64(); |
-# else |
- EmitObsoleteValidatorWarning(); |
- return NaClValidatorCreate_x86_64(); |
-# endif /* defined(NACL_VALIDATOR_RAGEL) */ |
# elif NACL_TARGET_SUBARCH == 32 |
-# if defined(NACL_VALIDATOR_RAGEL) |
return NaClDfaValidatorCreate_x86_32(); |
-# else |
- EmitObsoleteValidatorWarning(); |
- return NaClValidatorCreate_x86_32(); |
-# endif /* defined(NACL_VALIDATOR_RAGEL) */ |
# else |
# error "Invalid sub-architecture!" |
# endif |