Browse Source

build: try removing `Read/WriteBarrier` patch (#45393)

build: try removing Read/WriteBarrier patch
Shelley Vohr 2 months ago
parent
commit
784201ecee

+ 0 - 1
patches/node/.patches

@@ -9,7 +9,6 @@ chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
 fix_handle_boringssl_and_openssl_incompatibilities.patch
 fix_crypto_tests_to_run_with_bssl.patch
 fix_account_for_debugger_agent_race_condition.patch
-fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
 fix_serdes_test.patch
 feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
 support_v8_sandboxed_pointers.patch

+ 0 - 29
patches/node/fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shelley Vohr <[email protected]>
-Date: Wed, 18 Aug 2021 11:25:39 +0200
-Subject: fix: _ReadBarrier undefined symbol error on WOA arm64
-
-The _ReadBarrier compiler intrinsic isn't present on WOA arm64 devices
-and as such is crashing in CI. This fixes the issue by defining them
-if they're missing.
-
-We should upstream or otherwise handle this.
-
-diff --git a/deps/histogram/src/hdr_atomic.h b/deps/histogram/src/hdr_atomic.h
-index 11b0cbd3facfdce648d7cf59ef3418e4e1049090..e1dfeaed6f0dd38aed5a0ddd5660d5b4ba4f46ab 100644
---- a/deps/histogram/src/hdr_atomic.h
-+++ b/deps/histogram/src/hdr_atomic.h
-@@ -14,6 +14,13 @@
- #include <intrin.h>
- #include <stdbool.h>
- 
-+#if !defined(_ReadBarrier) || !defined(_WriteBarrier)
-+
-+#define _ReadBarrier() __asm__ __volatile__("" ::: "memory")
-+#define _WriteBarrier() __asm__ __volatile__("" ::: "memory")
-+
-+#endif
-+
- static void __inline * hdr_atomic_load_pointer(void** pointer)
- {
- 	_ReadBarrier();