*** old/src/share/vm/runtime/atomic.cpp	Wed Sep 21 11:39:39 2011
--- new/src/share/vm/runtime/atomic.cpp	Wed Sep 21 11:39:38 2011

*** 31,40 ****
--- 31,43 ----
  # include "os_solaris.inline.hpp"
  #endif
  #ifdef TARGET_OS_FAMILY_windows
  # include "os_windows.inline.hpp"
  #endif
+ #ifdef TARGET_OS_FAMILY_bsd
+ # include "os_bsd.inline.hpp"
+ #endif
  #ifdef TARGET_OS_ARCH_linux_x86
  # include "atomic_linux_x86.inline.hpp"
  #endif
  #ifdef TARGET_OS_ARCH_linux_sparc
  # include "atomic_linux_sparc.inline.hpp"

*** 55,64 ****
--- 58,73 ----
  # include "atomic_linux_arm.inline.hpp"
  #endif
  #ifdef TARGET_OS_ARCH_linux_ppc
  # include "atomic_linux_ppc.inline.hpp"
  #endif
+ #ifdef TARGET_OS_ARCH_bsd_x86
+ # include "atomic_bsd_x86.inline.hpp"
+ #endif
+ #ifdef TARGET_OS_ARCH_bsd_zero
+ # include "atomic_bsd_zero.inline.hpp"
+ #endif
  
  jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
    assert(sizeof(jbyte) == 1, "assumption.");
    uintptr_t dest_addr = (uintptr_t)dest;
    uintptr_t offset = dest_addr % sizeof(jint);