Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/Makefile	Thu Jan 24 23:30:45 2013 -0800
     1.2 +++ b/make/Makefile	Fri Jan 25 10:04:08 2013 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -87,7 +87,6 @@
    1.11  # Typical C1/C2 targets made available with this Makefile
    1.12  C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
    1.13  C2_VM_TARGETS=product  fastdebug  optimized  jvmg
    1.14 -KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
    1.15  ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
    1.16  SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
    1.17  MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1
    1.18 @@ -161,11 +160,6 @@
    1.19  	$(CD) $(GAMMADIR)/make; \
    1.20  	$(MAKE) BUILD_FLAVOR=$@ VM_TARGET=$@ generic_build2 $(ALT_OUT)
    1.21  
    1.22 -$(KERNEL_VM_TARGETS):
    1.23 -	$(CD) $(GAMMADIR)/make; \
    1.24 -	$(MAKE) BUILD_FLAVOR=$(@:%kernel=%) VM_TARGET=$@ \
    1.25 -	  generic_buildkernel $(ALT_OUT)
    1.26 -
    1.27  $(ZERO_VM_TARGETS):
    1.28  	$(CD) $(GAMMADIR)/make; \
    1.29  	$(MAKE) BUILD_FLAVOR=$(@:%zero=%) VM_TARGET=$@ \
    1.30 @@ -223,24 +217,6 @@
    1.31  		      $(MAKE_ARGS) $(VM_TARGET)
    1.32  endif
    1.33  
    1.34 -generic_buildkernel:
    1.35 -	$(MKDIR) -p $(OUTPUTDIR)
    1.36 -ifeq ($(OSNAME),windows)
    1.37 -  ifeq ($(ARCH_DATA_MODEL), 32)
    1.38 -	$(CD) $(OUTPUTDIR); \
    1.39 -	    $(NMAKE) -f $(ABS_OS_MAKEFILE) \
    1.40 -		      Variant=kernel \
    1.41 -                      WorkSpace=$(ABS_GAMMADIR) \
    1.42 -		      BootStrapDir=$(ABS_BOOTDIR) \
    1.43 -                      BuildUser=$(USERNAME) \
    1.44 -		      $(MAKE_ARGS) $(VM_TARGET:%kernel=%)
    1.45 -  else
    1.46 -	@$(ECHO) "No kernel ($(VM_TARGET)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
    1.47 -  endif
    1.48 -else
    1.49 -	@$(ECHO) "No kernel ($(VM_TARGET)) for OS_NAME=$(OSNAME)"
    1.50 -endif
    1.51 -
    1.52  generic_buildzero:
    1.53  	$(MKDIR) -p $(OUTPUTDIR)
    1.54  	$(CD) $(OUTPUTDIR); \
    1.55 @@ -314,12 +290,10 @@
    1.56  DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
    1.57  C1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler1
    1.58  C2_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_compiler2
    1.59 -KERNEL_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_kernel
    1.60  ZERO_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_zero
    1.61  SHARK_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_shark
    1.62  C1_DIR=$(C1_BASE_DIR)/$(VM_SUBDIR)
    1.63  C2_DIR=$(C2_BASE_DIR)/$(VM_SUBDIR)
    1.64 -KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
    1.65  ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
    1.66  SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
    1.67  MINIMAL1_BASE_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_minimal1
    1.68 @@ -333,10 +307,6 @@
    1.69      MISC_DIR=$(C1_DIR)
    1.70      GEN_DIR=$(C1_BASE_DIR)/generated
    1.71  endif
    1.72 -ifeq ($(JVM_VARIANT_KERNEL), true)
    1.73 -    MISC_DIR=$(C2_DIR)
    1.74 -    GEN_DIR=$(C2_BASE_DIR)/generated
    1.75 -endif
    1.76  ifeq ($(JVM_VARIANT_ZEROSHARK), true)
    1.77      MISC_DIR=$(SHARK_DIR)
    1.78      GEN_DIR=$(SHARK_BASE_DIR)/generated
    1.79 @@ -386,16 +356,6 @@
    1.80  	$(install-file)
    1.81  $(EXPORT_SERVER_DIR)/%.map:  $(C2_DIR)/%.map
    1.82  	$(install-file)
    1.83 -
    1.84 -# Kernel files always come from kernel area
    1.85 -$(EXPORT_KERNEL_DIR)/%.diz:  $(KERNEL_DIR)/%.diz
    1.86 -	$(install-file)
    1.87 -$(EXPORT_KERNEL_DIR)/%.dll:  $(KERNEL_DIR)/%.dll
    1.88 -	$(install-file)
    1.89 -$(EXPORT_KERNEL_DIR)/%.pdb:  $(KERNEL_DIR)/%.pdb
    1.90 -	$(install-file)
    1.91 -$(EXPORT_KERNEL_DIR)/%.map:  $(KERNEL_DIR)/%.map
    1.92 -	$(install-file)
    1.93  endif
    1.94  
    1.95  # Minimal JVM files always come from minimal area
    1.96 @@ -538,7 +498,7 @@
    1.97  	$(install-file)
    1.98  
    1.99  # Xusage file
   1.100 -$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_KERNEL_DIR)/Xusage.txt $(EXPORT_MINIMAL_DIR)/Xusage.txt: $(XUSAGE)
   1.101 +$(EXPORT_SERVER_DIR)/Xusage.txt $(EXPORT_CLIENT_DIR)/Xusage.txt $(EXPORT_MINIMAL_DIR)/Xusage.txt: $(XUSAGE)
   1.102  	$(prep-target)
   1.103  	$(RM) $@.temp
   1.104  	$(SED) 's/\(separated by \)[;:]/\1$(PATH_SEP)/g' $< > $@.temp
   1.105 @@ -551,7 +511,6 @@
   1.106  clean_build:
   1.107  	$(RM) -r $(C1_DIR)
   1.108  	$(RM) -r $(C2_DIR)
   1.109 -	$(RM) -r $(KERNEL_DIR)
   1.110  	$(RM) -r $(ZERO_DIR)
   1.111  	$(RM) -r $(SHARK_DIR)
   1.112  	$(RM) -r $(MINIMAL1_DIR)
   1.113 @@ -586,10 +545,6 @@
   1.114  	$(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion
   1.115  	$(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version
   1.116    endif
   1.117 -  ifeq ($(JVM_VARIANT_KERNEL), true)
   1.118 -	$(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion
   1.119 -	$(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version
   1.120 -  endif
   1.121  
   1.122  copy_product_jdk::
   1.123  	$(RM) -r $(JDK_IMAGE_DIR)
   1.124 @@ -665,7 +620,6 @@
   1.125  	@$(ECHO) "Other targets are:"
   1.126  	@$(ECHO) "   $(C1_VM_TARGETS)"
   1.127  	@$(ECHO) "   $(C2_VM_TARGETS)"
   1.128 -	@$(ECHO) "   $(KERNEL_VM_TARGETS)"
   1.129  	@$(ECHO) "   $(MINIMAL1_VM_TARGETS)"
   1.130  
   1.131  # Variable help (only common ones used by this workspace)
   1.132 @@ -761,8 +715,8 @@
   1.133  include $(GAMMADIR)/make/jprt.gmk
   1.134  
   1.135  .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \
   1.136 -        $(KERNEL_VM_TARGETS) $(MINIMAL1_VM_TARGETS) \
   1.137 -	generic_build1 generic_build2 generic_buildkernel generic_buildminimal1 generic_export \
   1.138 +        $(MINIMAL1_VM_TARGETS) \
   1.139 +	generic_build1 generic_build2 generic_buildminimal1 generic_export \
   1.140  	export_product export_fastdebug export_debug export_optimized \
   1.141  	export_jdk_product export_jdk_fastdebug export_jdk_debug \
   1.142  	create_jdk copy_jdk update_jdk test_jdk \

     2.1 --- a/make/bsd/makefiles/dtrace.make	Thu Jan 24 23:30:45 2013 -0800
     2.2 +++ b/make/bsd/makefiles/dtrace.make	Fri Jan 25 10:04:08 2013 -0500
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -25,10 +25,9 @@
    2.11  # Rules to build jvm_db/dtrace, used by vm.make
    2.12  
    2.13  # We build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
    2.14 -# but not for CORE or KERNEL configurations.
    2.15 +# but not for CORE configuration.
    2.16  
    2.17  ifneq ("${TYPE}", "CORE")
    2.18 -ifneq ("${TYPE}", "KERNEL")
    2.19  
    2.20  ifeq ($(OS_VENDOR), Darwin)
    2.21  # we build dtrace for macosx using USDT2 probes
    2.22 @@ -280,13 +279,6 @@
    2.23  endif # ifeq ($(OS_VENDOR), Darwin)
    2.24  
    2.25  
    2.26 -else # KERNEL build
    2.27 -
    2.28 -dtraceCheck:
    2.29 -	$(QUIETLY) echo "**NOTICE** Dtrace support disabled for KERNEL builds"
    2.30 -
    2.31 -endif # ifneq ("${TYPE}", "KERNEL")
    2.32 -
    2.33  else # CORE build
    2.34  
    2.35  dtraceCheck:

     3.1 --- a/make/solaris/Makefile	Thu Jan 24 23:30:45 2013 -0800
     3.2 +++ b/make/solaris/Makefile	Fri Jan 25 10:04:08 2013 -0500
     3.3 @@ -1,5 +1,5 @@
     3.4  #
     3.5 -# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
     3.6 +# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
     3.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8  #
     3.9  # This code is free software; you can redistribute it and/or modify it
    3.10 @@ -157,13 +157,11 @@
    3.11  SUBDIRS_C2        = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
    3.12  SUBDIRS_TIERED    = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
    3.13  SUBDIRS_CORE      = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
    3.14 -SUBDIRS_KERNEL    = $(addprefix $(OSNAME)_$(BUILDARCH)_kernel/,$(TARGETS))
    3.15  
    3.16  TARGETS_C2        = $(TARGETS)
    3.17  TARGETS_C1        = $(addsuffix 1,$(TARGETS))
    3.18  TARGETS_TIERED    = $(addsuffix tiered,$(TARGETS))
    3.19  TARGETS_CORE      = $(addsuffix core,$(TARGETS))
    3.20 -TARGETS_KERNEL    = $(addsuffix kernel,$(TARGETS))
    3.21  
    3.22  BUILDTREE_MAKE    = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
    3.23  BUILDTREE_VARS    = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
    3.24 @@ -229,10 +227,6 @@
    3.25  	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
    3.26  	$(BUILDTREE) VARIANT=core
    3.27  
    3.28 -$(SUBDIRS_KERNEL): $(BUILDTREE_MAKE)
    3.29 -	$(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
    3.30 -	$(BUILDTREE) VARIANT=kernel
    3.31 -
    3.32  # Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
    3.33  
    3.34  $(TARGETS_C2):  $(SUBDIRS_C2)
    3.35 @@ -271,20 +265,10 @@
    3.36  	cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
    3.37  endif
    3.38  
    3.39 -$(TARGETS_KERNEL):  $(SUBDIRS_KERNEL)
    3.40 -	cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS)
    3.41 -ifeq ($(TEST_IN_BUILD),true)
    3.42 -	cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && ./test_gamma
    3.43 -endif
    3.44 -ifdef INSTALL
    3.45 -	cd $(OSNAME)_$(BUILDARCH)_kernel/$(patsubst %kernel,%,$@) && $(MAKE) $(MFLAGS) install
    3.46 -endif
    3.47 -
    3.48  # Just build the tree, and nothing else:
    3.49  tree:      $(SUBDIRS_C2)
    3.50  tree1:     $(SUBDIRS_C1)
    3.51  treecore:  $(SUBDIRS_CORE)
    3.52 -treekernel:  $(SUBDIRS_KERNEL)
    3.53  
    3.54  # Doc target.  This is the same for all build options.
    3.55  #     Hence create a docs directory beside ...$(ARCH)_[...]
    3.56 @@ -304,10 +288,10 @@
    3.57  clean_docs:
    3.58  	rm -rf $(SUBDIR_DOCS)
    3.59  
    3.60 -clean_compiler1 clean_compiler2 clean_core clean_kernel:
    3.61 +clean_compiler1 clean_compiler2 clean_core:
    3.62  	rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
    3.63  
    3.64 -clean:  clean_compiler2 clean_compiler1 clean_core clean_docs clean_kernel
    3.65 +clean:  clean_compiler2 clean_compiler1 clean_core clean_docs
    3.66  
    3.67  include $(GAMMADIR)/make/cscope.make
    3.68  

     4.1 --- a/make/solaris/makefiles/dtrace.make	Thu Jan 24 23:30:45 2013 -0800
     4.2 +++ b/make/solaris/makefiles/dtrace.make	Fri Jan 25 10:04:08 2013 -0500
     4.3 @@ -1,5 +1,5 @@
     4.4  #
     4.5 -# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 +# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
     4.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8  #
     4.9  # This code is free software; you can redistribute it and/or modify it
    4.10 @@ -25,10 +25,9 @@
    4.11  # Rules to build jvm_db/dtrace, used by vm.make
    4.12  
    4.13  # We build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
    4.14 -# but not for CORE or KERNEL configurations.
    4.15 +# but not for CORE configuration.
    4.16  
    4.17  ifneq ("${TYPE}", "CORE")
    4.18 -ifneq ("${TYPE}", "KERNEL")
    4.19  
    4.20  ifdef USE_GCC
    4.21  
    4.22 @@ -362,13 +361,6 @@
    4.23  
    4.24  endif # ifdef USE_GCC
    4.25  
    4.26 -else # KERNEL build
    4.27 -
    4.28 -dtraceCheck:
    4.29 -	$(QUIETLY) echo "**NOTICE** Dtrace support disabled for KERNEL builds"
    4.30 -
    4.31 -endif # ifneq ("${TYPE}", "KERNEL")
    4.32 -
    4.33  else # CORE build
    4.34  
    4.35  dtraceCheck:

     5.1 --- a/make/solaris/makefiles/kernel.make	Thu Jan 24 23:30:45 2013 -0800
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,32 +0,0 @@
     5.4 -#
     5.5 -# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
     5.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.7 -#   
     5.8 -# This code is free software; you can redistribute it and/or modify it
     5.9 -# under the terms of the GNU General Public License version 2 only, as
    5.10 -# published by the Free Software Foundation.
    5.11 -#   
    5.12 -# This code is distributed in the hope that it will be useful, but WITHOUT
    5.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    5.14 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    5.15 -# version 2 for more details (a copy is included in the LICENSE file that
    5.16 -# accompanied this code).
    5.17 -#  
    5.18 -# You should have received a copy of the GNU General Public License version
    5.19 -# 2 along with this work; if not, write to the Free Software Foundation,
    5.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    5.21 -#   
    5.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    5.23 -# or visit www.oracle.com if you need additional information or have any
    5.24 -# questions.
    5.25 -#  
    5.26 -#
    5.27 -# 
    5.28 -# Sets make macros for making kernel version of VM.
    5.29 -# This target on solaris is just tempoarily for debugging the kernel build.
    5.30 -
    5.31 -TYPE=KERNEL
    5.32 -
    5.33 -VM_SUBDIR = client
    5.34 -
    5.35 -CFLAGS += -DKERNEL

     6.1 --- a/make/windows/build.bat	Thu Jan 24 23:30:45 2013 -0800
     6.2 +++ b/make/windows/build.bat	Fri Jan 25 10:04:08 2013 -0500
     6.3 @@ -1,6 +1,6 @@
     6.4  @echo off
     6.5  REM
     6.6 -REM Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     6.7 +REM Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     6.8  REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.9  REM
    6.10  REM This code is free software; you can redistribute it and/or modify it
    6.11 @@ -67,7 +67,6 @@
    6.12  
    6.13  :test1
    6.14  if "%2" == "core"      goto test2
    6.15 -if "%2" == "kernel"    goto test2
    6.16  if "%2" == "compiler1" goto test2
    6.17  if "%2" == "compiler2" goto test2
    6.18  if "%2" == "tiered"    goto test2
    6.19 @@ -109,7 +108,7 @@
    6.20  echo.
    6.21  echo where:
    6.22  echo flavor is "product", "debug" or "fastdebug",
    6.23 -echo version is "core", "kernel", "compiler1", "compiler2", or "tiered",
    6.24 +echo version is "core", "compiler1", "compiler2", or "tiered",
    6.25  echo workspace is source directory without trailing slash, 
    6.26  echo bootstrap_dir is a full path to a JDK in which bin/java 
    6.27  echo   and bin/javac are present and working, and build_id is an 

     7.1 --- a/make/windows/create_obj_files.sh	Thu Jan 24 23:30:45 2013 -0800
     7.2 +++ b/make/windows/create_obj_files.sh	Fri Jan 25 10:04:08 2013 -0500
     7.3 @@ -1,5 +1,5 @@
     7.4  #
     7.5 -# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 +# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     7.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8  #
     7.9  # This code is free software; you can redistribute it and/or modify it
    7.10 @@ -107,7 +107,6 @@
    7.11  # Include dirs per type.
    7.12  case "${TYPE}" in
    7.13      "core")      Src_Dirs="${CORE_PATHS}" ;;
    7.14 -    "kernel")    Src_Dirs="${BASE_PATHS} ${COMPILER1_PATHS}" ;;
    7.15      "compiler1") Src_Dirs="${CORE_PATHS} ${COMPILER1_PATHS}" ;;
    7.16      "compiler2") Src_Dirs="${CORE_PATHS} ${COMPILER2_PATHS}" ;;
    7.17      "tiered")    Src_Dirs="${CORE_PATHS} ${COMPILER1_PATHS} ${COMPILER2_PATHS}" ;;
    7.18 @@ -120,16 +119,12 @@
    7.19  SHARK_SPECIFIC_FILES="shark"
    7.20  ZERO_SPECIFIC_FILES="zero"
    7.21  
    7.22 -# These files need to be excluded when building the kernel target.
    7.23 -KERNEL_EXCLUDED_FILES="attachListener.cpp attachListener_windows.cpp metaspaceShared_${Platform_arch_model}.cpp forte.cpp fprofiler.cpp heapDumper.cpp heapInspection.cpp jniCheck.cpp jvmtiCodeBlobEvents.cpp jvmtiExtensions.cpp jvmtiImpl.cpp jvmtiRawMonitor.cpp jvmtiTagMap.cpp jvmtiTrace.cpp vmStructs.cpp g1MemoryPool.cpp psMemoryPool.cpp gcAdaptivePolicyCounters.cpp concurrentGCThread.cpp metaspaceShared.cpp mutableNUMASpace.cpp allocationStats.cpp gSpaceCounters.cpp immutableSpace.cpp mutableSpace.cpp spaceCounters.cpp yieldingWorkgroup.cpp"
    7.24 -
    7.25  # Always exclude these.
    7.26  Src_Files_EXCLUDE="jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp"
    7.27  
    7.28  # Exclude per type.
    7.29  case "${TYPE}" in
    7.30      "core")      Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;;
    7.31 -    "kernel")    Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ${KERNEL_EXCLUDED_FILES} ciTypeFlow.cpp" ;;
    7.32      "compiler1") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;;
    7.33      "compiler2") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;;
    7.34      "tiered")    Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;;

     8.1 --- a/make/windows/makefiles/defs.make	Thu Jan 24 23:30:45 2013 -0800
     8.2 +++ b/make/windows/makefiles/defs.make	Fri Jan 25 10:04:08 2013 -0500
     8.3 @@ -1,5 +1,5 @@
     8.4  #
     8.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
     8.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
     8.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8  #
     8.9  # This code is free software; you can redistribute it and/or modify it
    8.10 @@ -157,7 +157,7 @@
    8.11  MAKE_ARGS += RM="$(RM)"
    8.12  MAKE_ARGS += ZIPEXE=$(ZIPEXE)
    8.13  
    8.14 -# On 32 bit windows we build server, client and kernel, on 64 bit just server.
    8.15 +# On 32 bit windows we build server and client, on 64 bit just server.
    8.16  ifeq ($(JVM_VARIANTS),)
    8.17    ifeq ($(ARCH_DATA_MODEL), 32)
    8.18      JVM_VARIANTS:=client,server
    8.19 @@ -250,7 +250,6 @@
    8.20  
    8.21  EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
    8.22  EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
    8.23 -EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
    8.24  
    8.25  ifeq ($(JVM_VARIANT_SERVER),true)
    8.26    EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
    8.27 @@ -277,18 +276,6 @@
    8.28      endif
    8.29    endif
    8.30  endif
    8.31 -ifeq ($(JVM_VARIANT_KERNEL),true)
    8.32 -  EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
    8.33 -  EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
    8.34 -  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    8.35 -    ifeq ($(ZIP_DEBUGINFO_FILES),1)
    8.36 -      EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.diz
    8.37 -    else
    8.38 -      EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
    8.39 -      EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
    8.40 -    endif
    8.41 -  endif
    8.42 -endif
    8.43  
    8.44  EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
    8.45  

     9.1 --- a/make/windows/makefiles/projectcreator.make	Thu Jan 24 23:30:45 2013 -0800
     9.2 +++ b/make/windows/makefiles/projectcreator.make	Fri Jan 25 10:04:08 2013 -0500
     9.3 @@ -1,5 +1,5 @@
     9.4  #
     9.5 -# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
     9.6 +# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
     9.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8  #
     9.9  # This code is free software; you can redistribute it and/or modify it
    9.10 @@ -167,63 +167,6 @@
    9.11  $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=core)
    9.12  
    9.13  ##################################################
    9.14 -# JKERNEL specific options
    9.15 -##################################################
    9.16 -ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
    9.17 - -define_kernel KERNEL \
    9.18 -$(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=kernel) \
    9.19 - -ignorePath_kernel src/share/vm/gc_implementation/parallelScavenge \
    9.20 - -ignorePath_kernel src/share/vm/gc_implementation/parNew \
    9.21 - -ignorePath_kernel src/share/vm/gc_implementation/concurrentMarkSweep \
    9.22 - -ignorePath_kernel src/share/vm/gc_implementation/g1 \
    9.23 - -ignoreFile_kernel attachListener.cpp \
    9.24 - -ignoreFile_kernel attachListener_windows.cpp \
    9.25 - -ignoreFile_kernel dump.cpp \
    9.26 - -ignoreFile_kernel dump_$(Platform_arch_model).cpp \
    9.27 - -ignoreFile_kernel forte.cpp \
    9.28 - -ignoreFile_kernel fprofiler.cpp \
    9.29 - -ignoreFile_kernel heapDumper.cpp \
    9.30 - -ignoreFile_kernel heapInspection.cpp \
    9.31 - -ignoreFile_kernel jniCheck.cpp \
    9.32 - -ignoreFile_kernel jvmtiCodeBlobEvents.cpp \
    9.33 - -ignoreFile_kernel jvmtiExtensions.cpp \
    9.34 - -ignoreFile_kernel jvmtiImpl.cpp \
    9.35 - -ignoreFile_kernel jvmtiRawMonitor.cpp \
    9.36 - -ignoreFile_kernel jvmtiTagMap.cpp \
    9.37 - -ignoreFile_kernel jvmtiTrace.cpp \
    9.38 - -ignoreFile_kernel jvmtiTrace.hpp \
    9.39 - -ignoreFile_kernel restore.cpp \
    9.40 - -ignoreFile_kernel serialize.cpp \
    9.41 - -ignoreFile_kernel vmStructs.cpp \
    9.42 - -ignoreFile_kernel g1MemoryPool.cpp \
    9.43 - -ignoreFile_kernel g1MemoryPool.hpp \
    9.44 - -ignoreFile_kernel psMemoryPool.cpp \
    9.45 - -ignoreFile_kernel psMemoryPool.hpp \
    9.46 - -ignoreFile_kernel gcAdaptivePolicyCounters.cpp \
    9.47 - -ignoreFile_kernel concurrentGCThread.cpp \
    9.48 - -ignoreFile_kernel mutableNUMASpace.cpp \
    9.49 - -ignoreFile_kernel ciTypeFlow.cpp \
    9.50 - -ignoreFile_kernel ciTypeFlow.hpp \
    9.51 - -ignoreFile_kernel oop.pcgc.inline.hpp \
    9.52 - -ignoreFile_kernel oop.psgc.inline.hpp \
    9.53 - -ignoreFile_kernel allocationStats.cpp \
    9.54 - -ignoreFile_kernel allocationStats.hpp \
    9.55 - -ignoreFile_kernel concurrentGCThread.hpp \
    9.56 - -ignoreFile_kernel gSpaceCounters.cpp \
    9.57 - -ignoreFile_kernel gSpaceCounters.hpp \
    9.58 - -ignoreFile_kernel gcAdaptivePolicyCounters.hpp \
    9.59 - -ignoreFile_kernel immutableSpace.cpp \
    9.60 - -ignoreFile_kernel mutableNUMASpace.hpp \
    9.61 - -ignoreFile_kernel mutableSpace.cpp \
    9.62 - -ignoreFile_kernel spaceCounters.cpp \
    9.63 - -ignoreFile_kernel spaceCounters.hpp \
    9.64 - -ignoreFile_kernel yieldingWorkgroup.cpp \
    9.65 - -ignoreFile_kernel yieldingWorkgroup.hpp \
    9.66 - -ignorePath_kernel vmStructs_ \
    9.67 - -ignoreFile_kernel $(Platform_arch_model).ad \
    9.68 - -additionalFile_kernel gcTaskManager.hpp
    9.69 -
    9.70 -##################################################
    9.71  # Client(C1) compiler specific options
    9.72  ##################################################
    9.73  ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \

    10.1 --- a/make/windows/makefiles/vm.make	Thu Jan 24 23:30:45 2013 -0800
    10.2 +++ b/make/windows/makefiles/vm.make	Fri Jan 25 10:04:08 2013 -0500
    10.3 @@ -1,5 +1,5 @@
    10.4  #
    10.5 -# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    10.6 +# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    10.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8  #
    10.9  # This code is free software; you can redistribute it and/or modify it
   10.10 @@ -44,10 +44,6 @@
   10.11  # No need to define anything, CORE is defined as !COMPILER1 && !COMPILER2
   10.12  !endif
   10.13  
   10.14 -!if "$(Variant)" == "kernel"
   10.15 -CXX_FLAGS=$(CXX_FLAGS) /D "KERNEL"
   10.16 -!endif
   10.17 -
   10.18  !if "$(Variant)" == "compiler1"
   10.19  CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1"
   10.20  !endif

    11.1 --- a/src/cpu/x86/vm/assembler_x86.hpp	Thu Jan 24 23:30:45 2013 -0800
    11.2 +++ b/src/cpu/x86/vm/assembler_x86.hpp	Fri Jan 25 10:04:08 2013 -0500
    11.3 @@ -1,5 +1,5 @@
    11.4  /*
    11.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    11.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    11.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8   *
    11.9   * This code is free software; you can redistribute it and/or modify it
   11.10 @@ -543,7 +543,7 @@
   11.11    // of instructions are freely declared without the need for wrapping them an ifdef.
   11.12    // (Some dangerous instructions are ifdef's out of inappropriate jvm's.)
   11.13    // In the .cpp file the implementations are wrapped so that they are dropped out
   11.14 -  // of the resulting jvm. This is done mostly to keep the footprint of KERNEL
   11.15 +  // of the resulting jvm. This is done mostly to keep the footprint of MINIMAL
   11.16    // to the size it was prior to merging up the 32bit and 64bit assemblers.
   11.17    //
   11.18    // This does mean you'll get a linker/runtime error if you use a 64bit only instruction

    12.1 --- a/src/share/vm/classfile/systemDictionary.cpp	Thu Jan 24 23:30:45 2013 -0800
    12.2 +++ b/src/share/vm/classfile/systemDictionary.cpp	Fri Jan 25 10:04:08 2013 -0500
    12.3 @@ -1199,66 +1199,6 @@
    12.4    return ik;
    12.5  }
    12.6  
    12.7 -#ifdef KERNEL
    12.8 -// Some classes on the bootstrap class path haven't been installed on the
    12.9 -// system yet.  Call the DownloadManager method to make them appear in the
   12.10 -// bootstrap class path and try again to load the named class.
   12.11 -// Note that with delegation class loaders all classes in another loader will
   12.12 -// first try to call this so it'd better be fast!!
   12.13 -static instanceKlassHandle download_and_retry_class_load(
   12.14 -                                                    Symbol* class_name,
   12.15 -                                                    TRAPS) {
   12.16 -
   12.17 -  Klass* dlm = SystemDictionary::DownloadManager_klass();
   12.18 -  instanceKlassHandle nk;
   12.19 -
   12.20 -  // If download manager class isn't loaded just return.
   12.21 -  if (dlm == NULL) return nk;
   12.22 -
   12.23 -  { HandleMark hm(THREAD);
   12.24 -    ResourceMark rm(THREAD);
   12.25 -    Handle s = java_lang_String::create_from_symbol(class_name, CHECK_(nk));
   12.26 -    Handle class_string = java_lang_String::externalize_classname(s, CHECK_(nk));
   12.27 -
   12.28 -    // return value
   12.29 -    JavaValue result(T_OBJECT);
   12.30 -
   12.31 -    // Call the DownloadManager.  We assume that it has a lock because
   12.32 -    // multiple classes could be not found and downloaded at the same time.
   12.33 -    // class sun.misc.DownloadManager;
   12.34 -    // public static String getBootClassPathEntryForClass(String className);
   12.35 -    JavaCalls::call_static(&result,
   12.36 -                       KlassHandle(THREAD, dlm),
   12.37 -                       vmSymbols::getBootClassPathEntryForClass_name(),
   12.38 -                       vmSymbols::string_string_signature(),
   12.39 -                       class_string,
   12.40 -                       CHECK_(nk));
   12.41 -
   12.42 -    // Get result.string and add to bootclasspath
   12.43 -    assert(result.get_type() == T_OBJECT, "just checking");
   12.44 -    oop obj = (oop) result.get_jobject();
   12.45 -    if (obj == NULL) { return nk; }
   12.46 -
   12.47 -    Handle h_obj(THREAD, obj);
   12.48 -    char* new_class_name = java_lang_String::as_platform_dependent_str(h_obj,
   12.49 -                                                                  CHECK_(nk));
   12.50 -
   12.51 -    // lock the loader
   12.52 -    // we use this lock because JVMTI does.
   12.53 -    Handle loader_lock(THREAD, SystemDictionary::system_loader_lock());
   12.54 -
   12.55 -    ObjectLocker ol(loader_lock, THREAD);
   12.56 -    // add the file to the bootclasspath
   12.57 -    ClassLoader::update_class_path_entry_list(new_class_name, true);
   12.58 -  } // end HandleMark
   12.59 -
   12.60 -  if (TraceClassLoading) {
   12.61 -    ClassLoader::print_bootclasspath();
   12.62 -  }
   12.63 -  return ClassLoader::load_classfile(class_name, CHECK_(nk));
   12.64 -}
   12.65 -#endif // KERNEL
   12.66 -
   12.67  
   12.68  instanceKlassHandle SystemDictionary::load_instance_class(Symbol* class_name, Handle class_loader, TRAPS) {
   12.69    instanceKlassHandle nh = instanceKlassHandle(); // null Handle
   12.70 @@ -1278,15 +1218,6 @@
   12.71        k = ClassLoader::load_classfile(class_name, CHECK_(nh));
   12.72      }
   12.73  
   12.74 -#ifdef KERNEL
   12.75 -    // If the VM class loader has failed to load the class, call the
   12.76 -    // DownloadManager class to make it magically appear on the classpath
   12.77 -    // and try again.  This is only configured with the Kernel VM.
   12.78 -    if (k.is_null()) {
   12.79 -      k = download_and_retry_class_load(class_name, CHECK_(nh));
   12.80 -    }
   12.81 -#endif // KERNEL
   12.82 -
   12.83      // find_or_define_instance_class may return a different InstanceKlass
   12.84      if (!k.is_null()) {
   12.85        k = find_or_define_instance_class(class_name, class_loader, k, CHECK_(nh));
   12.86 @@ -1822,13 +1753,7 @@
   12.87    Symbol* symbol = vmSymbols::symbol_at((vmSymbols::SID)sid);
   12.88    Klass**    klassp = &_well_known_klasses[id];
   12.89    bool must_load = (init_opt < SystemDictionary::Opt);
   12.90 -  bool try_load  = true;
   12.91 -  if (init_opt == SystemDictionary::Opt_Kernel) {
   12.92 -#ifndef KERNEL
   12.93 -    try_load = false;
   12.94 -#endif //KERNEL
   12.95 -  }
   12.96 -  if ((*klassp) == NULL && try_load) {
   12.97 +  if ((*klassp) == NULL) {
   12.98      if (must_load) {
   12.99        (*klassp) = resolve_or_fail(symbol, true, CHECK_0); // load required class
  12.100      } else {
  12.101 @@ -1918,12 +1843,6 @@
  12.102    //_box_klasses[T_OBJECT]  = WK_KLASS(object_klass);
  12.103    //_box_klasses[T_ARRAY]   = WK_KLASS(object_klass);
  12.104  
  12.105 -#ifdef KERNEL
  12.106 -  if (DownloadManager_klass() == NULL) {
  12.107 -    warning("Cannot find sun/jkernel/DownloadManager");
  12.108 -  }
  12.109 -#endif // KERNEL
  12.110 -
  12.111    { // Compute whether we should use loadClass or loadClassInternal when loading classes.
  12.112      Method* method = InstanceKlass::cast(ClassLoader_klass())->find_method(vmSymbols::loadClassInternal_name(), vmSymbols::string_class_signature());
  12.113      _has_loadClassInternal = (method != NULL);

    13.1 --- a/src/share/vm/classfile/systemDictionary.hpp	Thu Jan 24 23:30:45 2013 -0800
    13.2 +++ b/src/share/vm/classfile/systemDictionary.hpp	Fri Jan 25 10:04:08 2013 -0500
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it
   13.10 @@ -168,8 +168,6 @@
   13.11    /* It's okay if this turns out to be NULL in non-1.4 JDKs. */                                                          \
   13.12    do_klass(nio_Buffer_klass,                            java_nio_Buffer,                           Opt                 ) \
   13.13                                                                                                                           \
   13.14 -  do_klass(DownloadManager_klass,                       sun_jkernel_DownloadManager,               Opt_Kernel          ) \
   13.15 -                                                                                                                         \
   13.16    do_klass(PostVMInitHook_klass,                        sun_misc_PostVMInitHook,                   Opt                 ) \
   13.17                                                                                                                           \
   13.18    /* Preload boxing klasses */                                                                                           \
   13.19 @@ -211,7 +209,6 @@
   13.20      Opt,                        // preload tried; NULL if not present
   13.21      Opt_Only_JDK14NewRef,       // preload tried; use only with NewReflection
   13.22      Opt_Only_JDK15,             // preload tried; use only with JDK1.5+
   13.23 -    Opt_Kernel,                 // preload tried only #ifdef KERNEL
   13.24      OPTION_LIMIT,
   13.25      CEIL_LG_OPTION_LIMIT = 4    // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT)
   13.26    };
   13.27 @@ -394,7 +391,6 @@
   13.28    static Klass* check_klass_Pre(       Klass* k) { return check_klass(k); }
   13.29    static Klass* check_klass_Pre_JSR292(Klass* k) { return EnableInvokeDynamic ? check_klass(k) : k; }
   13.30    static Klass* check_klass_Opt(       Klass* k) { return k; }
   13.31 -  static Klass* check_klass_Opt_Kernel(Klass* k) { return k; } //== Opt
   13.32    static Klass* check_klass_Opt_Only_JDK15(Klass* k) {
   13.33      assert(JDK_Version::is_gte_jdk15x_version(), "JDK 1.5 only");
   13.34      return k;

    14.1 --- a/src/share/vm/classfile/vmSymbols.hpp	Thu Jan 24 23:30:45 2013 -0800
    14.2 +++ b/src/share/vm/classfile/vmSymbols.hpp	Fri Jan 25 10:04:08 2013 -0500
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it
   14.10 @@ -108,7 +108,6 @@
   14.11    template(java_lang_Compiler,                        "java/lang/Compiler")                       \
   14.12    template(sun_misc_Signal,                           "sun/misc/Signal")                          \
   14.13    template(java_lang_AssertionStatusDirectives,       "java/lang/AssertionStatusDirectives")      \
   14.14 -  template(sun_jkernel_DownloadManager,               "sun/jkernel/DownloadManager")              \
   14.15    template(getBootClassPathEntryForClass_name,        "getBootClassPathEntryForClass")            \
   14.16    template(sun_misc_PostVMInitHook,                   "sun/misc/PostVMInitHook")                  \
   14.17    template(sun_misc_Launcher_ExtClassLoader,          "sun/misc/Launcher$ExtClassLoader")         \

    15.1 --- a/src/share/vm/prims/jniCheck.hpp	Thu Jan 24 23:30:45 2013 -0800
    15.2 +++ b/src/share/vm/prims/jniCheck.hpp	Fri Jan 25 10:04:08 2013 -0500
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -25,9 +25,7 @@
   15.11  #ifndef SHARE_VM_PRIMS_JNICHECK_HPP
   15.12  #define SHARE_VM_PRIMS_JNICHECK_HPP
   15.13  
   15.14 -#ifndef KERNEL
   15.15  #include "runtime/thread.hpp"
   15.16 -#endif
   15.17  
   15.18  extern "C" {
   15.19    // Report a JNI failure caught by -Xcheck:jni.  Perform a core dump.

    16.1 --- a/src/share/vm/prims/jvm.cpp	Thu Jan 24 23:30:45 2013 -0800
    16.2 +++ b/src/share/vm/prims/jvm.cpp	Fri Jan 25 10:04:08 2013 -0500
    16.3 @@ -4519,10 +4519,6 @@
    16.4    // consider to expose this new capability in the sun.rt.jvmCapabilities jvmstat
    16.5    // counter defined in runtimeService.cpp.
    16.6    info->is_attachable = AttachListener::is_attach_supported();
    16.7 -#ifdef KERNEL
    16.8 -  info->is_kernel_jvm = 1; // true;
    16.9 -#else  // KERNEL
   16.10    info->is_kernel_jvm = 0; // false;
   16.11 -#endif // KERNEL
   16.12  }
   16.13  JVM_END

    17.1 --- a/src/share/vm/prims/jvmtiCodeBlobEvents.hpp	Thu Jan 24 23:30:45 2013 -0800
    17.2 +++ b/src/share/vm/prims/jvmtiCodeBlobEvents.hpp	Fri Jan 25 10:04:08 2013 -0500
    17.3 @@ -1,5 +1,5 @@
    17.4  /*
    17.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    17.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    17.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.8   *
    17.9   * This code is free software; you can redistribute it and/or modify it
   17.10 @@ -25,9 +25,7 @@
   17.11  #ifndef SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP
   17.12  #define SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP
   17.13  
   17.14 -#ifndef JVMTI_KERNEL
   17.15  #include "jvmtifiles/jvmti.h"
   17.16 -#endif
   17.17  
   17.18  // forward declaration
   17.19  class JvmtiEnv;

    18.1 --- a/src/share/vm/prims/jvmtiEnv.cpp	Thu Jan 24 23:30:45 2013 -0800
    18.2 +++ b/src/share/vm/prims/jvmtiEnv.cpp	Fri Jan 25 10:04:08 2013 -0500
    18.3 @@ -1,5 +1,5 @@
    18.4  /*
    18.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    18.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    18.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8   *
    18.9   * This code is free software; you can redistribute it and/or modify it
   18.10 @@ -647,8 +647,6 @@
   18.11    return JVMTI_ERROR_NONE;
   18.12  } /* end GetJLocationFormat */
   18.13  
   18.14 -#ifndef JVMTI_KERNEL
   18.15 -
   18.16    //
   18.17    // Thread functions
   18.18    //
   18.19 @@ -3436,5 +3434,3 @@
   18.20    }
   18.21    return err;
   18.22  } /* end SetSystemProperty */
   18.23 -
   18.24 -#endif // !JVMTI_KERNEL

    19.1 --- a/src/share/vm/prims/jvmtiEnvBase.cpp	Thu Jan 24 23:30:45 2013 -0800
    19.2 +++ b/src/share/vm/prims/jvmtiEnvBase.cpp	Fri Jan 25 10:04:08 2013 -0500
    19.3 @@ -1,5 +1,5 @@
    19.4  /*
    19.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    19.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    19.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.8   *
    19.9   * This code is free software; you can redistribute it and/or modify it
   19.10 @@ -74,10 +74,8 @@
   19.11  
   19.12    JvmtiManageCapabilities::initialize();
   19.13  
   19.14 -#ifndef JVMTI_KERNEL
   19.15    // register extension functions and events
   19.16    JvmtiExtensions::register_extensions();
   19.17 -#endif // !JVMTI_KERNEL
   19.18  
   19.19  #ifdef JVMTI_TRACE
   19.20    JvmtiTrace::initialize();
   19.21 @@ -236,14 +234,12 @@
   19.22    // Same situation as with events (see above)
   19.23    set_native_method_prefixes(0, NULL);
   19.24  
   19.25 -#ifndef JVMTI_KERNEL
   19.26    JvmtiTagMap* tag_map_to_deallocate = _tag_map;
   19.27    set_tag_map(NULL);
   19.28    // A tag map can be big, deallocate it now
   19.29    if (tag_map_to_deallocate != NULL) {
   19.30      delete tag_map_to_deallocate;
   19.31    }
   19.32 -#endif // !JVMTI_KERNEL
   19.33  
   19.34    _needs_clean_up = true;
   19.35  }
   19.36 @@ -255,14 +251,12 @@
   19.37    // There is a small window of time during which the tag map of a
   19.38    // disposed environment could have been reallocated.
   19.39    // Make sure it is gone.
   19.40 -#ifndef JVMTI_KERNEL
   19.41    JvmtiTagMap* tag_map_to_deallocate = _tag_map;
   19.42    set_tag_map(NULL);
   19.43    // A tag map can be big, deallocate it now
   19.44    if (tag_map_to_deallocate != NULL) {
   19.45      delete tag_map_to_deallocate;
   19.46    }
   19.47 -#endif // !JVMTI_KERNEL
   19.48  
   19.49    _magic = BAD_MAGIC;
   19.50  }
   19.51 @@ -593,8 +587,6 @@
   19.52    return (jclass)jni_reference(k->java_mirror());
   19.53  }
   19.54  
   19.55 -#ifndef JVMTI_KERNEL
   19.56 -
   19.57  //
   19.58  // Field Information
   19.59  //
   19.60 @@ -1482,5 +1474,3 @@
   19.61      }
   19.62    }
   19.63  }
   19.64 -
   19.65 -#endif // !JVMTI_KERNEL

    20.1 --- a/src/share/vm/prims/jvmtiExport.cpp	Thu Jan 24 23:30:45 2013 -0800
    20.2 +++ b/src/share/vm/prims/jvmtiExport.cpp	Fri Jan 25 10:04:08 2013 -0500
    20.3 @@ -1,5 +1,5 @@
    20.4  /*
    20.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    20.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    20.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.8   *
    20.9   * This code is free software; you can redistribute it and/or modify it
   20.10 @@ -677,7 +677,6 @@
   20.11  }
   20.12  
   20.13  
   20.14 -#ifndef JVMTI_KERNEL
   20.15  static inline Klass* oop_to_klass(oop obj) {
   20.16    Klass* k = obj->klass();
   20.17  
   20.18 @@ -2178,7 +2177,6 @@
   20.19    typedef jint (JNICALL *OnAttachEntry_t)(JavaVM*, char *, void *);
   20.20  }
   20.21  
   20.22 -#ifndef SERVICES_KERNEL
   20.23  jint JvmtiExport::load_agent_library(AttachOperation* op, outputStream* st) {
   20.24    char ebuf[1024];
   20.25    char buffer[JVM_MAXPATHLEN];
   20.26 @@ -2259,7 +2257,6 @@
   20.27    }
   20.28    return result;
   20.29  }
   20.30 -#endif // SERVICES_KERNEL
   20.31  
   20.32  ////////////////////////////////////////////////////////////////////////////////////////////////
   20.33  
   20.34 @@ -2457,4 +2454,3 @@
   20.35      JvmtiExport::post_garbage_collection_finish();
   20.36    }
   20.37  }
   20.38 -#endif // JVMTI_KERNEL

    21.1 --- a/src/share/vm/prims/jvmtiExtensions.hpp	Thu Jan 24 23:30:45 2013 -0800
    21.2 +++ b/src/share/vm/prims/jvmtiExtensions.hpp	Fri Jan 25 10:04:08 2013 -0500
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it
   21.10 @@ -25,11 +25,9 @@
   21.11  #ifndef SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
   21.12  #define SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
   21.13  
   21.14 -#ifndef JVMTI_KERNEL
   21.15  #include "jvmtifiles/jvmti.h"
   21.16  #include "jvmtifiles/jvmtiEnv.hpp"
   21.17  #include "memory/allocation.hpp"
   21.18 -#endif
   21.19  
   21.20  // JvmtiExtensions
   21.21  //

    22.1 --- a/src/share/vm/prims/jvmtiImpl.cpp	Thu Jan 24 23:30:45 2013 -0800
    22.2 +++ b/src/share/vm/prims/jvmtiImpl.cpp	Fri Jan 25 10:04:08 2013 -0500
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it
   22.10 @@ -905,8 +905,6 @@
   22.11  #endif
   22.12  }
   22.13  
   22.14 -#ifndef KERNEL
   22.15 -
   22.16  JvmtiDeferredEvent JvmtiDeferredEvent::compiled_method_load_event(
   22.17      nmethod* nm) {
   22.18    JvmtiDeferredEvent event = JvmtiDeferredEvent(TYPE_COMPILED_METHOD_LOAD);
   22.19 @@ -1098,5 +1096,3 @@
   22.20      }
   22.21    }
   22.22  }
   22.23 -
   22.24 -#endif // ndef KERNEL

    23.1 --- a/src/share/vm/prims/jvmtiImpl.hpp	Thu Jan 24 23:30:45 2013 -0800
    23.2 +++ b/src/share/vm/prims/jvmtiImpl.hpp	Fri Jan 25 10:04:08 2013 -0500
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it
   23.10 @@ -25,8 +25,6 @@
   23.11  #ifndef SHARE_VM_PRIMS_JVMTIIMPL_HPP
   23.12  #define SHARE_VM_PRIMS_JVMTIIMPL_HPP
   23.13  
   23.14 -#ifndef JVMTI_KERNEL
   23.15 -
   23.16  #include "classfile/systemDictionary.hpp"
   23.17  #include "jvmtifiles/jvmti.h"
   23.18  #include "oops/objArrayOop.hpp"
   23.19 @@ -435,7 +433,6 @@
   23.20    static void print();
   23.21  };
   23.22  
   23.23 -#endif // !JVMTI_KERNEL
   23.24  
   23.25  /**
   23.26   * When a thread (such as the compiler thread or VM thread) cannot post a

    24.1 --- a/src/share/vm/prims/jvmtiRawMonitor.hpp	Thu Jan 24 23:30:45 2013 -0800
    24.2 +++ b/src/share/vm/prims/jvmtiRawMonitor.hpp	Fri Jan 25 10:04:08 2013 -0500
    24.3 @@ -1,5 +1,5 @@
    24.4  /*
    24.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    24.6 + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    24.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.8   *
    24.9   * This code is free software; you can redistribute it and/or modify it
   24.10 @@ -25,10 +25,8 @@
   24.11  #ifndef SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP
   24.12  #define SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP
   24.13  
   24.14 -#ifndef JVMTI_KERNEL
   24.15  #include "runtime/objectMonitor.hpp"
   24.16  #include "utilities/growableArray.hpp"
   24.17 -#endif
   24.18  
   24.19  //
   24.20  // class JvmtiRawMonitor

    25.1 --- a/src/share/vm/prims/jvmtiRedefineClasses.cpp	Thu Jan 24 23:30:45 2013 -0800
    25.2 +++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp	Fri Jan 25 10:04:08 2013 -0500
    25.3 @@ -3104,11 +3104,9 @@
    25.4    Klass* the_class_oop = java_lang_Class::as_Klass(the_class_mirror);
    25.5    instanceKlassHandle the_class = instanceKlassHandle(THREAD, the_class_oop);
    25.6  
    25.7 -#ifndef JVMTI_KERNEL
    25.8    // Remove all breakpoints in methods of this class
    25.9    JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints();
   25.10    jvmti_breakpoints.clearall_in_class_at_safepoint(the_class_oop);
   25.11 -#endif // !JVMTI_KERNEL
   25.12  
   25.13    if (the_class_oop == Universe::reflect_invoke_cache()->klass()) {
   25.14      // We are redefining java.lang.reflect.Method. Method.invoke() is

    26.1 --- a/src/share/vm/prims/jvmtiTagMap.hpp	Thu Jan 24 23:30:45 2013 -0800
    26.2 +++ b/src/share/vm/prims/jvmtiTagMap.hpp	Fri Jan 25 10:04:08 2013 -0500
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it
   26.10 @@ -27,14 +27,12 @@
   26.11  #ifndef SHARE_VM_PRIMS_JVMTITAGMAP_HPP
   26.12  #define SHARE_VM_PRIMS_JVMTITAGMAP_HPP
   26.13  
   26.14 -#ifndef JVMTI_KERNEL
   26.15  #include "gc_interface/collectedHeap.hpp"
   26.16  #include "jvmtifiles/jvmti.h"
   26.17  #include "jvmtifiles/jvmtiEnv.hpp"
   26.18  #include "memory/allocation.hpp"
   26.19  #include "memory/genCollectedHeap.hpp"
   26.20  #include "memory/universe.hpp"
   26.21 -#endif
   26.22  
   26.23  // forward references
   26.24  class JvmtiTagHashmap;

    27.1 --- a/src/share/vm/runtime/arguments.cpp	Thu Jan 24 23:30:45 2013 -0800
    27.2 +++ b/src/share/vm/runtime/arguments.cpp	Fri Jan 25 10:04:08 2013 -0500
    27.3 @@ -2472,10 +2472,7 @@
    27.4  
    27.5      // -Xshare:dump
    27.6      } else if (match_option(option, "-Xshare:dump", &tail)) {
    27.7 -#if defined(KERNEL)
    27.8 -      vm_exit_during_initialization(
    27.9 -          "Dumping a shared archive is not supported on the Kernel JVM.", NULL);
   27.10 -#elif !INCLUDE_CDS
   27.11 +#if !INCLUDE_CDS
   27.12        vm_exit_during_initialization(
   27.13            "Dumping a shared archive is not supported in this VM.", NULL);
   27.14  #else
   27.15 @@ -3463,36 +3460,6 @@
   27.16    PropertyList_add(plist, k, v);
   27.17  }
   27.18  
   27.19 -#ifdef KERNEL
   27.20 -char *Arguments::get_kernel_properties() {
   27.21 -  // Find properties starting with kernel and append them to string
   27.22 -  // We need to find out how long they are first because the URL's that they
   27.23 -  // might point to could get long.
   27.24 -  int length = 0;
   27.25 -  SystemProperty* prop;
   27.26 -  for (prop = _system_properties; prop != NULL; prop = prop->next()) {
   27.27 -    if (strncmp(prop->key(), "kernel.", 7 ) == 0) {
   27.28 -      length += (strlen(prop->key()) + strlen(prop->value()) + 5);  // "-D ="
   27.29 -    }
   27.30 -  }
   27.31 -  // Add one for null terminator.
   27.32 -  char *props = AllocateHeap(length + 1, mtInternal);
   27.33 -  if (length != 0) {
   27.34 -    int pos = 0;
   27.35 -    for (prop = _system_properties; prop != NULL; prop = prop->next()) {
   27.36 -      if (strncmp(prop->key(), "kernel.", 7 ) == 0) {
   27.37 -        jio_snprintf(&props[pos], length-pos,
   27.38 -                     "-D%s=%s ", prop->key(), prop->value());
   27.39 -        pos = strlen(props);
   27.40 -      }
   27.41 -    }
   27.42 -  }
   27.43 -  // null terminate props in case of null
   27.44 -  props[length] = '\0';
   27.45 -  return props;
   27.46 -}
   27.47 -#endif // KERNEL
   27.48 -
   27.49  // Copies src into buf, replacing "%%" with "%" and "%p" with pid
   27.50  // Returns true if all of the source pointed by src has been copied over to
   27.51  // the destination buffer pointed by buf. Otherwise, returns false.

    28.1 --- a/src/share/vm/runtime/arguments.hpp	Thu Jan 24 23:30:45 2013 -0800
    28.2 +++ b/src/share/vm/runtime/arguments.hpp	Fri Jan 25 10:04:08 2013 -0500
    28.3 @@ -1,5 +1,5 @@
    28.4  /*
    28.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    28.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    28.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8   *
    28.9   * This code is free software; you can redistribute it and/or modify it
   28.10 @@ -540,11 +540,6 @@
   28.11  
   28.12    // Utility: copies src into buf, replacing "%%" with "%" and "%p" with pid.
   28.13    static bool copy_expand_pid(const char* src, size_t srclen, char* buf, size_t buflen);
   28.14 -
   28.15 -#ifdef KERNEL
   28.16 -  // For java kernel vm, return property string for kernel properties.
   28.17 -  static char *get_kernel_properties();
   28.18 -#endif // KERNEL
   28.19  };
   28.20  
   28.21  #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP

    29.1 --- a/src/share/vm/runtime/thread.cpp	Thu Jan 24 23:30:45 2013 -0800
    29.2 +++ b/src/share/vm/runtime/thread.cpp	Fri Jan 25 10:04:08 2013 -0500
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -3739,28 +3739,6 @@
   29.11                               name)) {
   29.12          library = os::dll_load(buffer, ebuf, sizeof ebuf);
   29.13        }
   29.14 -#ifdef KERNEL
   29.15 -      // Download instrument dll
   29.16 -      if (library == NULL && strcmp(name, "instrument") == 0) {
   29.17 -        char *props = Arguments::get_kernel_properties();
   29.18 -        char *home  = Arguments::get_java_home();
   29.19 -        const char *fmt   = "%s/bin/java %s -Dkernel.background.download=false"
   29.20 -                      " sun.jkernel.DownloadManager -download client_jvm";
   29.21 -        size_t length = strlen(props) + strlen(home) + strlen(fmt) + 1;
   29.22 -        char *cmd = NEW_C_HEAP_ARRAY(char, length, mtThread);
   29.23 -        jio_snprintf(cmd, length, fmt, home, props);
   29.24 -        int status = os::fork_and_exec(cmd);
   29.25 -        FreeHeap(props);
   29.26 -        if (status == -1) {
   29.27 -          warning(cmd);
   29.28 -          vm_exit_during_initialization("fork_and_exec failed: %s",
   29.29 -                                         strerror(errno));
   29.30 -        }
   29.31 -        FREE_C_HEAP_ARRAY(char, cmd, mtThread);
   29.32 -        // when this comes back the instrument.dll should be where it belongs.
   29.33 -        library = os::dll_load(buffer, ebuf, sizeof ebuf);
   29.34 -      }
   29.35 -#endif // KERNEL
   29.36        if (library == NULL) { // Try the local directory
   29.37          char ns[1] = {0};
   29.38          if (os::dll_build_name(buffer, sizeof(buffer), ns, name)) {

    30.1 --- a/src/share/vm/runtime/vmStructs.hpp	Thu Jan 24 23:30:45 2013 -0800
    30.2 +++ b/src/share/vm/runtime/vmStructs.hpp	Fri Jan 25 10:04:08 2013 -0500
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it
   30.10 @@ -25,9 +25,7 @@
   30.11  #ifndef SHARE_VM_RUNTIME_VMSTRUCTS_HPP
   30.12  #define SHARE_VM_RUNTIME_VMSTRUCTS_HPP
   30.13  
   30.14 -#ifndef VM_STRUCTS_KERNEL
   30.15  #include "utilities/debug.hpp"
   30.16 -#endif
   30.17  #ifdef COMPILER1
   30.18  #include "c1/c1_Runtime1.hpp"
   30.19  #endif

    31.1 --- a/src/share/vm/runtime/vm_version.cpp	Thu Jan 24 23:30:45 2013 -0800
    31.2 +++ b/src/share/vm/runtime/vm_version.cpp	Fri Jan 25 10:04:08 2013 -0500
    31.3 @@ -1,5 +1,5 @@
    31.4  /*
    31.5 - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
    31.6 + * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    31.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.8   *
    31.9   * This code is free software; you can redistribute it and/or modify it
   31.10 @@ -111,9 +111,6 @@
   31.11  #endif
   31.12  
   31.13  #ifndef VMTYPE
   31.14 -  #ifdef KERNEL
   31.15 -    #define VMTYPE "Kernel"
   31.16 -  #else // KERNEL
   31.17    #ifdef TIERED
   31.18      #define VMTYPE "Server"
   31.19    #else // TIERED
   31.20 @@ -128,7 +125,6 @@
   31.21                      COMPILER2_PRESENT("Server")
   31.22    #endif // ZERO
   31.23    #endif // TIERED
   31.24 -  #endif // KERNEL
   31.25  #endif
   31.26  
   31.27  #ifndef HOTSPOT_VM_DISTRO

    32.1 --- a/src/share/vm/services/attachListener.cpp	Thu Jan 24 23:30:45 2013 -0800
    32.2 +++ b/src/share/vm/services/attachListener.cpp	Fri Jan 25 10:04:08 2013 -0500
    32.3 @@ -1,5 +1,5 @@
    32.4  /*
    32.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    32.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    32.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.8   *
    32.9   * This code is free software; you can redistribute it and/or modify it
   32.10 @@ -170,7 +170,6 @@
   32.11    return JNI_OK;
   32.12  }
   32.13  
   32.14 -#ifndef SERVICES_KERNEL   // Heap dumping not supported
   32.15  // Implementation of "dumpheap" command.
   32.16  // See also: HeapDumpDCmd class
   32.17  //
   32.18 @@ -212,7 +211,6 @@
   32.19    }
   32.20    return JNI_OK;
   32.21  }
   32.22 -#endif // SERVICES_KERNEL
   32.23  
   32.24  // Implementation of "inspectheap" command
   32.25  // See also: ClassHistogramDCmd class
   32.26 @@ -382,9 +380,7 @@
   32.27  static AttachOperationFunctionInfo funcs[] = {
   32.28    { "agentProperties",  get_agent_properties },
   32.29    { "datadump",         data_dump },
   32.30 -#ifndef SERVICES_KERNEL
   32.31    { "dumpheap",         dump_heap },
   32.32 -#endif  // SERVICES_KERNEL
   32.33    { "load",             JvmtiExport::load_agent_library },
   32.34    { "properties",       get_system_properties },
   32.35    { "threaddump",       thread_dump },

    33.1 --- a/src/share/vm/services/attachListener.hpp	Thu Jan 24 23:30:45 2013 -0800
    33.2 +++ b/src/share/vm/services/attachListener.hpp	Fri Jan 25 10:04:08 2013 -0500
    33.3 @@ -1,5 +1,5 @@
    33.4  /*
    33.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    33.6 + * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    33.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.8   *
    33.9   * This code is free software; you can redistribute it and/or modify it
   33.10 @@ -38,8 +38,6 @@
   33.11  // complets the result value and any result data is returned to the client
   33.12  // tool.
   33.13  
   33.14 -#ifndef SERVICES_KERNEL
   33.15 -
   33.16  class AttachOperation;
   33.17  
   33.18  typedef jint (*AttachOperationFunction)(AttachOperation* op, outputStream* out);
   33.19 @@ -48,7 +46,6 @@
   33.20    const char* name;
   33.21    AttachOperationFunction func;
   33.22  };
   33.23 -#endif // SERVICES_KERNEL
   33.24  
   33.25  class AttachListener: AllStatic {
   33.26   public: