stop building/testing old x86 validator.
We will remove the source code in the followup change.
https://codereview.chromium.org/625923004/
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3454
R=mseaborn@chromium.org
Review URL: https://codereview.chromium.org/636933004
git-svn-id: svn://svn.chromium.org/native_client/trunk/src/native_client/site_scons@13876 fcba33aa-ac0c-11dd-b9e7-8d5594d729c2
diff --git a/site_tools/library_deps.py b/site_tools/library_deps.py
index 6fe1df4..37c5de8 100644
--- a/site_tools/library_deps.py
+++ b/site_tools/library_deps.py
@@ -105,58 +105,6 @@
# of libraries.
PLATFORM_LIBRARY_DEPENDENCIES = {
'x86-32': {
- 'nc_decoder_x86_32': [
- 'ncval_base_x86_32',
- 'nc_opcode_modeling_x86_32',
- ],
- 'ncdis_util_x86_32': [
- 'ncval_reg_sfi_verbose_x86_32',
- 'ncdis_seg_sfi_verbose_x86_32',
- ],
- 'ncdis_seg_sfi_verbose_x86_32': [
- 'ncdis_seg_sfi_x86_32',
- 'ncval_base_verbose_x86_32',
- ],
- 'ncvalidate_verbose_x86_32': [
- 'ncvalidate_x86_32',
- 'ncdis_seg_sfi_verbose_x86_32',
- ],
- 'ncvalidate_x86_32': [
- 'ncval_seg_sfi_x86_32',
- 'cpu_features',
- ],
- 'ncval_base_verbose_x86_32': [
- 'ncval_base_x86_32',
- ],
- 'ncval_base_x86_32': [
- 'platform',
- 'cpu_features',
- 'validation_cache',
- ],
- 'nc_opcode_modeling_verbose_x86_32': [
- 'nc_opcode_modeling_x86_32',
- 'ncval_base_verbose_x86_32',
- ],
- 'nc_opcode_modeling_x86_32': [
- 'ncval_base_x86_32',
- ],
- 'ncval_reg_sfi_verbose_x86_32': [
- 'ncval_reg_sfi_x86_32',
- 'nc_opcode_modeling_verbose_x86_32',
- ],
- 'ncval_reg_sfi_x86_32': [
- 'nccopy_x86_32',
- 'ncval_base_x86_32',
- 'nc_decoder_x86_32',
- ],
- 'ncval_seg_sfi_x86_32': [
- 'nccopy_x86_32',
- 'ncdis_seg_sfi_x86_32',
- 'ncval_base_x86_32',
- # When turning on the DEBUGGING flag in the x86-32 validator
- # or decoder, add the following:
- #'nc_opcode_modeling_verbose_x86_32',
- ],
'dfa_validate_caller_x86_32': [
'cpu_features',
'validation_cache',
@@ -164,59 +112,6 @@
],
},
'x86-64': {
- 'nc_decoder_x86_64': [
- 'ncval_base_x86_64',
- 'nc_opcode_modeling_x86_64',
- # When turning on the DEBUGGING flag in the x86-64 validator
- # or decoder, add the following:
- #'nc_opcode_modeling_verbose_x86_64',
- ],
- 'ncdis_util_x86_64': [
- 'ncval_reg_sfi_verbose_x86_64',
- 'ncdis_seg_sfi_verbose_x86_64',
- ],
- 'ncdis_seg_sfi_verbose_x86_64': [
- 'ncdis_seg_sfi_x86_64',
- 'ncval_base_verbose_x86_64',
- ],
- 'ncvalidate_verbose_x86_64': [
- 'ncvalidate_x86_64',
- 'ncval_reg_sfi_verbose_x86_64',
- ],
- 'ncvalidate_x86_64': [
- 'ncval_reg_sfi_x86_64',
- 'cpu_features',
- ],
- 'ncval_base_verbose_x86_64': [
- 'ncval_base_x86_64',
- ],
- 'ncval_base_x86_64': [
- 'platform',
- 'cpu_features',
- 'validation_cache',
- ],
- 'nc_opcode_modeling_verbose_x86_64': [
- 'nc_opcode_modeling_x86_64',
- 'ncval_base_verbose_x86_64',
- ],
- 'nc_opcode_modeling_x86_64': [
- 'ncval_base_x86_64',
- ],
- 'ncval_reg_sfi_verbose_x86_64': [
- 'ncval_reg_sfi_x86_64',
- 'nc_opcode_modeling_verbose_x86_64',
- ],
- 'ncval_reg_sfi_x86_64': [
- 'nccopy_x86_64',
- 'ncval_base_x86_64',
- 'nc_decoder_x86_64',
- 'cpu_features',
- ],
- 'ncval_seg_sfi_x86_64': [
- 'nccopy_x86_64',
- 'ncdis_seg_sfi_x86_64',
- 'ncval_base_x86_64',
- ],
'dfa_validate_caller_x86_64': [
'cpu_features',
'validation_cache',
@@ -273,10 +168,7 @@
if env['NACL_BUILD_FAMILY'] != 'TRUSTED':
ret.extend(UNTRUSTED_LIBRARY_DEPENDENCIES.get(library, []))
if library == 'validators' and env.Bit('target_x86'):
- if env.Bit('validator_ragel'):
- ret.append(env.NaClTargetArchSuffix('dfa_validate_caller'))
- else:
- ret.append(env.NaClTargetArchSuffix('ncvalidate'))
+ ret.append(env.NaClTargetArchSuffix('dfa_validate_caller'))
return ret
def VisitLibrary(library):
