Mercurial > hg > jdk9-shenandoah
changeset 1175:7e3512dae8e0 jdk9-b32
Merge
author | lana |
---|---|
date | Thu, 18 Sep 2014 13:26:57 -0700 |
parents | 9918cd2de40d (current diff) d1d2ca914d49 (diff) |
children | e1e5dd0de2e8 0937ce5890bc 36d6ab4de4db |
files | make/common/modules.list |
diffstat | 12 files changed, 82 insertions(+), 85 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Wed Sep 17 22:55:49 2014 -0700 +++ b/Makefile Thu Sep 18 13:26:57 2014 -0700 @@ -70,8 +70,8 @@ # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. all_phony_targets := $(sort $(filter-out $(global_targets), $(strip $(shell \ - cd $(root_dir)/make && $(MAKE) -f Main.gmk -p -q FRC SPEC=$(firstword $(SPEC)) | \ - grep "^.PHONY:" | head -n 1 | cut -d " " -f 2-)))) + cd $(root_dir)/make && $(MAKE) -f Main.gmk -p -q FRC SPEC=$(firstword $(SPEC)) \ + -I $(root_dir)/make/common | grep "^.PHONY:" | head -n 1 | cut -d " " -f 2-)))) # Loop through the configurations and call the main-wrapper for each one. The wrapper # target will execute with a single configuration loaded. @@ -115,12 +115,12 @@ main-wrapper: ifneq ($(SEQUENTIAL_TARGETS), ) - (cd $(root_dir)/make && $(MAKE) -f Main.gmk SPEC=$(SPEC) -j 1 \ + (cd $(SRC_ROOT)/make && $(MAKE) -f Main.gmk SPEC=$(SPEC) -j 1 \ $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $(SEQUENTIAL_TARGETS)) endif ifneq ($(PARALLEL_TARGETS), ) @$(call AtMakeStart) - (cd $(root_dir)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -f Main.gmk SPEC=$(SPEC) -j $(JOBS) \ + (cd $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) -f Main.gmk SPEC=$(SPEC) -j $(JOBS) \ $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $(PARALLEL_TARGETS) \ $(if $(filter true, $(OUTPUT_SYNC_SUPPORTED)), -O$(OUTPUT_SYNC))) @$(call AtMakeEnd)
--- a/common/autoconf/generated-configure.sh Wed Sep 17 22:55:49 2014 -0700 +++ b/common/autoconf/generated-configure.sh Thu Sep 18 13:26:57 2014 -0700 @@ -4327,7 +4327,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1410377275 +DATE_WHEN_GENERATED=1410791401 ############################################################################### # @@ -14642,7 +14642,7 @@ FASTDEBUG="false" DEBUG_CLASSFILES="true" BUILD_VARIANT_RELEASE="-debug" - HOTSPOT_DEBUG_LEVEL="jvmg" + HOTSPOT_DEBUG_LEVEL="debug" HOTSPOT_EXPORT="debug" ;; optimized )
--- a/common/autoconf/hotspot-spec.gmk.in Wed Sep 17 22:55:49 2014 -0700 +++ b/common/autoconf/hotspot-spec.gmk.in Thu Sep 18 13:26:57 2014 -0700 @@ -97,8 +97,6 @@ endif HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@ @STATIC_CXX_SETTING@ -# This is used from the libjvm build for C/C++ code. -HOTSPOT_BUILD_JOBS:=$(JOBS) # Control wether Hotspot runs Queens test after building TEST_IN_BUILD=@TEST_IN_BUILD@
--- a/common/autoconf/jdk-options.m4 Wed Sep 17 22:55:49 2014 -0700 +++ b/common/autoconf/jdk-options.m4 Thu Sep 18 13:26:57 2014 -0700 @@ -234,7 +234,7 @@ FASTDEBUG="false" DEBUG_CLASSFILES="true" BUILD_VARIANT_RELEASE="-debug" - HOTSPOT_DEBUG_LEVEL="jvmg" + HOTSPOT_DEBUG_LEVEL="debug" HOTSPOT_EXPORT="debug" ;; optimized )
--- a/common/autoconf/spec.gmk.in Wed Sep 17 22:55:49 2014 -0700 +++ b/common/autoconf/spec.gmk.in Thu Sep 18 13:26:57 2014 -0700 @@ -245,6 +245,7 @@ NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/testmake +MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
--- a/common/bin/unshuffle_list.txt Wed Sep 17 22:55:49 2014 -0700 +++ b/common/bin/unshuffle_list.txt Thu Sep 18 13:26:57 2014 -0700 @@ -1216,14 +1216,13 @@ jdk/src/java.security.acl/share/classes/sun/security/acl : jdk/src/share/classes/sun/security/acl jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c : jdk/src/share/native/sun/security/krb5/nativeccache.c jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m : jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m -jdk/src/java.security.jgss/share/classes/com/sun/security/jgss : jdk/src/share/classes/com/sun/security/jgss -jdk/src/java.security.jgss/share/classes/com/sun/security/sasl/gsskerb : jdk/src/share/classes/com/sun/security/sasl/gsskerb jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos : jdk/src/share/classes/javax/security/auth/kerberos jdk/src/java.security.jgss/share/classes/jgss-overview.html : jdk/src/share/classes/com/sun/security/jgss/jgss-overview.html jdk/src/java.security.jgss/share/classes/org/ietf/jgss : jdk/src/share/classes/org/ietf/jgss jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego : jdk/src/share/classes/sun/net/www/protocol/http/spnego jdk/src/java.security.jgss/share/classes/sun/security/jgss : jdk/src/share/classes/sun/security/jgss jdk/src/java.security.jgss/share/classes/sun/security/krb5 : jdk/src/share/classes/sun/security/krb5 +jdk/src/java.security.jgss/windows/classes/sun/security/krb5 : jdk/src/windows/classes/sun/security/krb5 jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5 : jdk/src/share/classes/sun/security/ssl/krb5 jdk/src/java.security.jgss/share/native/libj2gss : jdk/src/share/native/sun/security/jgss/wrapper jdk/src/java.security.jgss/unix/native/libj2gss : jdk/src/solaris/native/sun/security/jgss/wrapper @@ -1477,6 +1476,8 @@ jdk/src/jdk.security.auth/share/classes/jaas-overview.html : jdk/src/share/classes/com/sun/security/auth/jaas-overview.html jdk/src/jdk.security.auth/unix/native/libjaas : jdk/src/solaris/native/com/sun/security/auth/module jdk/src/jdk.security.auth/windows/native/libjaas : jdk/src/windows/native/com/sun/security/auth/module +jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss : jdk/src/share/classes/com/sun/security/jgss +jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb : jdk/src/share/classes/com/sun/security/sasl/gsskerb jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp : jdk/src/share/classes/com/sun/jmx/snmp jdk/src/jdk.snmp/share/classes/sun/management/snmp : jdk/src/share/classes/sun/management/snmp jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs : jdk/src/share/classes/jdk/nio/zipfs
--- a/make/HotspotWrapper.gmk Wed Sep 17 22:55:49 2014 -0700 +++ b/make/HotspotWrapper.gmk Thu Sep 18 13:26:57 2014 -0700 @@ -42,7 +42,7 @@ # not doing it breaks builds on msys. $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES) @$(MKDIR) -p $(HOTSPOT_OUTPUTDIR) - @($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -j1 $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC)) + @($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC)) $(TOUCH) $@ hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
--- a/make/Main.gmk Wed Sep 17 22:55:49 2014 -0700 +++ b/make/Main.gmk Thu Sep 18 13:26:57 2014 -0700 @@ -298,7 +298,9 @@ # Verification targets verify-modules: + @$(call TargetEnter) +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CheckModules.gmk) + @$(call TargetExit) ALL_TARGETS += verify-modules @@ -400,7 +402,7 @@ main-jars: java.security.jgss-libs endif - images: jars demos samples exploded-image source-tips + images: jars demos samples exploded-image verify-modules source-tips bootcycle-images: images @@ -476,7 +478,7 @@ ################################################################################ -all: images docs verify-modules +all: images docs default: exploded-image ALL_TARGETS += default all @@ -491,7 +493,7 @@ # file. CLEAN_COMPONENTS += langtools corba hotspot jdk nashorn images \ - bootcycle-build docs docstemp test + bootcycle-build docs docstemp test make-support CLEAN_TARGETS := $(addprefix clean-, $(CLEAN_COMPONENTS)) # Remove everything, except the output from configure.
--- a/make/common/Modules.gmk Wed Sep 17 22:55:49 2014 -0700 +++ b/make/common/Modules.gmk Thu Sep 18 13:26:57 2014 -0700 @@ -26,6 +26,9 @@ ifndef _MODULES_GMK _MODULES_GMK := 1 +include JavaCompilation.gmk +include SetupJavaCompilers.gmk + ################################################################################ # Module list macros @@ -50,8 +53,32 @@ $(patsubst %,%/*/$(OPENJDK_TARGET_OS)/classes/*, $(ALL_TOP_SRC_DIRS)))))))))))) endef -MODULES_LIST_FILE := $(SRC_ROOT)/make/common/modules.list -MODULE_DEPS_MAKEFILE := $(OUTPUT_ROOT)/module-deps.gmk +# Find all modules with source for the target platform. +define FindAllModules + $(sort $(filter-out closed demo sample, $(notdir $(patsubst %/,%, $(dir \ + $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \ + $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \ + $(patsubst %, %/*/$(OPENJDK_TARGET_OS_API_DIR), $(ALL_TOP_SRC_DIRS)))))))) +endef + +################################################################################ + +$(eval $(call SetupJavaCompilation,BUILD_GENMODULESLIST, \ + SETUP := BOOT_JAVAC, \ + SRC := $(JDK_TOPDIR)/make/src/classes, \ + INCLUDES := build/tools/module, \ + BIN := $(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist)) + +TOOL_GENMODULESLIST = $(JAVA_SMALL) \ + -cp "$(MAKESUPPORT_OUTPUTDIR)/bt_classes_moduleslist" \ + build.tools.module.GenModulesList + +MODULES_LIST_FILE := $(MAKESUPPORT_OUTPUTDIR)/modules.list +MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk + +$(MODULES_LIST_FILE): $(SRC_ROOT)/modules.xml \ + $(BUILD_GENMODULESLIST) + $(TOOL_GENMODULESLIST) -o $@ $(filter %.xml, $^) $(MODULE_DEPS_MAKEFILE): $(MODULES_LIST_FILE) $(CAT) $^ | $(SED) -e 's/^\([^:]*\):/DEPS_\1 :=/g' > $@ @@ -63,14 +90,6 @@ $(DEPS_$(strip $1)) endef -# Find all modules with source for the target platform. -define FindAllModules - $(sort $(filter-out closed demo sample, $(notdir $(patsubst %/,%, $(dir \ - $(wildcard $(patsubst %, %/*/share, $(ALL_TOP_SRC_DIRS)) \ - $(patsubst %, %/*/$(OPENJDK_TARGET_OS), $(ALL_TOP_SRC_DIRS)) \ - $(patsubst %, %/*/$(OPENJDK_TARGET_OS_API_DIR), $(ALL_TOP_SRC_DIRS)))))))) -endef - ################################################################################ # Hook to include the corresponding custom file, if present.
--- a/make/common/SetupJavaCompilers.gmk Wed Sep 17 22:55:49 2014 -0700 +++ b/make/common/SetupJavaCompilers.gmk Thu Sep 18 13:26:57 2014 -0700 @@ -34,6 +34,12 @@ # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000" JAVAC_WARNINGS := -Xlint:all,-deprecation -Werror +# The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools +# and the interim javac, to be run by the boot jdk. +$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \ + JAVAC := $(JAVAC), \ + FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror)) + # Any java code executed during a JDK build to build other parts of the JDK must be # executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this # purpose must be built with -target PREVIOUS for bootstrapping purposes, which
--- a/make/common/modules.list Wed Sep 17 22:55:49 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -java.base: -java.logging: java.base -java.security.sasl: java.logging java.base -java.naming: java.security.sasl java.base -java.security.acl: java.base -jdk.charsets: java.base -java.scripting: java.base -java.xml: java.base -java.sql: java.xml java.logging java.base -jdk.scripting.nashorn: java.scripting java.logging java.base -java.rmi: java.logging java.base -java.prefs: java.xml java.base -java.desktop: jdk.charsets java.prefs java.xml java.logging java.base -java.corba: java.naming java.rmi java.desktop java.logging java.base -java.compiler: java.logging java.base -jdk.compiler: java.compiler java.base -jdk.javadoc: java.compiler java.xml jdk.compiler java.base -jdk.rmic: java.corba jdk.compiler jdk.javadoc java.base -jdk.jvmstat: java.rmi java.base -jdk.attach: jdk.jvmstat java.base -jdk.jcmd: jdk.jvmstat jdk.attach java.base -jdk.jdi: jdk.attach java.base -jdk.hotspot.agent: java.rmi java.scripting java.desktop java.base jdk.jdi -jdk.hprof.agent: java.base -java.management: java.naming java.rmi java.logging java.base -jdk.jconsole: java.management jdk.jvmstat java.rmi jdk.attach java.desktop java.logging java.base -java.activation: java.desktop java.logging java.base -java.xml.bind: java.activation java.compiler java.xml java.desktop java.logging java.base -jdk.xml.bind: java.activation java.compiler java.xml.bind java.xml java.desktop java.logging jdk.compiler java.base -jdk.httpserver: java.logging java.base -java.annotations.common: java.base -java.xml.soap: java.activation java.xml.bind java.xml java.desktop java.logging java.base -java.xml.ws: java.activation java.management jdk.httpserver java.rmi java.annotations.common java.xml.bind java.xml java.desktop java.logging java.xml.soap java.base -jdk.xml.ws: jdk.xml.bind java.compiler java.rmi java.xml.ws java.xml.bind java.xml java.logging java.base -java.sql.rowset: java.naming java.sql java.xml java.logging java.base -java.instrument: java.base -java.security.jgss: java.naming java.security.sasl java.logging java.base -java.xml.crypto: java.xml java.logging java.base -jdk.localedata: java.base -jdk.crypto.ec: java.base -jdk.crypto.pkcs11: jdk.crypto.ec java.base -jdk.crypto.mscapi: java.base -jdk.naming.rmi: java.naming java.rmi java.base -jdk.zipfs: java.base -jdk.naming.dns: java.naming java.base -java.smartcardio: java.base -jdk.dev: jdk.xml.bind jdk.xml.ws java.scripting jdk.rmic java.xml jdk.compiler java.base -jdk.snmp: java.management java.security.acl java.logging java.base -jdk.jdwp.agent: java.base -jdk.security.auth: java.naming java.security.jgss java.base -jdk.sctp: java.base -jdk.runtime: java.desktop java.base -jdk.jfr: java.management java.xml java.base -jdk.deploy.osx: java.scripting java.desktop java.base
--- a/modules.xml Wed Sep 17 22:55:49 2014 -0700 +++ b/modules.xml Thu Sep 18 13:26:57 2014 -0700 @@ -243,6 +243,7 @@ <to>java.rmi</to> <to>java.security.jgss</to> <to>java.security.sasl</to> + <to>java.sql</to> <to>jdk.charsets</to> <to>jdk.deploy.osx</to> <to>jdk.dev</to> @@ -250,6 +251,7 @@ <to>jdk.jvmstat</to> <to>jdk.runtime</to> <to>jdk.security.auth</to> + <to>jdk.security.jgss</to> </export> <export> <name>sun.net.dns</name> @@ -326,6 +328,7 @@ </export> <export> <name>sun.security.internal.spec</name> + <to>jdk.crypto.mscapi</to> <to>jdk.crypto.pkcs11</to> <to>jdk.crypto.ucrypto</to> </export> @@ -730,6 +733,10 @@ <export> <name>javax.swing.undo</name> </export> + <export> + <name>sun.awt</name> + <to>oracle.accessbridge</to> + </export> </module> <module> <name>java.instrument</name> @@ -900,12 +907,7 @@ <module> <name>java.security.jgss</name> <depend>java.base</depend> - <depend>java.logging</depend> <depend>java.naming</depend> - <depend>java.security.sasl</depend> - <export> - <name>com.sun.security.jgss</name> - </export> <export> <name>javax.security.auth.kerberos</name> </export> @@ -924,6 +926,14 @@ <name>sun.security.krb5.internal.ktab</name> <to>jdk.security.auth</to> </export> + <export> + <name>sun.security.jgss</name> + <to>jdk.security.jgss</to> + </export> + <export> + <name>sun.security.krb5.internal</name> + <to>jdk.security.jgss</to> + </export> </module> <module> <name>java.security.sasl</name> @@ -934,7 +944,7 @@ </export> <export> <name>com.sun.security.sasl.util</name> - <to>java.security.jgss</to> + <to>jdk.security.jgss</to> </export> </module> <module> @@ -1570,6 +1580,10 @@ </export> </module> <module> + <name>jdk.crypto.mscapi</name> + <depend>java.base</depend> + </module> + <module> <name>jdk.crypto.pkcs11</name> <depend>java.base</depend> <depend>jdk.crypto.ec</depend> @@ -1752,6 +1766,16 @@ </export> </module> <module> + <name>jdk.security.jgss</name> + <depend>java.base</depend> + <depend>java.logging</depend> + <depend re-exports="true">java.security.jgss</depend> + <depend>java.security.sasl</depend> + <export> + <name>com.sun.security.jgss</name> + </export> + </module> + <module> <name>jdk.xml.bind</name> <depend>java.activation</depend> <depend>java.base</depend>