Attachment #776570 for bug #735832




      'deps/cjs-module-lexer/dist/lexer.js',
    ],
    'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
    'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
    'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
    'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
    'conditions': [
      ['GENERATOR == "ninja"', {
        'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'

          ],
          'actions': [
            {
              'action_name': 'run_pax_mkcodecache',
              'inputs': [
                '<(mkcodecache_exec)',
              ],
              'outputs': [
                '<(mkcodecache_u_exec)',
              ],
              'action': [
                'bash',
                '-c',
                'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
              ],
            },
            {
              'action_name': 'run_mkcodecache',
              'process_outputs_as_sources': 1,
              'inputs': [
                '<(mkcodecache_u_exec)',
              ],
              'outputs': [
                '<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',

          ],
          'actions': [
            {
              'action_name': 'run_pax_mksnapshot',
              'inputs': [
                '<(node_mksnapshot_exec)',
              ],
              'outputs': [
                '<(node_mksnapshot_u_exec)',
              ],
              'action': [
                'bash',
                '-c',
                'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
              ],
            },
            {
              'action_name': 'node_mksnapshot',
              'process_outputs_as_sources': 1,
              'inputs': [
                '<(node_mksnapshot_u_exec)',
              ],
              'outputs': [
                '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',




    'v8_vector_stores%': 0,
    'v8_embed_script%': "",
    'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
    'v8_os_page_size%': 0,
    'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
    'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',

      ],
    },  # bytecode_builtins_list_generator
    {
      'target_name': 'mksnapshot_u',
      'type': 'executable',
      'dependencies': [
        'v8_base_without_compiler',

          'toolsets': ['host'],
        }],
      ],
    },  # mksnapshot_u
    {
      'target_name': 'mksnapshot',
      'type': 'none',
      'dependencies': ['mksnapshot_u'],
      'actions': [
        {
          'action_name': 'paxmark_mksnapshot',
          'inputs': [
            '<(mksnapshot_u_exec)',
          ],
          'outputs': [
            '<(mksnapshot_exec)',
          ],
          'action': [
            'bash',
            '-c',
            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
          ],
        },
      ],
    },  # mksnapshot
    {
      'target_name': 'torque',

Return to bug 735832

Lines 53-59 Link Here

(-)node-v15.8.0-orig/node.gyp (-2 / +32 lines)
53	'deps/cjs-module-lexer/dist/lexer.js',	53	'deps/cjs-module-lexer/dist/lexer.js',
54	],	54	],
55	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',	55	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
		56	'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
56	'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',	57	'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
		58	'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
57	'conditions': [	59	'conditions': [
58	['GENERATOR == "ninja"', {	60	['GENERATOR == "ninja"', {
59	'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'	61	'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
Lines 291-300 Link Here
291	],	293	],
292	'actions': [	294	'actions': [
293	{	295	{
		296	'action_name': 'run_pax_mkcodecache',
		297	'inputs': [
		298	'<(mkcodecache_exec)',
		299	],
		300	'outputs': [
		301	'<(mkcodecache_u_exec)',
		302	],
		303	'action': [
		304	'bash',
		305	'-c',
		306	'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
		307	],
		308	},
		309	{
294	'action_name': 'run_mkcodecache',	310	'action_name': 'run_mkcodecache',
295	'process_outputs_as_sources': 1,	311	'process_outputs_as_sources': 1,
296	'inputs': [	312	'inputs': [
297	'<(mkcodecache_exec)',	313	'<(mkcodecache_u_exec)',
298	],	314	],
299	'outputs': [	315	'outputs': [
300	'<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',	316	'<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
Lines 316-325 Link Here
316	],	332	],
317	'actions': [	333	'actions': [
318	{	334	{
		335	'action_name': 'run_pax_mksnapshot',
		336	'inputs': [
		337	'<(node_mksnapshot_exec)',
		338	],
		339	'outputs': [
		340	'<(node_mksnapshot_u_exec)',
		341	],
		342	'action': [
		343	'bash',
		344	'-c',
		345	'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
		346	],
		347	},
		348	{
319	'action_name': 'node_mksnapshot',	349	'action_name': 'node_mksnapshot',
320	'process_outputs_as_sources': 1,	350	'process_outputs_as_sources': 1,
321	'inputs': [	351	'inputs': [
322	'<(node_mksnapshot_exec)',	352	'<(node_mksnapshot_u_exec)',
323	],	353	],
324	'outputs': [	354	'outputs': [
325	'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',	355	'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',

Lines 9-14 Link Here

(-)node-v15.8.0-orig/tools/v8_gypfiles/v8.gyp (-1 / +23 lines)
9	'v8_vector_stores%': 0,	9	'v8_vector_stores%': 0,
10	'v8_embed_script%': "",	10	'v8_embed_script%': "",
11	'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',	11	'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
		12	'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
12	'v8_os_page_size%': 0,	13	'v8_os_page_size%': 0,
13	'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',	14	'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root',
14	'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',	15	'generate_bytecode_builtins_list_output': '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h',
Lines 1430-1436 Link Here
1430	],	1431	],
1431	}, # bytecode_builtins_list_generator	1432	}, # bytecode_builtins_list_generator
1432	{	1433	{
1433	'target_name': 'mksnapshot',	1434	'target_name': 'mksnapshot_u',
1434	'type': 'executable',	1435	'type': 'executable',
1435	'dependencies': [	1436	'dependencies': [
1436	'v8_base_without_compiler',	1437	'v8_base_without_compiler',
Lines 1449-1454 Link Here
1449	'toolsets': ['host'],	1450	'toolsets': ['host'],
1450	}],	1451	}],
1451	],	1452	],
		1453	}, # mksnapshot_u
		1454	{
		1455	'target_name': 'mksnapshot',
		1456	'type': 'none',
		1457	'dependencies': ['mksnapshot_u'],
		1458	'actions': [
		1459	{
		1460	'action_name': 'paxmark_mksnapshot',
		1461	'inputs': [
		1462	'<(mksnapshot_u_exec)',
		1463	],
		1464	'outputs': [
		1465	'<(mksnapshot_exec)',
		1466	],
		1467	'action': [
		1468	'bash',
		1469	'-c',
		1470	'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
		1471	],
		1472	},
		1473	],
1452	}, # mksnapshot	1474	}, # mksnapshot
1453	{	1475	{
1454	'target_name': 'torque',	1476	'target_name': 'torque',