1.1 --- a/make/windows/makefiles/defs.make Thu Jan 24 23:30:45 2013 -0800 1.2 +++ b/make/windows/makefiles/defs.make Fri Jan 25 10:04:08 2013 -0500 1.3 @@ -1,5 +1,5 @@ 1.4 # 1.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 +# Copyright (c) 2006, 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 @@ -157,7 +157,7 @@ 1.11 MAKE_ARGS += RM="$(RM)" 1.12 MAKE_ARGS += ZIPEXE=$(ZIPEXE) 1.13 1.14 -# On 32 bit windows we build server, client and kernel, on 64 bit just server. 1.15 +# On 32 bit windows we build server and client, on 64 bit just server. 1.16 ifeq ($(JVM_VARIANTS),) 1.17 ifeq ($(ARCH_DATA_MODEL), 32) 1.18 JVM_VARIANTS:=client,server 1.19 @@ -250,7 +250,6 @@ 1.20 1.21 EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server 1.22 EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client 1.23 -EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel 1.24 1.25 ifeq ($(JVM_VARIANT_SERVER),true) 1.26 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 1.27 @@ -277,18 +276,6 @@ 1.28 endif 1.29 endif 1.30 endif 1.31 -ifeq ($(JVM_VARIANT_KERNEL),true) 1.32 - EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt 1.33 - EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX) 1.34 - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 1.35 - ifeq ($(ZIP_DEBUGINFO_FILES),1) 1.36 - EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.diz 1.37 - else 1.38 - EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb 1.39 - EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map 1.40 - endif 1.41 - endif 1.42 -endif 1.43 1.44 EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar 1.45