Attachment #688272 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 280-286 Link Here

(-)node-v15.8.0-orig/node.gyp (-2 / +32 lines)
280	'deps/cjs-module-lexer/dist/lexer.js',	280	'deps/cjs-module-lexer/dist/lexer.js',
281	],	281	],
282	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',	282	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
		283	'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
283	'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',	284	'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
		285	'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
284	'conditions': [	286	'conditions': [
285	['GENERATOR == "ninja"', {	287	['GENERATOR == "ninja"', {
286	'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'	288	'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
Lines 505-514 Link Here
505	],	507	],
506	'actions': [	508	'actions': [
507	{	509	{
		510	'action_name': 'run_pax_mkcodecache',
		511	'inputs': [
		512	'<(mkcodecache_exec)',
		513	],
		514	'outputs': [
		515	'<(mkcodecache_u_exec)',
		516	],
		517	'action': [
		518	'bash',
		519	'-c',
		520	'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
		521	],
		522	},
		523	{
508	'action_name': 'run_mkcodecache',	524	'action_name': 'run_mkcodecache',
509	'process_outputs_as_sources': 1,	525	'process_outputs_as_sources': 1,
510	'inputs': [	526	'inputs': [
511	'<(mkcodecache_exec)',	527	'<(mkcodecache_u_exec)',
512	],	528	],
513	'outputs': [	529	'outputs': [
514	'<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',	530	'<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
Lines 530-539 Link Here
530	],	546	],
531	'actions': [	547	'actions': [
532	{	548	{
		549	'action_name': 'run_pax_mksnapshot',
		550	'inputs': [
		551	'<(node_mksnapshot_exec)',
		552	],
		553	'outputs': [
		554	'<(node_mksnapshot_u_exec)',
		555	],
		556	'action': [
		557	'bash',
		558	'-c',
		559	'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
		560	],
		561	},
		562	{
533	'action_name': 'node_mksnapshot',	563	'action_name': 'node_mksnapshot',
534	'process_outputs_as_sources': 1,	564	'process_outputs_as_sources': 1,
535	'inputs': [	565	'inputs': [
536	'<(node_mksnapshot_exec)',	566	'<(node_mksnapshot_u_exec)',
537	],	567	],
538	'outputs': [	568	'outputs': [
539	'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',	569	'<(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 1334-1340 Link Here
1334	],	1335	],
1335	}, # bytecode_builtins_list_generator	1336	}, # bytecode_builtins_list_generator
1336	{	1337	{
1337	'target_name': 'mksnapshot',	1338	'target_name': 'mksnapshot_u',
1338	'type': 'executable',	1339	'type': 'executable',
1339	'dependencies': [	1340	'dependencies': [
1340	'v8_base_without_compiler',	1341	'v8_base_without_compiler',
Lines 1353-1358 Link Here
1353	'toolsets': ['host'],	1354	'toolsets': ['host'],
1354	}],	1355	}],
1355	],	1356	],
		1357	}, # mksnapshot_u
		1358	{
		1359	'target_name': 'mksnapshot',
		1360	'type': 'none',
		1361	'dependencies': ['mksnapshot_u'],
		1362	'actions': [
		1363	{
		1364	'action_name': 'paxmark_mksnapshot',
		1365	'inputs': [
		1366	'<(mksnapshot_u_exec)',
		1367	],
		1368	'outputs': [
		1369	'<(mksnapshot_exec)',
		1370	],
		1371	'action': [
		1372	'bash',
		1373	'-c',
		1374	'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
		1375	],
		1376	},
		1377	],
1356	}, # mksnapshot	1378	}, # mksnapshot
1357	{	1379	{
1358	'target_name': 'torque',	1380	'target_name': 'torque',