Changeset 58 for trunk/openjdk/hotspot/src/cpu

Timestamp:

Jul 15, 2010, 2:46:42 PM (15 years ago)

Author:

dmik

Message:

hotspot/src: Another big bunch of patches to make the windows code build with Odin32/GCC on OS/2.

File:

• trunk/openjdk/hotspot/src/cpu/x86/vm/jniFastGetField_x86_32.cpp (modified) (7 diffs)

trunk/openjdk/hotspot/src/cpu/x86/vm/jniFastGetField_x86_32.cpp

@@ -30 +30 @@
 #define BUFFER_SIZE 30
 
-#ifdef _WINDOWS
+#if defined(_WINDOWS) || defined(OS2)
 GetBooleanField_t JNI_FastGetField::jni_fast_GetBooleanField_fp;
 GetByteField_t    JNI_FastGetField::jni_fast_GetByteField_fp;
@@ -110 +110 @@
   __ jcc (Assembler::notEqual, slow);
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__WIN32OS2__)
   __ ret (0);
 #else
@@ -132 +132 @@
   __ flush ();
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(OS2)
   return fast_entry;
 #else
@@ -227 +227 @@
   __ pop (rsi);
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__WIN32OS2__)
   __ ret (0);
 #else
@@ -244 +244 @@
   __ flush ();
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(OS2)
   return fast_entry;
 #else
@@ -321 +321 @@
   __ jcc (Assembler::notEqual, slow_with_pop);
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__WIN32OS2__)
   __ ret (0);
 #else
@@ -345 +345 @@
   __ flush ();
 
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(OS2)
   return fast_entry;
 #else