From 39916bf4f320d536aece3f0f9fe215f8cf03cbc7 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 6 Dec 2022 11:27:49 +0100 Subject: [PATCH] build: fix arm64 cross-compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 938212f added -msign-return-address=all to _all_ cflags but that is wrong when cross-compiling, it should only be added to the target's cflags. The flag being deprecated, it is also changed to `-mbranch-protection=standard`. Fixes: https://github.com/nodejs/node/issues/42888 Co-Authored-By: Michaël Zasso --- configure.py | 2 -- node.gyp | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.py b/configure.py index 84b016cd853080..5e014bf7a75e2a 100755 --- a/configure.py +++ b/configure.py @@ -1273,9 +1273,7 @@ def configure_node(o): o['variables']['want_separate_host_toolset'] = int(cross_compiling) - # Enable branch protection for arm64 if target_arch == 'arm64': - o['cflags']+=['-msign-return-address=all'] o['variables']['arm_fpu'] = options.arm_fpu or 'neon' if options.node_snapshot_main is not None: diff --git a/node.gyp b/node.gyp index 811d15b0df9ad3..9d1324cfa70982 100644 --- a/node.gyp +++ b/node.gyp @@ -470,6 +470,9 @@ }, 'conditions': [ + ['target_arch=="arm64"', { + 'cflags': ['-mbranch-protection=standard'], # Pointer authentication. + }], ['OS in "aix os400"', { 'ldflags': [ '-Wl,-bnoerrmsg',