Changeset 313 for trunk/openjdk/hotspot/src/os

Timestamp:

Feb 15, 2012, 4:45:07 PM (14 years ago)

Author:

dmik

Message:

Adopt to the new platform dispatching defines.

Location:

trunk/openjdk/hotspot/src/os/windows/vm

Files:

• os_windows.inline.hpp (modified) (1 diff)
• thread_windows.inline.hpp (modified) (1 diff)

trunk/openjdk/hotspot/src/os/windows/vm/os_windows.inline.hpp

@@ -29 +29 @@
 #include "runtime/os.hpp"
 #ifdef TARGET_OS_ARCH_windows_x86
-# include "atomic_windows_x86.inline.hpp"
-# include "orderAccess_windows_x86.inline.hpp"
+# ifdef TARGET_OS_FAMILY_os2
+#  include "atomic_os2_x86.inline.hpp"
+#  include "orderAccess_os2_x86.inline.hpp"
+# else
+#  include "atomic_windows_x86.inline.hpp"
+#  include "orderAccess_windows_x86.inline.hpp"
+# endif
 #endif
 

trunk/openjdk/hotspot/src/os/windows/vm/thread_windows.inline.hpp

@@ -31 +31 @@
 #include "runtime/threadLocalStorage.hpp"
 #ifdef TARGET_OS_ARCH_windows_x86
-# include "atomic_windows_x86.inline.hpp"
-# include "orderAccess_windows_x86.inline.hpp"
+# ifdef TARGET_OS_FAMILY_os2
+#  include "atomic_os2_x86.inline.hpp"
+#  include "orderAccess_os2_x86.inline.hpp"
+# else
+#  include "atomic_windows_x86.inline.hpp"
+#  include "orderAccess_windows_x86.inline.hpp"
+# endif
 # include "prefetch_windows_x86.inline.hpp"
 #endif