diff --git a/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
index 35b0ea9667238..0f96d00f493f5 100644
--- a/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -32,7 +32,6 @@
 #include "prims/jvm_misc.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/safepoint.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 
 #define __ masm->
 
@@ -74,8 +73,7 @@ template<> struct BasicTypeToJni<T_DOUBLE>  { static const jdouble  jni_type; };
 
 template<int BType, typename JniType = decltype(BasicTypeToJni<BType>::jni_type)>
 JniType static_fast_get_field_wrapper(JNIEnv *env, jobject obj, jfieldID fieldID) {
-  JavaThread* thread = JavaThread::thread_from_jni_environment(env);
-  ThreadWXEnable wx(WXExec, thread);
+  os::ThreadWX::Enable wx(os::ThreadWX::Exec);
   address get_field_addr = generated_fast_get_field[BType - T_BOOLEAN];
   return ((JniType(*)(JNIEnv *env, jobject obj, jfieldID fieldID))get_field_addr)(env, obj, fieldID);
 }
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
index d9a54bf695d4e..d6171cb8b2bdf 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -205,7 +205,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,
                                              ucontext_t* uc, JavaThread* thread) {
   // Enable WXWrite: this function is called by the signal handler at arbitrary
   // point of execution.
-  ThreadWXEnable wx(WXWrite, thread);
+  os::ThreadWX::Enable wx(os::ThreadWX::Write);
 
   // decide if this trap can be handled by a stub
   address stub = NULL;
@@ -534,14 +534,30 @@ void os::verify_stack_alignment() {
 }
 #endif
 
+#ifdef __APPLE__
+
+static THREAD_LOCAL os::ThreadWX::WXMode _wx_state = os::ThreadWX::Write;
+
 int os::extra_bang_size_in_bytes() {
   // AArch64 does not require the additional stack bang.
   return 0;
 }
 
-void os::current_thread_enable_wx(WXMode mode) {
-  pthread_jit_write_protect_np(mode == WXExec);
+os::ThreadWX::WXMode os::ThreadWX::change(WXMode new_state) {
+  WXMode old = _wx_state;
+  _wx_state = new_state;
+  pthread_jit_write_protect_np(_wx_state == os::ThreadWX::Exec);
+  return old;
+}
+
+void os::ThreadWX::init() {
+  change(os::ThreadWX::Write);
+}
+
+void os::ThreadWX::assert_wx(WXMode expected) {
+  assert(_wx_state == expected, "wrong state");
 }
+#endif
 
 extern "C" {
   int SpinPause() {
diff --git a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.hpp b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.hpp
index 14638bc68d65a..8d5d1826488e5 100644
--- a/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.hpp
+++ b/src/hotspot/os_cpu/bsd_aarch64/os_bsd_aarch64.hpp
@@ -40,4 +40,37 @@
     *(jlong *) dst = *(const jlong *) src;
   }
 
+  #ifdef __APPLE__
+
+  class ThreadWX {
+  public:
+
+    enum WXMode {
+      Write,
+      Exec
+    };
+
+    // Enables write or execute access to writeable and executable pages.
+    // returns the previous state
+    static WXMode change(WXMode new_state);
+
+    // initializes the WXMode to WXWrite, as writeable pages are the default here
+    static void init();
+
+    static void assert_wx(WXMode expected);
+
+    // RAII object to set a specific WXMode and reset it to the previous mode
+    // on destruction
+    class Enable  {
+      WXMode _old_mode;
+    public:
+      Enable(WXMode new_mode) :
+        _old_mode(change(new_mode))
+      { }
+      ~Enable() {
+        change(_old_mode);
+      }
+    };
+  };
+  #endif // __APPLE__
 #endif // OS_CPU_BSD_AARCH64_OS_BSD_AARCH64_HPP
diff --git a/src/hotspot/share/c1/c1_Runtime1.cpp b/src/hotspot/share/c1/c1_Runtime1.cpp
index 03cb4a961f40f..bced8f9ec747d 100644
--- a/src/hotspot/share/c1/c1_Runtime1.cpp
+++ b/src/hotspot/share/c1/c1_Runtime1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1267,7 +1267,7 @@ void Runtime1::patch_code(JavaThread* current, Runtime1::StubID stub_id) {
 
   // Enable WXWrite: the function is called by c1 stub as a runtime function
   // (see another implementation above).
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   if (TracePatching) {
     tty->print_cr("Deoptimizing because patch is needed");
diff --git a/src/hotspot/share/code/nmethod.cpp b/src/hotspot/share/code/nmethod.cpp
index 543892bc434aa..2c4fdec199ca0 100644
--- a/src/hotspot/share/code/nmethod.cpp
+++ b/src/hotspot/share/code/nmethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -67,7 +67,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/sweeper.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/align.hpp"
 #include "utilities/copy.hpp"
@@ -2881,7 +2880,7 @@ void nmethod::decode2(outputStream* ost) const {
 #endif
 
   // Decoding an nmethod can write to a PcDescCache (see PcDescCache::add_pc_desc)
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current());)
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write);)
 
   st->cr();
   this->print(st);
diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
index efe2ff7b9e309..9f4ff3144b1d6 100644
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.cpp
@@ -30,7 +30,7 @@
 #include "logging/log.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/thread.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
+#include "runtime/os.hpp"
 #include "utilities/debug.hpp"
 
 int BarrierSetNMethod::disarmed_value() const {
@@ -52,7 +52,7 @@ bool BarrierSetNMethod::supports_entry_barrier(nmethod* nm) {
 int BarrierSetNMethod::nmethod_stub_entry_barrier(address* return_address_ptr) {
   // Enable WXWrite: the function is called directly from nmethod_entry_barrier
   // stub.
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current()));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   address return_address = *return_address_ptr;
   AARCH64_PORT_ONLY(return_address = pauth_strip_pointer(return_address));
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp
index ebc288efda973..d7c2b1c86af37 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2019, 2022, Red Hat, Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
+#include "runtime/os.hpp"
 
 bool ShenandoahBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
   ShenandoahReentrantLock* lock = ShenandoahNMethod::lock_for_nmethod(nm);
@@ -46,7 +46,7 @@ bool ShenandoahBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
     return true;
   }
 
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current());)
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write);)
 
   if (nm->is_unloading()) {
     // We don't need to take the lock when unlinking nmethods from
diff --git a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
index 9916178cc2c54..591d533b5839b 100644
--- a/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
+++ b/src/hotspot/share/gc/z/zBarrierSetNMethod.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 #include "gc/z/zNMethod.hpp"
 #include "gc/z/zThreadLocalData.hpp"
 #include "logging/log.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
+#include "runtime/os.hpp"
 
 bool ZBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
   ZLocker<ZReentrantLock> locker(ZNMethod::lock_for_nmethod(nm));
@@ -41,7 +41,7 @@ bool ZBarrierSetNMethod::nmethod_entry_barrier(nmethod* nm) {
     return true;
   }
 
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current()));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   if (nm->is_unloading()) {
     // We don't need to take the lock when unlinking nmethods from
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index 5e61410ddc204..a3d015031a886 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -983,7 +983,7 @@ JRT_END
 
 nmethod* InterpreterRuntime::frequency_counter_overflow(JavaThread* current, address branch_bcp) {
   // Enable WXWrite: the function is called directly by interpreter.
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   // frequency_counter_overflow_inner can throw async exception.
   nmethod* nm = frequency_counter_overflow_inner(current, branch_bcp);
diff --git a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
index 6f7269193f653..c4dd0fedeeffd 100644
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.cpp
@@ -108,7 +108,7 @@ Handle JavaArgumentUnboxer::next_arg(BasicType expectedType) {
 
 // Bring the JVMCI compiler thread into the VM state.
 #define JVMCI_VM_ENTRY_MARK                                       \
-  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));       \
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));               \
   ThreadInVMfromNative __tiv(thread);                             \
   HandleMarkCleaner __hm(thread);                                 \
   JavaThread* THREAD = thread;                                        \
diff --git a/src/hotspot/share/opto/runtime.cpp b/src/hotspot/share/opto/runtime.cpp
index c20b55a1b3391..155c4230f9ab6 100644
--- a/src/hotspot/share/opto/runtime.cpp
+++ b/src/hotspot/share/opto/runtime.cpp
@@ -68,11 +68,11 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaCalls.hpp"
+#include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/stackWatermarkSet.hpp"
 #include "runtime/threadCritical.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vframeArray.hpp"
 #include "runtime/vframe_hp.hpp"
@@ -1463,7 +1463,7 @@ address OptoRuntime::handle_exception_C(JavaThread* current) {
 address OptoRuntime::rethrow_C(oopDesc* exception, JavaThread* thread, address ret_pc) {
 
   // Enable WXWrite: the function called directly by compiled code.
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   // ret_pc will have been loaded from the stack, so for AArch64 will be signed.
   // This needs authenticating, but to do that here requires the fp of the previous frame.
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 13a2ff9dc8718..f156261e2d9dd 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -3656,7 +3656,7 @@ static jint JNI_CreateJavaVM_inner(JavaVM **vm, void **penv, void *args) {
 
     // Since this is not a JVM_ENTRY we have to set the thread state manually before leaving.
     ThreadStateTransition::transition_from_vm(thread, _thread_in_native);
-    MACOS_AARCH64_ONLY(thread->enable_wx(WXExec));
+    MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Exec));
   } else {
     // If create_vm exits because of a pending exception, exit with that
     // exception.  In the future when we figure out how to reclaim memory,
@@ -3749,7 +3749,7 @@ static jint JNICALL jni_DestroyJavaVM_inner(JavaVM *vm) {
   JavaThread* thread = JavaThread::current();
 
   // We are going to VM, change W^X state to the expected one.
-  MACOS_AARCH64_ONLY(WXMode oldmode = thread->enable_wx(WXWrite));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Write));
 
   ThreadStateTransition::transition_from_native(thread, _thread_in_vm);
   Threads::destroy_vm();
@@ -3806,7 +3806,7 @@ static jint attach_current_thread(JavaVM *vm, void **penv, void *_args, bool dae
   thread->record_stack_base_and_size();
   thread->register_thread_stack_with_NMT();
   thread->initialize_thread_current();
-  MACOS_AARCH64_ONLY(thread->init_wx());
+  MACOS_AARCH64_ONLY(os::ThreadWX::init());
 
   if (!os::create_attached_thread(thread)) {
     thread->smr_delete();
@@ -3877,7 +3877,7 @@ static jint attach_current_thread(JavaVM *vm, void **penv, void *_args, bool dae
   // Now leaving the VM, so change thread_state. This is normally automatically taken care
   // of in the JVM_ENTRY. But in this situation we have to do it manually.
   ThreadStateTransition::transition_from_vm(thread, _thread_in_native);
-  MACOS_AARCH64_ONLY(thread->enable_wx(WXExec));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Exec));
 
   // Perform any platform dependent FPU setup
   os::setup_fpu();
@@ -3930,7 +3930,7 @@ jint JNICALL jni_DetachCurrentThread(JavaVM *vm)  {
   }
 
   // We are going to VM, change W^X state to the expected one.
-  MACOS_AARCH64_ONLY(thread->enable_wx(WXWrite));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Write));
 
   // Safepoint support. Have to do call-back to safepoint code, if in the
   // middle of a safepoint operation
@@ -3949,8 +3949,7 @@ jint JNICALL jni_DetachCurrentThread(JavaVM *vm)  {
   thread->smr_delete();
 
   // Go to the execute mode, the initial state of the thread on creation.
-  // Use os interface as the thread is not a JavaThread anymore.
-  MACOS_AARCH64_ONLY(os::current_thread_enable_wx(WXExec));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Exec));
 
   HOTSPOT_JNI_DETACHCURRENTTHREAD_RETURN(JNI_OK);
   return JNI_OK;
diff --git a/src/hotspot/share/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp
index 529e7cc4fe890..104804807573c 100644
--- a/src/hotspot/share/prims/jniCheck.cpp
+++ b/src/hotspot/share/prims/jniCheck.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -104,7 +104,7 @@ extern "C" {                                                             \
     if (env != xenv) {                                                   \
       NativeReportJNIFatalError(thr, warn_wrong_jnienv);                 \
     }                                                                    \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thr));         \
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));                    \
     VM_ENTRY_BASE(result_type, header, thr)
 
 
diff --git a/src/hotspot/share/prims/jvmtiEnter.xsl b/src/hotspot/share/prims/jvmtiEnter.xsl
index 932c7a82fe04f..de8d1aebbc886 100644
--- a/src/hotspot/share/prims/jvmtiEnter.xsl
+++ b/src/hotspot/share/prims/jvmtiEnter.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2002, 2022, Oracle and/or its affiliates. All rights reserved.
  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
  This code is free software; you can redistribute it and/or modify it
@@ -435,7 +435,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text>
   <xsl:if test="count(@impl)=0 or not(contains(@impl,'innative'))">
     <xsl:text>JavaThread* current_thread = JavaThread::cast(this_thread);</xsl:text>
     <xsl:value-of select="$space"/>
-    <xsl:text>MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current_thread));</xsl:text>
+    <xsl:text>MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));</xsl:text>
     <xsl:value-of select="$space"/>
     <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
     <xsl:value-of select="$space"/>
diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
index 84cd940a56302..8102b4ee2c6eb 100644
--- a/src/hotspot/share/prims/jvmtiEnv.cpp
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -176,7 +176,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread thread, void** data_ptr) {
     // other than the current thread is required we need to transition
     // from native so as to resolve the jthread.
 
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current_thread));
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));
     ThreadInVMfromNative __tiv(current_thread);
     VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
     debug_only(VMNativeEntryWrapper __vew;)
@@ -3137,7 +3137,7 @@ JvmtiEnv::RawMonitorEnter(JvmtiRawMonitor * rmonitor) {
   } else {
     Thread* thread = Thread::current();
     // 8266889: raw_enter changes Java thread state, needs WXWrite
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));
     rmonitor->raw_enter(thread);
   }
   return JVMTI_ERROR_NONE;
@@ -3171,7 +3171,7 @@ jvmtiError
 JvmtiEnv::RawMonitorWait(JvmtiRawMonitor * rmonitor, jlong millis) {
   Thread* thread = Thread::current();
   // 8266889: raw_wait changes Java thread state, needs WXWrite
-  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));
   int r = rmonitor->raw_wait(millis, thread);
 
   switch (r) {
diff --git a/src/hotspot/share/prims/universalNativeInvoker.cpp b/src/hotspot/share/prims/universalNativeInvoker.cpp
index 8c91b4710957f..6cdf0d950545f 100644
--- a/src/hotspot/share/prims/universalNativeInvoker.cpp
+++ b/src/hotspot/share/prims/universalNativeInvoker.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,10 +32,10 @@ ProgrammableInvoker::Generator::Generator(CodeBuffer* code, const ABIDescriptor*
 
 void ProgrammableInvoker::invoke_native(Stub stub, address buff, JavaThread* thread) {
   ThreadToNativeFromVM ttnfvm(thread);
-  // We need WXExec because we are about to call a generated stub. Like in VM
-  // entries, the thread state should be changed while we are still in WXWrite.
+  // We need os::ThreadWX::Exec because we are about to call a generated stub. Like in VM
+  // entries, the thread state should be changed while we are still in os::ThreadWX::Write.
   // See JDK-8265292.
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, thread));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Exec));
   stub(buff);
 }
 
diff --git a/src/hotspot/share/prims/universalUpcallHandler.cpp b/src/hotspot/share/prims/universalUpcallHandler.cpp
index 6257036ef9fcc..74a61b538b509 100644
--- a/src/hotspot/share/prims/universalUpcallHandler.cpp
+++ b/src/hotspot/share/prims/universalUpcallHandler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,7 +103,7 @@ JavaThread* ProgrammableUpcallHandler::on_entry(OptimizedEntryBlob::FrameData* c
   debug_only(thread->inc_java_call_counter());
   thread->set_active_handles(context->new_handles);     // install new handle block and reset Java frame linkage
 
-  MACOS_AARCH64_ONLY(thread->enable_wx(WXExec));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Exec));
 
   return thread;
 }
@@ -113,7 +113,7 @@ void ProgrammableUpcallHandler::on_exit(OptimizedEntryBlob::FrameData* context)
   JavaThread* thread = context->thread;
   assert(thread == JavaThread::current(), "must still be the same thread");
 
-  MACOS_AARCH64_ONLY(thread->enable_wx(WXWrite));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Write));
 
   // restore previous handle block
   thread->set_active_handles(context->old_handles);
@@ -143,7 +143,7 @@ void ProgrammableUpcallHandler::attach_thread_and_do_upcall(jobject rec, address
   JavaThread* thread = maybe_attach_and_get_thread(&should_detach);
 
   {
-    MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread));
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
     upcall_helper(thread, rec, buff);
   }
 
diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
index dd0dca74c858d..a30faece904e1 100644
--- a/src/hotspot/share/prims/unsafe.cpp
+++ b/src/hotspot/share/prims/unsafe.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -382,7 +382,7 @@ UNSAFE_ENTRY(void, Unsafe_CopyMemory0(JNIEnv *env, jobject unsafe, jobject srcOb
   {
     GuardUnsafeAccess guard(thread);
     if (StubRoutines::unsafe_arraycopy() != NULL) {
-      MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, thread));
+      MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Exec));
       StubRoutines::UnsafeArrayCopy_stub()(src, dst, sz);
     } else {
       Copy::conjoint_memory_atomic(src, dst, sz);
@@ -434,14 +434,14 @@ UNSAFE_LEAF (void, Unsafe_WriteBack0(JNIEnv *env, jobject unsafe, jlong line)) {
   }
 #endif
 
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Exec));
   assert(StubRoutines::data_cache_writeback() != NULL, "sanity");
   (StubRoutines::DataCacheWriteback_stub())(addr_from_java(line));
 } UNSAFE_END
 
 static void doWriteBackSync0(bool is_pre)
 {
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Exec));
   assert(StubRoutines::data_cache_writeback_sync() != NULL, "sanity");
   (StubRoutines::DataCacheWritebackSync_stub())(is_pre);
 }
diff --git a/src/hotspot/share/prims/whitebox.inline.hpp b/src/hotspot/share/prims/whitebox.inline.hpp
index f46b36b84eee0..111e0ac80bfa9 100644
--- a/src/hotspot/share/prims/whitebox.inline.hpp
+++ b/src/hotspot/share/prims/whitebox.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 
 #define WB_ENTRY(result_type, header) JNI_ENTRY(result_type, header) \
   ClearPendingJniExcCheck _clearCheck(env); \
-  MACOS_AARCH64_ONLY(ThreadWXEnable _wx(WXWrite, thread));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable _wx(os::ThreadWX::Write));
 
 #define WB_END JNI_END
 
diff --git a/src/hotspot/share/runtime/deoptimization.cpp b/src/hotspot/share/runtime/deoptimization.cpp
index fee21540809ae..b04a06e617981 100644
--- a/src/hotspot/share/runtime/deoptimization.cpp
+++ b/src/hotspot/share/runtime/deoptimization.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,7 @@
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/keepStackGCProcessed.hpp"
 #include "runtime/objectMonitor.inline.hpp"
+#include "runtime/os.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -75,7 +76,6 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threadSMR.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vframeArray.hpp"
 #include "runtime/vframe_hp.hpp"
@@ -2368,7 +2368,7 @@ Deoptimization::update_method_data_from_interpreter(MethodData* trap_mdo, int tr
 
 Deoptimization::UnrollBlock* Deoptimization::uncommon_trap(JavaThread* current, jint trap_request, jint exec_mode) {
   // Enable WXWrite: current function is called from methods compiled by C2 directly
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   // Still in Java no safepoints
   {
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index 7cbdb00995cc0..1be428d9d195d 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -36,7 +36,6 @@
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/thread.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/vmOperations.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -255,8 +254,7 @@ class VMNativeEntryWrapper {
 
 #define VM_LEAF_BASE(result_type, header)                            \
   debug_only(NoHandleMark __hm;)                                     \
-  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite,                    \
-                                         JavaThread::current()));    \
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));          \
   os::verify_stack_alignment();                                      \
   /* begin of body */
 
@@ -280,7 +278,7 @@ class VMNativeEntryWrapper {
 #define JRT_ENTRY(result_type, header)                               \
   result_type header {                                               \
     assert(current == JavaThread::current(), "Must be");             \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));        \
     ThreadInVMfromJava __tiv(current);                               \
     VM_ENTRY_BASE(result_type, header, current)                      \
     debug_only(VMEntryWrapper __vew;)
@@ -308,7 +306,7 @@ class VMNativeEntryWrapper {
 #define JRT_ENTRY_NO_ASYNC(result_type, header)                      \
   result_type header {                                               \
     assert(current == JavaThread::current(), "Must be");             \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));        \
     ThreadInVMfromJava __tiv(current, false /* check asyncs */);     \
     VM_ENTRY_BASE(result_type, header, current)                      \
     debug_only(VMEntryWrapper __vew;)
@@ -318,7 +316,7 @@ class VMNativeEntryWrapper {
 #define JRT_BLOCK_ENTRY(result_type, header)                         \
   result_type header {                                               \
     assert(current == JavaThread::current(), "Must be");             \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, current));       \
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));        \
     HandleMarkCleaner __hm(current);
 
 #define JRT_BLOCK                                                    \
@@ -355,7 +353,7 @@ extern "C" {                                                         \
   result_type JNICALL header {                                       \
     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
     assert(thread == Thread::current(), "JNIEnv is only valid in same thread"); \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));        \
     ThreadInVMfromNative __tiv(thread);                              \
     debug_only(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
@@ -380,7 +378,7 @@ extern "C" {                                                         \
 extern "C" {                                                         \
   result_type JNICALL header {                                       \
     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write));        \
     ThreadInVMfromNative __tiv(thread);                              \
     debug_only(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
@@ -390,7 +388,7 @@ extern "C" {                                                         \
 extern "C" {                                                         \
   result_type JNICALL header {                                       \
     JavaThread* thread = JavaThread::current();                      \
-    MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite, thread));        \
+    MACOS_AARCH64_ONLY(os::ThreadWX::Enable __wx(os::ThreadWX::Write);)        \
     ThreadInVMfromNative __tiv(thread);                              \
     debug_only(VMNativeEntryWrapper __vew;)                          \
     VM_ENTRY_BASE(result_type, header, thread)
diff --git a/src/hotspot/share/runtime/javaCalls.cpp b/src/hotspot/share/runtime/javaCalls.cpp
index 978fd20e0dd8f..ae706e76f00ee 100644
--- a/src/hotspot/share/runtime/javaCalls.cpp
+++ b/src/hotspot/share/runtime/javaCalls.cpp
@@ -96,14 +96,14 @@ JavaCallWrapper::JavaCallWrapper(const methodHandle& callee_method, Handle recei
 
   assert (_thread->thread_state() != _thread_in_native, "cannot set native pc to NULL");
 
-  MACOS_AARCH64_ONLY(_thread->enable_wx(WXExec));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Exec));
 }
 
 
 JavaCallWrapper::~JavaCallWrapper() {
   assert(_thread == JavaThread::current(), "must still be the same thread");
 
-  MACOS_AARCH64_ONLY(_thread->enable_wx(WXWrite));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Write));
 
   // restore previous handle block & Java frame linkage
   JNIHandleBlock *_old_handles = _thread->active_handles();
diff --git a/src/hotspot/share/runtime/os.hpp b/src/hotspot/share/runtime/os.hpp
index 1ad15f0d8eaa7..92f641c3199c7 100644
--- a/src/hotspot/share/runtime/os.hpp
+++ b/src/hotspot/share/runtime/os.hpp
@@ -77,10 +77,6 @@ enum ThreadPriority {        // JLS 20.20.1-3
   CriticalPriority = 11      // Critical thread priority
 };
 
-enum WXMode {
-  WXWrite,
-  WXExec
-};
 
 // Executable parameter flag for os::commit_memory() and
 // os::commit_memory_or_exit().
@@ -933,11 +929,6 @@ class os: AllStatic {
     bool _done;
   };
 
-#if defined(__APPLE__) && defined(AARCH64)
-  // Enables write or execute access to writeable and executable pages.
-  static void current_thread_enable_wx(WXMode mode);
-#endif // __APPLE__ && AARCH64
-
 #ifndef _WINDOWS
   // Suspend/resume support
   // Protocol:
diff --git a/src/hotspot/share/runtime/safefetch.inline.hpp b/src/hotspot/share/runtime/safefetch.inline.hpp
index 79c833e4db6b0..117614f3f2847 100644
--- a/src/hotspot/share/runtime/safefetch.inline.hpp
+++ b/src/hotspot/share/runtime/safefetch.inline.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,28 +27,20 @@
 
 // No safefetch.hpp
 
+#include "runtime/os.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 
 // Safefetch allows to load a value from a location that's not known
 // to be valid. If the load causes a fault, the error value is returned.
 inline int SafeFetch32(int* adr, int errValue) {
   assert(StubRoutines::SafeFetch32_stub(), "stub not yet generated");
-#if defined(__APPLE__) && defined(AARCH64)
-  Thread* thread = Thread::current_or_null_safe();
-  assert(thread != NULL, "required for W^X management");
-  ThreadWXEnable wx(WXExec, thread);
-#endif // __APPLE__ && AARCH64
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Exec);)
   return StubRoutines::SafeFetch32_stub()(adr, errValue);
 }
 
 inline intptr_t SafeFetchN(intptr_t* adr, intptr_t errValue) {
   assert(StubRoutines::SafeFetchN_stub(), "stub not yet generated");
-#if defined(__APPLE__) && defined(AARCH64)
-  Thread* thread = Thread::current_or_null_safe();
-  assert(thread != NULL, "required for W^X management");
-  ThreadWXEnable wx(WXExec, thread);
-#endif // __APPLE__ && AARCH64
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Exec);)
   return StubRoutines::SafeFetchN_stub()(adr, errValue);
 }
 
diff --git a/src/hotspot/share/runtime/safepoint.cpp b/src/hotspot/share/runtime/safepoint.cpp
index 44240f85b71cc..b10a719190e9c 100644
--- a/src/hotspot/share/runtime/safepoint.cpp
+++ b/src/hotspot/share/runtime/safepoint.cpp
@@ -65,7 +65,6 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadSMR.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/timerTrace.hpp"
 #include "services/runtimeService.hpp"
 #include "utilities/events.hpp"
@@ -757,7 +756,7 @@ void SafepointSynchronize::handle_polling_page_exception(JavaThread *thread) {
   thread->set_thread_state(_thread_in_vm);
 
   // Enable WXWrite: the function is called implicitly from java code.
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   if (log_is_enabled(Info, safepoint, stats)) {
     Atomic::inc(&_nof_threads_hit_polling_page);
diff --git a/src/hotspot/share/runtime/stubRoutines.cpp b/src/hotspot/share/runtime/stubRoutines.cpp
index 591950fa213f0..b0184edaf8d18 100644
--- a/src/hotspot/share/runtime/stubRoutines.cpp
+++ b/src/hotspot/share/runtime/stubRoutines.cpp
@@ -282,7 +282,7 @@ void StubRoutines::initialize2() {
 
 #ifdef ASSERT
 
-  MACOS_AARCH64_ONLY(os::current_thread_enable_wx(WXExec));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Exec));
 
 #define TEST_ARRAYCOPY(type)                                                    \
   test_arraycopy_func(          type##_arraycopy(),          sizeof(type));     \
@@ -357,7 +357,7 @@ void StubRoutines::initialize2() {
   test_arraycopy_func(CAST_FROM_FN_PTR(address, Copy::aligned_conjoint_words), sizeof(jlong));
   test_arraycopy_func(CAST_FROM_FN_PTR(address, Copy::aligned_disjoint_words), sizeof(jlong));
 
-  MACOS_AARCH64_ONLY(os::current_thread_enable_wx(WXWrite));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Write));
 
 #endif
 }
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 0ec50849f5a5f..15b1c20ce08f1 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -107,7 +107,6 @@
 #include "runtime/threadCritical.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/threadStatisticalInfo.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/timerTrace.hpp"
 #include "runtime/vframe.inline.hpp"
@@ -276,7 +275,7 @@ Thread::Thread() {
     assert(Thread::current_or_null() == NULL, "creating thread before barrier set");
   }
 
-  MACOS_AARCH64_ONLY(DEBUG_ONLY(_wx_init = false));
+  MACOS_AARCH64_ONLY(DEBUG_ONLY(os::ThreadWX::init();))
 }
 
 void Thread::initialize_tlab() {
@@ -338,7 +337,7 @@ void Thread::call_run() {
 
   register_thread_stack_with_NMT();
 
-  MACOS_AARCH64_ONLY(this->init_wx());
+  MACOS_AARCH64_ONLY(os::ThreadWX::init());
 
   JFR_ONLY(Jfr::on_thread_start(this);)
 
@@ -965,7 +964,7 @@ void JavaThread::check_possible_safepoint() {
   // happens in practice, making such issues hard to find and reproduce.
 #if defined(__APPLE__) && defined(AARCH64)
   if (AssertWXAtThreadSync) {
-    assert_wx_state(WXWrite);
+    os::ThreadWX::assert_wx(os::ThreadWX::Write);
   }
 #endif
 }
@@ -1812,7 +1811,7 @@ void JavaThread::check_special_condition_for_native_trans(JavaThread *thread) {
   thread->set_thread_state(_thread_in_vm);
 
   // Enable WXWrite: called directly from interpreter native wrapper.
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, thread));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   SafepointMechanism::process_if_requested_with_exit_check(thread, true /* check asyncs */);
 
@@ -2679,7 +2678,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   // Initialize the os module
   os::init();
 
-  MACOS_AARCH64_ONLY(os::current_thread_enable_wx(WXWrite));
+  MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Write));
 
   // Record VM creation timing statistics
   TraceVmCreationTime create_vm_timer;
@@ -2787,7 +2786,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
   main_thread->record_stack_base_and_size();
   main_thread->register_thread_stack_with_NMT();
   main_thread->set_active_handles(JNIHandleBlock::allocate_block());
-  MACOS_AARCH64_ONLY(main_thread->init_wx());
+  MACOS_AARCH64_ONLY(os::ThreadWX::init());
 
   if (!main_thread->set_as_starting_thread()) {
     vm_shutdown_during_initialization(
diff --git a/src/hotspot/share/runtime/thread.hpp b/src/hotspot/share/runtime/thread.hpp
index 0d56f3dc68200..1d71e31d5af41 100644
--- a/src/hotspot/share/runtime/thread.hpp
+++ b/src/hotspot/share/runtime/thread.hpp
@@ -628,18 +628,6 @@ class Thread: public ThreadShadow {
   static void SpinAcquire(volatile int * Lock, const char * Name);
   static void SpinRelease(volatile int * Lock);
 
-#if defined(__APPLE__) && defined(AARCH64)
- private:
-  DEBUG_ONLY(bool _wx_init);
-  WXMode _wx_state;
- public:
-  void init_wx();
-  WXMode enable_wx(WXMode new_state);
-
-  void assert_wx_state(WXMode expected) {
-    assert(_wx_state == expected, "wrong state");
-  }
-#endif // __APPLE__ && AARCH64
 };
 
 // Inline implementation of Thread::current()
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index 7d27a3bf257ca..d760b9591c32a 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -73,27 +73,6 @@ inline void Thread::set_threads_hazard_ptr(ThreadsList* new_list) {
   Atomic::release_store_fence(&_threads_hazard_ptr, new_list);
 }
 
-#if defined(__APPLE__) && defined(AARCH64)
-inline void Thread::init_wx() {
-  assert(this == Thread::current(), "should only be called for current thread");
-  assert(!_wx_init, "second init");
-  _wx_state = WXWrite;
-  os::current_thread_enable_wx(_wx_state);
-  DEBUG_ONLY(_wx_init = true);
-}
-
-inline WXMode Thread::enable_wx(WXMode new_state) {
-  assert(this == Thread::current(), "should only be called for current thread");
-  assert(_wx_init, "should be inited");
-  WXMode old = _wx_state;
-  if (_wx_state != new_state) {
-    _wx_state = new_state;
-    os::current_thread_enable_wx(new_state);
-  }
-  return old;
-}
-#endif // __APPLE__ && AARCH64
-
 inline void JavaThread::set_suspend_flag(SuspendFlags f) {
   uint32_t flags;
   do {
diff --git a/src/hotspot/share/runtime/threadWXSetters.inline.hpp b/src/hotspot/share/runtime/threadWXSetters.inline.hpp
deleted file mode 100644
index 121584b81be85..0000000000000
--- a/src/hotspot/share/runtime/threadWXSetters.inline.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2021, Azul Systems, Inc. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_RUNTIME_THREADWXSETTERS_INLINE_HPP
-#define SHARE_RUNTIME_THREADWXSETTERS_INLINE_HPP
-
-// No threadWXSetters.hpp
-
-#if defined(__APPLE__) && defined(AARCH64)
-
-#include "runtime/thread.inline.hpp"
-
-class ThreadWXEnable  {
-  Thread* _thread;
-  WXMode _old_mode;
-public:
-  ThreadWXEnable(WXMode new_mode, Thread* thread) :
-    _thread(thread),
-    _old_mode(_thread ? _thread->enable_wx(new_mode) : WXWrite)
-  { }
-  ~ThreadWXEnable() {
-    if (_thread) {
-      _thread->enable_wx(_old_mode);
-    }
-  }
-};
-#endif // __APPLE__ && AARCH64
-
-#endif // SHARE_RUNTIME_THREADWXSETTERS_INLINE_HPP
-
diff --git a/test/hotspot/gtest/gtestMain.cpp b/test/hotspot/gtest/gtestMain.cpp
index 2fa875efaf5b7..2a4afb058563f 100644
--- a/test/hotspot/gtest/gtestMain.cpp
+++ b/test/hotspot/gtest/gtestMain.cpp
@@ -94,9 +94,9 @@ static int init_jvm(int argc, char **argv, bool disable_error_handling, JavaVM**
   int ret = JNI_CreateJavaVM(jvm_ptr, (void**)&env, &args);
   if (ret == JNI_OK) {
     // CreateJavaVM leaves WXExec context, while gtests
-    // calls internal functions assuming running in WXWwrite.
+    // calls internal functions assuming running in WXWrite.
     // Switch to WXWrite once for all test cases.
-    MACOS_AARCH64_ONLY(Thread::current()->enable_wx(WXWrite));
+    MACOS_AARCH64_ONLY(os::ThreadWX::change(os::ThreadWX::Write));
   }
   return ret;
 }
diff --git a/test/hotspot/gtest/runtime/test_threads.cpp b/test/hotspot/gtest/runtime/test_threads.cpp
index e1ac8ed3c70bf..cd7f8cdfc8c2e 100644
--- a/test/hotspot/gtest/runtime/test_threads.cpp
+++ b/test/hotspot/gtest/runtime/test_threads.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -180,7 +180,7 @@ TEST_VM(ThreadsTest, claim_overflow) {
 TEST_VM(ThreadsTest, fast_jni_in_vm) {
   JavaThread* current = JavaThread::current();
   JNIEnv* env = current->jni_environment();
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, current));
+  MACOS_AARCH64_ONLY(os::ThreadWX::Enable wx(os::ThreadWX::Write));
 
   // DirectByteBuffer is an easy way to trigger GetIntField,
   // see JDK-8262896