build: fix arm64 cross-compilation

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: #42888 Co-Authored-By: Michaël Zasso <[email protected]> PR-URL: #51256 Fixes: nodejs/build#3319 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Jan 2, 2024 · e03ac83 · e03ac83
1 parent 5b32e21
commit e03ac83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -471,6 +471,9 @@
     },
 
     'conditions': [
+      ['target_arch=="arm64"', {
+        'cflags': ['-mbranch-protection=standard'],  # Pointer authentication.
+      }],
       ['OS in "aix os400"', {
         'ldflags': [
           '-Wl,-bnoerrmsg',