Attachment #776573 for bug #735832




      'deps/undici/undici.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 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 1413-1419 Link Here
1413	],	1414	],
1414	}, # bytecode_builtins_list_generator	1415	}, # bytecode_builtins_list_generator
1415	{	1416	{
1416	'target_name': 'mksnapshot',	1417	'target_name': 'mksnapshot_u',
1417	'type': 'executable',	1418	'type': 'executable',
1418	'dependencies': [	1419	'dependencies': [
1419	'v8_base_without_compiler',	1420	'v8_base_without_compiler',
Lines 1432-1437 Link Here
1432	'toolsets': ['host'],	1433	'toolsets': ['host'],
1433	}],	1434	}],
1434	],	1435	],
		1436	}, # mksnapshot_u
		1437	{
		1438	'target_name': 'mksnapshot',
		1439	'type': 'none',
		1440	'dependencies': ['mksnapshot_u'],
		1441	'actions': [
		1442	{
		1443	'action_name': 'paxmark_mksnapshot',
		1444	'inputs': [
		1445	'<(mksnapshot_u_exec)',
		1446	],
		1447	'outputs': [
		1448	'<(mksnapshot_exec)',
		1449	],
		1450	'action': [
		1451	'bash',
		1452	'-c',
		1453	'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)'
		1454	],
		1455	},
		1456	],
1435	}, # mksnapshot	1457	}, # mksnapshot
1436	{	1458	{
1437	'target_name': 'torque',	1459	'target_name': 'torque',

Lines 55-61 Link Here

(-)node-v15.8.0-orig/node.gyp (-2 / +32 lines)
55	'deps/undici/undici.js',	55	'deps/undici/undici.js',
56	],	56	],
57	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',	57	'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)',
		58	'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)',
58	'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',	59	'mkcodecache_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache<(EXECUTABLE_SUFFIX)',
		60	'mkcodecache_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkcodecache_u<(EXECUTABLE_SUFFIX)',
59	'conditions': [	61	'conditions': [
60	['GENERATOR == "ninja"', {	62	['GENERATOR == "ninja"', {
61	'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'	63	'node_text_start_object_path': 'src/large_pages/node_text_start.node_text_start.o'
Lines 293-302 Link Here
293	],	295	],
294	'actions': [	296	'actions': [
295	{	297	{
		298	'action_name': 'run_pax_mkcodecache',
		299	'inputs': [
		300	'<(mkcodecache_exec)',
		301	],
		302	'outputs': [
		303	'<(mkcodecache_u_exec)',
		304	],
		305	'action': [
		306	'bash',
		307	'-c',
		308	'mv <(mkcodecache_exec) <(mkcodecache_u_exec) && paxmark.sh m <(mkcodecache_u_exec)',
		309	],
		310	},
		311	{
296	'action_name': 'run_mkcodecache',	312	'action_name': 'run_mkcodecache',
297	'process_outputs_as_sources': 1,	313	'process_outputs_as_sources': 1,
298	'inputs': [	314	'inputs': [
299	'<(mkcodecache_exec)',	315	'<(mkcodecache_u_exec)',
300	],	316	],
301	'outputs': [	317	'outputs': [
302	'<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',	318	'<(SHARED_INTERMEDIATE_DIR)/node_code_cache.cc',
Lines 340-349 Link Here
340	}, {	356	}, {
341	'actions': [	357	'actions': [
342	{	358	{
		359	'action_name': 'run_pax_mksnapshot',
		360	'inputs': [
		361	'<(node_mksnapshot_exec)',
		362	],
		363	'outputs': [
		364	'<(node_mksnapshot_u_exec)',
		365	],
		366	'action': [
		367	'bash',
		368	'-c',
		369	'mv <(node_mksnapshot_exec) <(node_mksnapshot_u_exec) && paxmark.sh m <(node_mksnapshot_u_exec)',
		370	],
		371	},
		372	{
343	'action_name': 'node_mksnapshot',	373	'action_name': 'node_mksnapshot',
344	'process_outputs_as_sources': 1,	374	'process_outputs_as_sources': 1,
345	'inputs': [	375	'inputs': [
346	'<(node_mksnapshot_exec)',	376	'<(node_mksnapshot_u_exec)',
347	],	377	],
348	'outputs': [	378	'outputs': [
349	'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',	379	'<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc',