From baddb306d6bdafae1de8cdb2435bc57a0b881542 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Wed, 25 Dec 2024 21:14:26 -0600 Subject: [PATCH] pax marking Signed-off-by: Guillaume Ceccarelli --- node.gyp | 17 ++++++++++++++++- tools/v8_gypfiles/v8.gyp | 24 +++++++++++++++++++++++- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/node.gyp b/node.gyp index 195fe541bc..b806de81c9 100644 --- a/node.gyp +++ b/node.gyp @@ -435,6 +435,7 @@ 'test/cctest/test_inspector_socket_server.cc', ], 'node_mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot<(EXECUTABLE_SUFFIX)', + 'node_mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_mksnapshot_u<(EXECUTABLE_SUFFIX)', 'node_js2c_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)node_js2c<(EXECUTABLE_SUFFIX)', 'conditions': [ ['GENERATOR == "ninja"', { @@ -729,11 +730,25 @@ ], }, { '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_exec)', + '<(node_mksnapshot_u_exec)', ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp index 0914746541..e5fb7d3aae 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp @@ -9,6 +9,7 @@ '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', @@ -1693,7 +1694,7 @@ ], }, # bytecode_builtins_list_generator { - 'target_name': 'mksnapshot', + 'target_name': 'mksnapshot_u', 'type': 'executable', 'dependencies': [ 'v8_base_without_compiler', @@ -1719,6 +1720,27 @@ 'ldflags': [ '-fno-lto' ], }], ], + }, # 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', -- 2.45.2