Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/linux/makefiles/gcc.make	Thu Dec 02 14:00:03 2010 -0500
     1.2 +++ b/make/linux/makefiles/gcc.make	Wed Dec 01 15:04:06 2010 +0100
     1.3 @@ -42,11 +42,14 @@
     1.4  
     1.5  # check for precompiled headers support
     1.6  ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
     1.7 +# Allow the user to turn off precompiled headers from the command line.
     1.8 +ifneq ($(USE_PRECOMPILED_HEADER),0)
     1.9  USE_PRECOMPILED_HEADER=1
    1.10  PRECOMPILED_HEADER_DIR=.
    1.11  PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp
    1.12  PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch
    1.13  endif
    1.14 +endif
    1.15  
    1.16  
    1.17  #------------------------------------------------------------------------
    1.18 @@ -150,6 +153,11 @@
    1.19  DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
    1.20  endif
    1.21  
    1.22 +# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
    1.23 +ifneq ($(USE_PRECOMPILED_HEADER),1)
    1.24 +CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
    1.25 +endif
    1.26 +
    1.27  #------------------------------------------------------------------------
    1.28  # Linker flags
    1.29  

     2.1 --- a/make/linux/makefiles/sparcWorks.make	Thu Dec 02 14:00:03 2010 -0500
     2.2 +++ b/make/linux/makefiles/sparcWorks.make	Wed Dec 01 15:04:06 2010 +0100
     2.3 @@ -79,6 +79,9 @@
     2.4  DEPFLAGS = -xMMD -xMF $(DEP_DIR)/$(@:%=%.d)
     2.5  endif
     2.6  
     2.7 +# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
     2.8 +CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
     2.9 +
    2.10  #------------------------------------------------------------------------
    2.11  # Linker flags
    2.12  

     3.1 --- a/make/solaris/makefiles/gcc.make	Thu Dec 02 14:00:03 2010 -0500
     3.2 +++ b/make/solaris/makefiles/gcc.make	Wed Dec 01 15:04:06 2010 +0100
     3.3 @@ -47,11 +47,14 @@
     3.4  
     3.5  # check for precompiled headers support
     3.6  ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
     3.7 +# Allow the user to turn off precompiled headers from the command line.
     3.8 +ifneq ($(USE_PRECOMPILED_HEADER),0)
     3.9  USE_PRECOMPILED_HEADER=1
    3.10  PRECOMPILED_HEADER_DIR=.
    3.11  PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp
    3.12  PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch
    3.13  endif
    3.14 +endif
    3.15  
    3.16  
    3.17  #------------------------------------------------------------------------
    3.18 @@ -138,6 +141,11 @@
    3.19  DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
    3.20  endif
    3.21  
    3.22 +# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
    3.23 +ifneq ($(USE_PRECOMPILED_HEADER),1)
    3.24 +CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
    3.25 +endif
    3.26 +
    3.27  #------------------------------------------------------------------------
    3.28  # Linker flags
    3.29  

     4.1 --- a/make/solaris/makefiles/sparcWorks.make	Thu Dec 02 14:00:03 2010 -0500
     4.2 +++ b/make/solaris/makefiles/sparcWorks.make	Wed Dec 01 15:04:06 2010 +0100
     4.3 @@ -150,6 +150,9 @@
     4.4  DEPFLAGS = -xMMD -xMF $(DEP_DIR)/$(@:%=%.d)
     4.5  endif
     4.6  
     4.7 +# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
     4.8 +CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
     4.9 +
    4.10  ################################################
    4.11  # Begin current (>=5.9) Forte compiler options #
    4.12  #################################################

     5.1 --- a/make/windows/makefiles/debug.make	Thu Dec 02 14:00:03 2010 -0500
     5.2 +++ b/make/windows/makefiles/debug.make	Wed Dec 01 15:04:06 2010 +0100
     5.3 @@ -28,7 +28,12 @@
     5.4  SAWINDBG=sawindbg.dll
     5.5  GENERATED=../generated
     5.6  
     5.7 -default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     5.8 +# Allow the user to turn off precompiled headers from the command line.
     5.9 +!if "$(USE_PRECOMPILED_HEADER)" != "0"
    5.10 +BUILD_PCH_FILE=_build_pch_file.obj
    5.11 +!endif
    5.12 +
    5.13 +default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA
    5.14  
    5.15  !include ../local.make
    5.16  !include compile.make

     6.1 --- a/make/windows/makefiles/fastdebug.make	Thu Dec 02 14:00:03 2010 -0500
     6.2 +++ b/make/windows/makefiles/fastdebug.make	Wed Dec 01 15:04:06 2010 +0100
     6.3 @@ -28,7 +28,12 @@
     6.4  SAWINDBG=sawindbg.dll
     6.5  GENERATED=../generated
     6.6  
     6.7 -default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     6.8 +# Allow the user to turn off precompiled headers from the command line.
     6.9 +!if "$(USE_PRECOMPILED_HEADER)" != "0"
    6.10 +BUILD_PCH_FILE=_build_pch_file.obj
    6.11 +!endif
    6.12 +
    6.13 +default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA
    6.14  
    6.15  !include ../local.make
    6.16  !include compile.make

     7.1 --- a/make/windows/makefiles/product.make	Thu Dec 02 14:00:03 2010 -0500
     7.2 +++ b/make/windows/makefiles/product.make	Wed Dec 01 15:04:06 2010 +0100
     7.3 @@ -27,7 +27,12 @@
     7.4  AOUT=$(HS_FNAME)
     7.5  GENERATED=../generated
     7.6  
     7.7 -default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
     7.8 +# Allow the user to turn off precompiled headers from the command line.
     7.9 +!if "$(USE_PRECOMPILED_HEADER)" != "0"
    7.10 +BUILD_PCH_FILE=_build_pch_file.obj
    7.11 +!endif
    7.12 +
    7.13 +default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA
    7.14  
    7.15  !include ../local.make
    7.16  !include compile.make

     8.1 --- a/make/windows/makefiles/vm.make	Thu Dec 02 14:00:03 2010 -0500
     8.2 +++ b/make/windows/makefiles/vm.make	Wed Dec 01 15:04:06 2010 +0100
     8.3 @@ -128,7 +128,13 @@
     8.4    /I "$(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm" \
     8.5    /I "$(WorkSpace)\src\cpu\$(Platform_arch)\vm"
     8.6  
     8.7 +CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
     8.8 +
     8.9 +!if "$(USE_PRECOMPILED_HEADER)" != "0"
    8.10  CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
    8.11 +!else
    8.12 +CPP_USE_PCH=$(CPP_DONT_USE_PCH)
    8.13 +!endif
    8.14  
    8.15  # Where to find the source code for the virtual machine
    8.16  VM_PATH=../generated
    8.17 @@ -164,31 +170,31 @@
    8.18  # Special case files not using precompiled header files.
    8.19  
    8.20  c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp 
    8.21 -	 $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
    8.22 +	 $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
    8.23  
    8.24  os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
    8.25 -        $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
    8.26 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
    8.27  
    8.28  os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
    8.29 -        $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
    8.30 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
    8.31  
    8.32  osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
    8.33 -        $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
    8.34 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
    8.35  
    8.36  conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
    8.37 -        $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
    8.38 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
    8.39  
    8.40  getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
    8.41 -        $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
    8.42 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
    8.43  
    8.44  opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp
    8.45 -        $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
    8.46 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
    8.47  
    8.48  bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
    8.49 -        $(CPP) $(CPP_FLAGS) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
    8.50 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
    8.51  
    8.52  bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
    8.53 -        $(CPP) $(CPP_FLAGS) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
    8.54 +        $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
    8.55  
    8.56  # Default rules for the Virtual Machine
    8.57  {$(WorkSpace)\src\share\vm\c1}.cpp.obj::

     9.1 --- a/src/share/vm/ci/ciCallProfile.hpp	Thu Dec 02 14:00:03 2010 -0500
     9.2 +++ b/src/share/vm/ci/ciCallProfile.hpp	Wed Dec 01 15:04:06 2010 +0100
     9.3 @@ -26,6 +26,7 @@
     9.4  #define SHARE_VM_CI_CICALLPROFILE_HPP
     9.5  
     9.6  #include "ci/ciClassList.hpp"
     9.7 +#include "memory/allocation.hpp"
     9.8  
     9.9  // ciCallProfile
    9.10  //

    10.1 --- a/src/share/vm/ci/ciMethodHandle.hpp	Thu Dec 02 14:00:03 2010 -0500
    10.2 +++ b/src/share/vm/ci/ciMethodHandle.hpp	Wed Dec 01 15:04:06 2010 +0100
    10.3 @@ -25,6 +25,7 @@
    10.4  #ifndef SHARE_VM_CI_CIMETHODHANDLE_HPP
    10.5  #define SHARE_VM_CI_CIMETHODHANDLE_HPP
    10.6  
    10.7 +#include "ci/ciInstance.hpp"
    10.8  #include "prims/methodHandles.hpp"
    10.9  
   10.10  // ciMethodHandle

    11.1 --- a/src/share/vm/classfile/placeholders.hpp	Thu Dec 02 14:00:03 2010 -0500
    11.2 +++ b/src/share/vm/classfile/placeholders.hpp	Wed Dec 01 15:04:06 2010 +0100
    11.3 @@ -25,6 +25,7 @@
    11.4  #ifndef SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
    11.5  #define SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
    11.6  
    11.7 +#include "runtime/thread.hpp"
    11.8  #include "utilities/hashtable.hpp"
    11.9  
   11.10  class PlaceholderEntry;

    12.1 --- a/src/share/vm/code/vtableStubs.hpp	Thu Dec 02 14:00:03 2010 -0500
    12.2 +++ b/src/share/vm/code/vtableStubs.hpp	Wed Dec 01 15:04:06 2010 +0100
    12.3 @@ -25,6 +25,7 @@
    12.4  #ifndef SHARE_VM_CODE_VTABLESTUBS_HPP
    12.5  #define SHARE_VM_CODE_VTABLESTUBS_HPP
    12.6  
    12.7 +#include "code/vmreg.hpp"
    12.8  #include "memory/allocation.hpp"
    12.9  
   12.10  // A VtableStub holds an individual code stub for a pair (vtable index, #args) for either itables or vtables

    13.1 --- a/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	Thu Dec 02 14:00:03 2010 -0500
    13.2 +++ b/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp	Wed Dec 01 15:04:06 2010 +0100
    13.3 @@ -26,6 +26,7 @@
    13.4  #define SHARE_VM_GC_IMPLEMENTATION_PARNEW_PARGCALLOCBUFFER_HPP
    13.5  
    13.6  #include "memory/allocation.hpp"
    13.7 +#include "memory/blockOffsetTable.hpp"
    13.8  #include "memory/threadLocalAllocBuffer.hpp"
    13.9  #include "utilities/globalDefinitions.hpp"
   13.10  

    14.1 --- a/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp	Thu Dec 02 14:00:03 2010 -0500
    14.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp	Wed Dec 01 15:04:06 2010 +0100
    14.3 @@ -25,6 +25,7 @@
    14.4  #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP
    14.5  #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_HPP
    14.6  
    14.7 +#include "memory/memRegion.hpp"
    14.8  #include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
    14.9  #include "utilities/bitMap.inline.hpp"
   14.10  

    15.1 --- a/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp	Thu Dec 02 14:00:03 2010 -0500
    15.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp	Wed Dec 01 15:04:06 2010 +0100
    15.3 @@ -25,6 +25,8 @@
    15.4  #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_INLINE_HPP
    15.5  #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PARMARKBITMAP_INLINE_HPP
    15.6  
    15.7 +#include "oops/oop.hpp"
    15.8 +
    15.9  inline bool
   15.10  ParMarkBitMap::mark_obj(oop obj)
   15.11  {

    16.1 --- a/src/share/vm/interpreter/oopMapCache.hpp	Thu Dec 02 14:00:03 2010 -0500
    16.2 +++ b/src/share/vm/interpreter/oopMapCache.hpp	Wed Dec 01 15:04:06 2010 +0100
    16.3 @@ -26,6 +26,7 @@
    16.4  #define SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP
    16.5  
    16.6  #include "oops/generateOopMap.hpp"
    16.7 +#include "runtime/mutex.hpp"
    16.8  
    16.9  // A Cache for storing (method, bci) -> oopMap.
   16.10  // The memory management system uses the cache when locating object

    17.1 --- a/src/share/vm/libadt/vectset.cpp	Thu Dec 02 14:00:03 2010 -0500
    17.2 +++ b/src/share/vm/libadt/vectset.cpp	Wed Dec 01 15:04:06 2010 +0100
    17.3 @@ -249,13 +249,13 @@
    17.4    const VectorSet &s = *(set.asVectorSet());
    17.5  
    17.6    // NOTE: The intersection is never any larger than the smallest set.
    17.7 -  register uint small = ((size<s.size)?size:s.size);
    17.8 -  register uint32 *u1 = data;   // Pointer to the destination data
    17.9 -  register uint32 *u2 = s.data; // Pointer to the source data
   17.10 -  for( uint i=0; i<small; i++)  // For data in set
   17.11 -    if( *u1++ & *u2++ )         // If any elements in common
   17.12 -      return 0;                 // Then not disjoint
   17.13 -  return 1;                     // Else disjoint
   17.14 +  register uint small_size = ((size<s.size)?size:s.size);
   17.15 +  register uint32 *u1 = data;        // Pointer to the destination data
   17.16 +  register uint32 *u2 = s.data;      // Pointer to the source data
   17.17 +  for( uint i=0; i<small_size; i++)  // For data in set
   17.18 +    if( *u1++ & *u2++ )              // If any elements in common
   17.19 +      return 0;                      // Then not disjoint
   17.20 +  return 1;                          // Else disjoint
   17.21  }
   17.22  
   17.23  //------------------------------operator<--------------------------------------

    18.1 --- a/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	Thu Dec 02 14:00:03 2010 -0500
    18.2 +++ b/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp	Wed Dec 01 15:04:06 2010 +0100
    18.3 @@ -28,6 +28,7 @@
    18.4  #include "gc_interface/collectedHeap.hpp"
    18.5  #include "memory/threadLocalAllocBuffer.hpp"
    18.6  #include "runtime/atomic.hpp"
    18.7 +#include "runtime/thread.hpp"
    18.8  #include "utilities/copy.hpp"
    18.9  
   18.10  inline HeapWord* ThreadLocalAllocBuffer::allocate(size_t size) {

    19.1 --- a/src/share/vm/precompiled.hpp	Thu Dec 02 14:00:03 2010 -0500
    19.2 +++ b/src/share/vm/precompiled.hpp	Wed Dec 01 15:04:06 2010 +0100
    19.3 @@ -22,6 +22,10 @@
    19.4   *
    19.5   */
    19.6  
    19.7 +// Precompiled headers are turned off for Sun Studion,
    19.8 +// or if the user passes USE_PRECOMPILED_HEADER=0 to the makefiles.
    19.9 +#ifndef DONT_USE_PRECOMPILED_HEADER
   19.10 +
   19.11  # include "asm/assembler.hpp"
   19.12  # include "asm/assembler.inline.hpp"
   19.13  # include "asm/codeBuffer.hpp"
   19.14 @@ -323,3 +327,5 @@
   19.15  # include "gc_implementation/shared/gcAdaptivePolicyCounters.hpp"
   19.16  # include "gc_implementation/shared/gcPolicyCounters.hpp"
   19.17  #endif // SERIALGC
   19.18 +
   19.19 +#endif // !DONT_USE_PRECOMPILED_HEADER

    20.1 --- a/src/share/vm/prims/jvmtiExport.hpp	Thu Dec 02 14:00:03 2010 -0500
    20.2 +++ b/src/share/vm/prims/jvmtiExport.hpp	Wed Dec 01 15:04:06 2010 +0100
    20.3 @@ -25,7 +25,6 @@
    20.4  #ifndef SHARE_VM_PRIMS_JVMTIEXPORT_HPP
    20.5  #define SHARE_VM_PRIMS_JVMTIEXPORT_HPP
    20.6  
    20.7 -#include "code/jvmticmlr.h"
    20.8  #include "jvmtifiles/jvmti.h"
    20.9  #include "memory/allocation.hpp"
   20.10  #include "memory/iterator.hpp"
   20.11 @@ -36,6 +35,9 @@
   20.12  #include "utilities/globalDefinitions.hpp"
   20.13  #include "utilities/growableArray.hpp"
   20.14  
   20.15 +// Must be included after jvmti.h.
   20.16 +#include "code/jvmticmlr.h"
   20.17 +
   20.18  // Forward declarations
   20.19  
   20.20  class JvmtiEventControllerPrivate;

    21.1 --- a/src/share/vm/prims/jvmtiImpl.hpp	Thu Dec 02 14:00:03 2010 -0500
    21.2 +++ b/src/share/vm/prims/jvmtiImpl.hpp	Wed Dec 01 15:04:06 2010 +0100
    21.3 @@ -26,6 +26,7 @@
    21.4  #define SHARE_VM_PRIMS_JVMTIIMPL_HPP
    21.5  
    21.6  #ifndef JVMTI_KERNEL
    21.7 +
    21.8  #include "classfile/systemDictionary.hpp"
    21.9  #include "jvmtifiles/jvmti.h"
   21.10  #include "oops/objArrayOop.hpp"
   21.11 @@ -35,7 +36,6 @@
   21.12  #include "prims/jvmtiUtil.hpp"
   21.13  #include "runtime/stackValueCollection.hpp"
   21.14  #include "runtime/vm_operations.hpp"
   21.15 -#endif
   21.16  
   21.17  //
   21.18  // Forward Declarations
   21.19 @@ -417,6 +417,8 @@
   21.20    static void print();
   21.21  };
   21.22  
   21.23 +#endif // !JVMTI_KERNEL
   21.24 +
   21.25  // Utility macro that checks for NULL pointers:
   21.26  #define NULL_CHECK(X, Y) if ((X) == NULL) { return (Y); }
   21.27  

    22.1 --- a/src/share/vm/runtime/objectMonitor.hpp	Thu Dec 02 14:00:03 2010 -0500
    22.2 +++ b/src/share/vm/runtime/objectMonitor.hpp	Wed Dec 01 15:04:06 2010 +0100
    22.3 @@ -26,6 +26,7 @@
    22.4  #define SHARE_VM_RUNTIME_OBJECTMONITOR_HPP
    22.5  
    22.6  #include "runtime/os.hpp"
    22.7 +#include "runtime/park.hpp"
    22.8  #include "runtime/perfData.hpp"
    22.9  
   22.10