diff a/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
@@ -26,38 +26,10 @@
 #define OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_HPP
 
   //
   // NOTE: we are back in class os here, not win32
   //
-#ifdef AMD64
-  static int32_t   (*atomic_xchg_func)          (int32_t, volatile int32_t*);
-  static int64_t   (*atomic_xchg_long_func)     (int64_t, volatile int64_t*);
-
-  static int32_t   (*atomic_cmpxchg_func)       (int32_t,  volatile int32_t*, int32_t);
-  static int8_t    (*atomic_cmpxchg_byte_func)  (int8_t,   volatile int8_t*,  int8_t);
-  static int64_t   (*atomic_cmpxchg_long_func)  (int64_t,  volatile int64_t*, int64_t);
-
-  static int32_t   (*atomic_add_func)           (int32_t,  volatile int32_t*);
-  static int64_t   (*atomic_add_long_func)      (int64_t,  volatile int64_t*);
-
-  static int32_t   atomic_xchg_bootstrap        (int32_t,  volatile int32_t*);
-  static int64_t   atomic_xchg_long_bootstrap   (int64_t,  volatile int64_t*);
-
-  static int32_t   atomic_cmpxchg_bootstrap     (int32_t,  volatile int32_t*, int32_t);
-  static int8_t    atomic_cmpxchg_byte_bootstrap(int8_t,   volatile int8_t*,  int8_t);
-#else
-
-  static int64_t (*atomic_cmpxchg_long_func)  (int64_t, volatile int64_t*, int64_t);
-
-#endif // AMD64
-
-  static int64_t atomic_cmpxchg_long_bootstrap(int64_t, volatile int64_t*, int64_t);
-
-#ifdef AMD64
-  static int32_t  atomic_add_bootstrap         (int32_t,  volatile int32_t*);
-  static int64_t  atomic_add_long_bootstrap    (int64_t,  volatile int64_t*);
-#endif // AMD64
 
   static void setup_fpu();
   static bool supports_sse() { return true; }
 
   static jlong rdtsc();