Changeset 48

Timestamp:

Jul 12, 2010, 12:39:52 AM (15 years ago)

Author:

dmik

Message:

hotspot/src: os_cpu: Use the Linux code for the Windows platform (reused on OS/2) when it's built by GCC.

Location:

trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm

Files:

• atomic_windows_x86.inline.hpp (modified) (2 diffs)
• bytes_windows_x86.inline.hpp (modified) (2 diffs)
• copy_windows_x86.inline.hpp (modified) (2 diffs)
• orderAccess_windows_x86.inline.hpp (modified) (2 diffs)

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

@@ -22 +22 @@
  *
  */
+
+#ifdef __EMX__
+
+#include "../../linux_x86/vm/atomic_linux_x86.inline.hpp"
+
+#else // __EMX__
 
 // The following alternative implementations are needed because
@@ -250 +256 @@
 
 #pragma warning(default: 4035) // Enables warnings reporting missing return statement
+
+#endif // __EMX__

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

@@ -22 +22 @@
  *
  */
+
+#ifdef __EMX__
+
+#include "../../linux_x86/vm/bytes_linux_x86.inline.hpp"
+
+#else // __EMX__
 
 #pragma warning(disable: 4035) // Disable warning 4035: no return value
@@ -81 +87 @@
 
 #pragma warning(default: 4035) // Enable warning 4035: no return value
+
+#endif // __EMX__

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

@@ -22 +22 @@
  *
  */
+
+#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) {
@@ -165 +171 @@
   pd_conjoint_oops_atomic((oop*)from, (oop*)to, count);
 }
+
+#endif // __EMX__

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

@@ -22 +22 @@
  *
  */
+
+#ifdef __EMX__
+
+#include "../../linux_x86/vm/orderAccess_linux_x86.inline.hpp"
+
+#else // __EMX__
 
 #pragma warning(disable: 4035) // Disables warnings reporting missing return statement
@@ -209 +215 @@
 
 #pragma warning(default: 4035) // Enables warnings reporting missing return statement
+
+#endif // __EMX__