Disable pointer authentication on arm 64. (nodejs/node#42888)

sunoru · Nov 15, 2022 · edb685c · edb685c
1 parent e13d405
commit edb685c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/L/libnode/build_tarballs.jl b/L/libnode/build_tarballs.jl
@@ -45,9 +45,10 @@ linux_script = raw"""
 cd node-*
 export CC_host=$HOSTCC
 export CXX_host=$HOSTCXX
+atomic_patch -p1 "${WORKSPACE}/srcdir/patches/configure.py.patch"
+atomic_patch -p1 "${WORKSPACE}/srcdir/patches/node.gypi.patch"
 atomic_patch -p1 "${WORKSPACE}/srcdir/patches/node_credentials.cc.patch"
 atomic_patch -p1 "${WORKSPACE}/srcdir/patches/test_crypto_clienthello.cc.patch"
-atomic_patch -p1 "${WORKSPACE}/srcdir/patches/node.gypi.patch"
 # Build & install libnode
 if [[ $target == $MACHTYPE ]]
 then

diff --git a/L/libnode/bundled/patches/configure.py.patch b/L/libnode/bundled/patches/configure.py.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.py b/configure.py
+index a4e5723067..60ec604454 100755
+--- a/configure.py
++++ b/configure.py
+@@ -1245,9 +1245,9 @@ 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']
++  # # Enable branch protection for arm64
++  # if target_arch == 'arm64':
++  #   o['cflags']+=['-msign-return-address=all']
+
+   if options.node_snapshot_main is not None:
+     if options.shared: