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 \
