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

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_cpu

Files:

• os2_x86/vm/atomic_os2_x86.inline.hpp (added)
• os2_x86/vm/bytes_os2_x86.inline.hpp (added)
• os2_x86/vm/copy_os2_x86.inline.hpp (added)
• os2_x86/vm/orderAccess_os2_x86.inline.hpp (added)
• windows_x86/vm/atomic_windows_x86.inline.hpp (modified) (2 diffs)
• windows_x86/vm/bytes_windows_x86.inline.hpp (modified) (2 diffs)
• windows_x86/vm/copy_windows_x86.inline.hpp (modified) (2 diffs)
• windows_x86/vm/orderAccess_windows_x86.inline.hpp (modified) (2 diffs)

trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp

@@ -25 +25 @@
 #ifndef OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
 #define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
-
-#ifdef __EMX__
-
-#include "../../linux_x86/vm/atomic_linux_x86.inline.hpp"
-
-#else // __EMX__
 
 #include "orderAccess_windows_x86.inline.hpp"
@@ -292 +286 @@
 #pragma warning(default: 4035) // Enables warnings reporting missing return statement
 
-#endif // __EMX__
-
 #endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP

trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp

@@ -25 +25 @@
 #ifndef OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
 #define OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
-
-#ifdef __EMX__
-
-#include "../../linux_x86/vm/bytes_linux_x86.inline.hpp"
-
-#else // __EMX__
 
 #pragma warning(disable: 4035) // Disable warning 4035: no return value
@@ -91 +85 @@
 #pragma warning(default: 4035) // Enable warning 4035: no return value
 
-#endif // __EMX__
-
 #endif // OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP

trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp

@@ -25 +25 @@
 #ifndef OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
 #define OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
-
-#ifdef __EMX__
-
-#include "../../linux_x86/vm/copy_linux_x86.inline.hpp"
-
-#else // __EMX__
 
 static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
@@ -175 +169 @@
 }
 
-#endif // __EMX__
-
 #endif // OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP

trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp

@@ -25 +25 @@
 #ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
 #define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
-
-#ifdef __EMX__
-
-#include "../../linux_x86/vm/orderAccess_linux_x86.inline.hpp"
-
-#else // __EMX__
 
 #include "runtime/atomic.hpp"
@@ -223 +217 @@
 #pragma warning(default: 4035) // Enables warnings reporting missing return statement
 
-#endif // __EMX__
-
 #endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP