Merge
authorduke
Wed, 05 Jul 2017 19:24:14 +0200
changeset 21857 7ceeb1c4313f
parent 21856 ad69f3bf4111 (current diff)
parent 21774 18dae2a8513a (diff)
child 21863 17f0e6202fde
Merge
NewMakefile.gmk
common/makefiles/HotspotWrapper.gmk
common/makefiles/IdlCompilation.gmk
common/makefiles/JavaCompilation.gmk
common/makefiles/Jprt.gmk
common/makefiles/Main.gmk
common/makefiles/MakeBase.gmk
common/makefiles/MakeHelpers.gmk
common/makefiles/Makefile
common/makefiles/NativeCompilation.gmk
common/makefiles/RMICompilation.gmk
common/makefiles/devkit/Makefile
common/makefiles/devkit/Tools.gmk
common/makefiles/javadoc/CORE_PKGS.gmk
common/makefiles/javadoc/Javadoc.gmk
common/makefiles/javadoc/NON_CORE_PKGS.gmk
common/makefiles/javadoc/Notes.html
common/makefiles/support/ListPathsSafely-post-compress.incl
common/makefiles/support/ListPathsSafely-pre-compress.incl
common/makefiles/support/ListPathsSafely-uncompress.sed
common/makefiles/support/unicode2x.sed
hotspot/test/compiler/jsr292/methodHandleExceptions/C.java
hotspot/test/compiler/jsr292/methodHandleExceptions/I.java
make/Defs-internal.gmk
make/README.pre-components
make/corba-rules.gmk
make/deploy-rules.gmk
make/hotspot-rules.gmk
make/install-rules.gmk
make/jaxp-rules.gmk
make/jaxws-rules.gmk
make/jdk-rules.gmk
make/jprt.gmk
make/langtools-rules.gmk
make/nashorn-rules.gmk
make/sanity-rules.gmk
make/scripts/fixpath.pl
make/scripts/vsvars.sh
make/sponsors-rules.gmk
--- a/.hgtags-top-repo	Tue Dec 03 12:37:30 2013 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 19:24:14 2017 +0200
@@ -239,3 +239,4 @@
 763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115
 cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116
 a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
+0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118
--- a/Makefile	Tue Dec 03 12:37:30 2013 -0800
+++ b/Makefile	Wed Jul 05 19:24:14 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,549 +23,112 @@
 # questions.
 #
 
-# If NEWBUILD is defined, use the new build-infra Makefiles and configure.
-#     See NewMakefile.gmk for more information.
-
-# If not specified, select what the default build is
-ifndef NEWBUILD
-  NEWBUILD=true
-endif
-
-ifeq ($(NEWBUILD),true)
-
-  # The new top level Makefile
-  include NewMakefile.gmk
-
-else # Original Makefile logic
-
-BUILD_PARENT_DIRECTORY=.
+# This must be the first rule
+default:
 
-# Basename of any originally supplied ALT_OUTPUTDIR directory
-ifndef ORIG_OUTPUTDIR_BASENAME
-  ifdef ALT_OUTPUTDIR
-    ORIG_OUTPUTDIR_BASENAME := $(shell basename $(ALT_OUTPUTDIR))
-  else
-    ORIG_OUTPUTDIR_BASENAME  = $(PLATFORM)-$(ARCH)
-  endif
-endif
-export ORIG_OUTPUTDIR_BASENAME
-
-# The three possible directories created for output (3 build flavors)
-OUTPUTDIR_BASENAME-          = $(ORIG_OUTPUTDIR_BASENAME)
-OUTPUTDIR_BASENAME-debug     = $(ORIG_OUTPUTDIR_BASENAME)-debug
-OUTPUTDIR_BASENAME-fastdebug = $(ORIG_OUTPUTDIR_BASENAME)-fastdebug
-
-# Relative path to a debug output area
-REL_JDK_OUTPUTDIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))
-
-# The created jdk image directory
-JDK_IMAGE_DIRNAME = j2sdk-image
-JDK_IMAGE_DIR     = $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-ABS_JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
+# Inclusion of this pseudo-target will cause make to execute this file
+# serially, regardless of -j. Recursively called makefiles will not be
+# affected, however. This is required for correct dependency management.
+.NOTPARALLEL:
 
-# Relative path from an output directory to the image directory
-REL_JDK_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))/$(JDK_IMAGE_DIRNAME)
-REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
-REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
-
-ifndef TOPDIR
-  TOPDIR:=.
-endif
-
-ifndef JDK_TOPDIR
-  JDK_TOPDIR=$(TOPDIR)/jdk
-endif
-ifndef JDK_MAKE_SHARED_DIR
-  JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared
-endif
-
-default: all
+# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
+# /usr/ccs/bin/make lacks basically every other flow control mechanism.
+TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
 
-include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk
-include ./make/Defs-internal.gmk
-include ./make/sanity-rules.gmk
-include ./make/hotspot-rules.gmk
-include ./make/langtools-rules.gmk
-include ./make/corba-rules.gmk
-include ./make/jaxp-rules.gmk
-include ./make/jaxws-rules.gmk
-include ./make/jdk-rules.gmk
-include ./make/nashorn-rules.gmk
-include ./make/install-rules.gmk
-include ./make/sponsors-rules.gmk
-include ./make/deploy-rules.gmk
-
-all:: sanity
-
-ifeq ($(SKIP_FASTDEBUG_BUILD), false)
-  all:: fastdebug_build
-endif
-
-ifeq ($(SKIP_DEBUG_BUILD), false)
-  all:: debug_build
+# Assume we have GNU make, but check version.
+ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
+  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
 endif
 
-all:: all_product_build 
-
-all_product_build::
-
-# Everything for a full product build
-ifeq ($(SKIP_PRODUCT_BUILD), false)
-
-  all_product_build:: product_build
-
-  ifeq ($(BUILD_INSTALL), true)
-    all_product_build:: $(INSTALL)
-    clobber:: install-clobber
-  endif
-
-  ifeq ($(BUILD_SPONSORS), true)
-    all_product_build:: $(SPONSORS)
-    clobber:: sponsors-clobber
-  endif
-
-  ifneq ($(SKIP_COMPARE_IMAGES), true)
-    all_product_build:: compare-image
-  endif
-
-endif
-
-define StartTimer
-	$(MKDIR) -p $(BUILDTIMESDIR)
-	$(RM) $(BUILDTIMESDIR)/build_time_*
-	$(call RecordStartTime,TOTAL)
-endef
-
-define StopTimer
-	$(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),)
-endef
-
-# Generic build of basic repo series
-generic_build_repo_series:: $(SOURCE_TIPS)
-	$(MKDIR) -p $(JDK_IMAGE_DIR)
-	@$(call StartTimer)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  generic_build_repo_series:: langtools
-  clobber:: langtools-clobber
-endif
-
-ifeq ($(BUILD_CORBA), true)
-  generic_build_repo_series:: corba
-  clobber:: corba-clobber
-endif
-
-ifeq ($(BUILD_JAXP), true)
-  generic_build_repo_series:: jaxp
-  clobber:: jaxp-clobber
-endif
-
-ifeq ($(BUILD_JAXWS), true)
-  generic_build_repo_series:: jaxws
-  clobber:: jaxws-clobber
-endif
-
-ifeq ($(BUILD_HOTSPOT), true)
-  generic_build_repo_series:: $(HOTSPOT) 
-  clobber:: hotspot-clobber
+# Locate this Makefile
+ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
+  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+  makefile_path:=$(lastword $(MAKEFILE_LIST))
 endif
-
-ifeq ($(BUILD_JDK), true)
-  generic_build_repo_series:: $(JDK_JAVA_EXE)
-  clobber:: jdk-clobber
-endif
+root_dir:=$(dir $(makefile_path))
 
-ifeq ($(BUILD_NASHORN), true)
-  generic_build_repo_series:: $(NASHORN)
-  clobber:: nashorn-clobber
-endif
+# ... and then we can include our helper functions
+include $(root_dir)/make/MakeHelpers.gmk
 
-ifeq ($(BUILD_DEPLOY), true)
-  generic_build_repo_series:: $(DEPLOY)
-  clobber:: deploy-clobber
-endif
-
-generic_build_repo_series::
-	@$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
+$(eval $(call ParseLogLevel))
+$(eval $(call ParseConfAndSpec))
 
-# The debug build, fastdebug or debug. Needs special handling.
-#  Note that debug builds do NOT do INSTALL steps, but must be done
-#  after the product build and before the INSTALL step of the product build.
-#
-#   DEBUG_NAME is fastdebug or debug
-#   ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
-#   The resulting image directory (j2sdk-image) is used by the install makefiles
-#     to create a debug install bundle jdk-*-debug-** bundle (tar or zip) 
-#     which will install in the debug or fastdebug subdirectory of the
-#     normal product install area.
-#     The install process needs to know what the DEBUG_NAME is, so
-#     look for INSTALL_DEBUG_NAME in the install rules.
-#
-#   NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME).
-#         Due to the use of short paths in $(ABS_OUTPUTDIR), this may 
-#         not be the same location.
-#
+# Now determine if we have zero, one or several configurations to build.
+ifeq ($(SPEC),)
+  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
+else
+  ifeq ($(words $(SPEC)),1)
+    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
+    include $(root_dir)/make/Main.gmk
+  else
+    # We are building multiple configurations.
+    # First, find out the valid targets
+    # 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=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
+        $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
+        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
 
-# Location of fresh bootdir output
-ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
-FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
-FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
-  
-create_fresh_product_bootdir: FRC
-	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		GENERATE_DOCS=false \
-		BOOT_CYCLE_SETTINGS= \
-		build_product_image
+    $(all_phony_targets):
+	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
+	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
 
-create_fresh_debug_bootdir: FRC
-	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		GENERATE_DOCS=false \
-		BOOT_CYCLE_DEBUG_SETTINGS= \
-		build_debug_image
+    .PHONY: $(all_phony_targets)
 
-create_fresh_fastdebug_bootdir: FRC
-	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
-		GENERATE_DOCS=false \
-		BOOT_CYCLE_DEBUG_SETTINGS= \
-		build_fastdebug_image
-
-# Create boot image?
-ifeq ($(SKIP_BOOT_CYCLE),false)
-  ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
-    DO_BOOT_CYCLE=true
   endif
 endif
 
-
-
-ifeq ($(DO_BOOT_CYCLE),true)
-  
-  # Create the bootdir to use in the build
-  product_build:: create_fresh_product_bootdir
-  debug_build:: create_fresh_debug_bootdir
-  fastdebug_build:: create_fresh_fastdebug_bootdir
-
-  # Define variables to be used now for the boot jdk
-  BOOT_CYCLE_SETTINGS= \
-     ALT_BOOTDIR=$(FRESH_BOOTDIR) \
-     ALT_JDK_IMPORT_PATH=$(FRESH_BOOTDIR)
-  BOOT_CYCLE_DEBUG_SETTINGS= \
-     ALT_BOOTDIR=$(FRESH_DEBUG_BOOTDIR) \
-     ALT_JDK_IMPORT_PATH=$(FRESH_DEBUG_BOOTDIR)
-
-else
-
-  # Use the supplied ALT_BOOTDIR as the boot
-  BOOT_CYCLE_SETTINGS=
-  BOOT_CYCLE_DEBUG_SETTINGS=
-
-endif
-
-build_product_image:
-	$(MAKE) \
-	        SKIP_FASTDEBUG_BUILD=true \
-	        SKIP_DEBUG_BUILD=true \
-	        $(BOOT_CYCLE_SETTINGS) \
-	        generic_build_repo_series
-
-#   NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME).
-#         Due to the use of short paths in $(ABS_OUTPUTDIR), this may 
-#         not be the same location.
-
-generic_debug_build:
-	$(MAKE) \
-		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
-	        DEBUG_NAME=$(DEBUG_NAME) \
-		GENERATE_DOCS=false \
-	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
-		generic_build_repo_series
-
-build_debug_image:
-	$(MAKE) DEBUG_NAME=debug generic_debug_build
-
-build_fastdebug_image:
-	$(MAKE) DEBUG_NAME=fastdebug generic_debug_build
-
-# Build final image
-product_build:: build_product_image
-debug_build:: build_debug_image
-fastdebug_build:: build_fastdebug_image
-
-# The source tips are stored with the relative path to the repo.
-#   This file will be used when constructing the jdk image.
-source_tips: $(SOURCE_TIPS)
-	$(CAT) $<
-$(SOURCE_TIPS): FRC
-	@$(prep-target)
-	@$(call GetSourceTips)
-
-clobber:: REPORT_BUILD_TIMES=
-clobber:: 
-	$(RM) -r $(OUTPUTDIR)/*
-	-($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE))
-
-clean: clobber
-
-#
-# Dev builds
-#
-
-dev : dev-build
+# Include this after a potential spec file has been included so that the bundles target
+# has access to the spec variables.
+include $(root_dir)/make/Jprt.gmk
 
-dev-build:
-	$(MAKE) DEV_ONLY=true all
-dev-sanity:
-	$(MAKE) DEV_ONLY=true sanity
-dev-clobber:
-	$(MAKE) DEV_ONLY=true clobber
-
-#
-# Quick jdk verification build
-#
-jdk_only:
-	$(MAKE) SKIP_FASTDEBUG_BUILD=true BUILD_HOTSPOT=false all
-
-
-#
-# Quick jdk verification fastdebug build
-#
-jdk_fastdebug_only:
-	$(MAKE) DEBUG_NAME=fastdebug BUILD_HOTSPOT=false BUILD_DEPLOY=false \
-	    BUILD_INSTALL=false BUILD_SPONSORS=false generic_debug_build
-
-#
-# Quick deploy verification fastdebug build
-#
-deploy_fastdebug_only:
-	$(MAKE) \
-	    DEBUG_NAME=fastdebug \
-	    BUILD_HOTSPOT=false \
-	    BUILD_JDK=false \
-	    BUILD_LANGTOOLS=false \
-	    BUILD_NASHORN=false \
-	    BUILD_CORBA=false \
-	    BUILD_JAXP=false \
-	    BUILD_JAXWS=false \
-	    BUILD_INSTALL=false \
-	    BUILD_SPONSORS=false \
-	    generic_debug_build
-
-#
-# Product build (skip debug builds)
-#
-product_only:
-	$(MAKE) SKIP_FASTDEBUG_BUILD=true all
-
-#
-# Check target
-#
-
-check: variable_check
-
-#
-# Help target
-#
-help: intro_help target_help variable_help notes_help examples_help
-
-# Intro help message
-intro_help:
-	@$(ECHO) "\
-Makefile for the JDK builds (all the JDK). \n\
-"
-
-# Target help
-target_help:
-	@$(ECHO) "\
---- Common Targets ---  \n\
-all               -- build the core JDK (default target) \n\
-help              -- Print out help information \n\
-check             -- Check make variable values for correctness \n\
-sanity            -- Perform detailed sanity checks on system and settings \n\
-fastdebug_build   -- build the core JDK in 'fastdebug' mode (-g -O) \n\
-debug_build       -- build the core JDK in 'debug' mode (-g) \n\
-clean             -- remove all built and imported files \n\
-clobber           -- same as clean \n\
-"
-
-# Variable help (only common ones used by this Makefile)
-variable_help: variable_help_intro variable_list variable_help_end
-variable_help_intro:
-	@$(ECHO) "--- Common Variables ---"
-variable_help_end:
-	@$(ECHO) " "
+# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
+# If you addd more global targets, please update the variable global_targets in MakeHelpers.
 
-# One line descriptions for the variables
-OUTPUTDIR.desc             = Output directory
-PARALLEL_COMPILE_JOBS.desc = Solaris/Linux parallel compile run count
-SLASH_JAVA.desc            = Root of all build tools, e.g. /java or J:
-BOOTDIR.desc               = JDK used to boot the build
-JDK_IMPORT_PATH.desc       = JDK used to import components of the build
-COMPILER_PATH.desc         = Compiler install directory
-CACERTS_FILE.desc          = Location of certificates file
-DEVTOOLS_PATH.desc         = Directory containing zip and gnumake
-CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
-
-# Make variables to print out (description and value)
-VARIABLE_PRINTVAL_LIST +=       \
-    OUTPUTDIR                   \
-    PARALLEL_COMPILE_JOBS       \
-    SLASH_JAVA                  \
-    BOOTDIR                     \
-    JDK_IMPORT_PATH             \
-    COMPILER_PATH               \
-    CACERTS_FILE                \
-    DEVTOOLS_PATH
-
-# Make variables that should refer to directories that exist
-VARIABLE_CHECKDIR_LIST +=       \
-    SLASH_JAVA                  \
-    BOOTDIR                     \
-    JDK_IMPORT_PATH             \
-    COMPILER_PATH               \
-    DEVTOOLS_PATH 
-
-# Make variables that should refer to files that exist
-VARIABLE_CHECKFIL_LIST +=       \
-    CACERTS_FILE
-
-# For pattern rules below, so all are treated the same
-DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
-DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
-DO_CHECKFIL_LIST=$(VARIABLE_CHECKFIL_LIST:%=%.checkfil)
-
-# Complete variable check
-variable_check: $(DO_CHECKDIR_LIST) $(DO_CHECKFIL_LIST)
-variable_list: $(DO_PRINTVAL_LIST) variable_check
-
-# Pattern rule for printing out a variable
-%.printval:
-	@$(ECHO) "  ALT_$* - $($*.desc)"
-	@$(ECHO) "  \t $*=$($*)"
-
-# Pattern rule for checking to see if a variable with a directory exists
-%.checkdir:
-	@if [ ! -d $($*) ] ; then \
-	    $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
-	fi
-
-# Pattern rule for checking to see if a variable with a file exists
-%.checkfil:
-	@if [ ! -f $($*) ] ; then \
-	    $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
-	fi
-
-# Misc notes on help
-notes_help:
-	@$(ECHO) "\
---- Notes --- \n\
-- All builds use same output directory unless overridden with \n\
- \t ALT_OUTPUTDIR=<dir>, changing from product to fastdebug you may want \n\
- \t to use the clean target first. \n\
-- JDK_IMPORT_PATH must refer to a compatible build, not all past promoted \n\
- \t builds or previous release JDK builds will work. \n\
-- The fastest builds have been when the sources and the BOOTDIR are on \n\
- \t local disk. \n\
-"
-
-examples_help:
-	@$(ECHO) "\
---- Examples --- \n\
-  $(MAKE) fastdebug_build \n\
-  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
-  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar fastdebug_build \n\
-  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
-  $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\
-  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\
-"
+help:
+	$(info )
+	$(info OpenJDK Makefile help)
+	$(info =====================)
+	$(info )
+	$(info Common make targets)
+	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
+	$(info .                         # corba and jdk)
+	$(info .  make all               # Compile everything, all repos and images)
+	$(info .  make images            # Create complete j2sdk and j2re images)
+	$(info .  make docs              # Create javadocs)
+	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
+	$(info .  make profiles          # Create complete j2re compact profile images)
+	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
+	$(info .  make install           # Install the generated images locally)
+	$(info .  make clean             # Remove all files generated by make, but not those)
+	$(info .                         # generated by configure)
+	$(info .  make dist-clean        # Remove all files, including configuration)
+	$(info .  make help              # Give some help on using make)
+	$(info .  make test              # Run tests, default is all tests (see TEST below))
+	$(info )
+	$(info Targets for specific components)
+	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
+	$(info .  make <component>       # Build <component> and everything it depends on. )
+	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
+	$(info .                         # is faster but can result in incorrect build results!)
+	$(info .  make clean-<component> # Remove files generated by make for <component>)
+	$(info )
+	$(info Useful make variables)
+	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
+	$(info .  make CONF=<substring>  # Build the configuration(s) with a name matching)
+	$(info .                         # <substring>)
+	$(info )
+	$(info .  make LOG=<loglevel>    # Change the log level from warn to <loglevel>)
+	$(info .                         # Available log levels are:)
+	$(info .                         # 'warn' (default), 'info', 'debug' and 'trace')
+	$(info .                         # To see executed command lines, use LOG=debug)
+	$(info )
+	$(info .  make JOBS=<n>          # Run <n> parallel make jobs)
+	$(info .                         # Note that -jN does not work as expected!)
+	$(info )
+	$(info .  make test TEST=<test>  # Only run the given test or tests, e.g.)
+	$(info .                         # make test TEST="jdk_lang jdk_net")
+	$(info )
 
-################################################################
-# Source bundling
-################################################################
-ifeq ($(BUNDLE_RULES_AVAILABLE), true)
-  include $(BUNDLE_RULES)
-endif
-
-################################################################
-# rule to test
-################################################################
-
-.NOTPARALLEL: test_run
-
-test:
-	$(MAKE) test_run
-
-test_run: test_clean test_start test_summary
-
-test_start:
-	@$(ECHO) "Tests started at `$(DATE)`"
-
-test_clean:
-	$(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt
-
-test_summary: $(OUTPUTDIR)/test_failures.txt
-	@$(ECHO) "#################################################"
-	@$(ECHO) "Tests completed at `$(DATE)`"
-	@( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \
-          || $(ECHO) "No TEST STATS seen in log" )
-	@$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt"
-	@$(ECHO) "#################################################"
-	@if [ -s $< ] ; then                                           \
-          $(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \
-          $(CAT) $<;                                                   \
-          exit 1;                                                      \
-        else                                                           \
-          $(ECHO) "Success! No failures detected";                     \
-        fi
-
-# Get failure list from log
-$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
-	@$(RM) $@
-	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
-
-# Get log file of all tests run
-JDK_TO_TEST := $(shell 							\
-  if [ -d "$(ABS_JDK_IMAGE_DIR)" ] ; then 				\
-    $(ECHO) "$(ABS_JDK_IMAGE_DIR)"; 					\
-  elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then 				\
-    $(ECHO) "$(ABS_OUTPUTDIR)"; 					\
-  elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then 	\
-    $(ECHO) "$(PRODUCT_HOME)"; 						\
-  fi 									\
-)
-TEST_TARGETS=all
-$(OUTPUTDIR)/test_log.txt:
-	$(RM) $@
-	( $(CD) test &&                                                     \
-          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
-        ) | tee $@
-
-################################################################
-# JPRT rule to build
-################################################################
-
-include ./make/jprt.gmk
-
-################################################################
-#  PHONY
-################################################################
-
-.PHONY: all  test test_run test_start test_summary test_clean \
-	generic_build_repo_series \
-	what clobber insane \
-        dev dev-build dev-sanity dev-clobber \
-        product_build \
-        fastdebug_build \
-        debug_build  \
-        build_product_image  \
-        build_debug_image  \
-        build_fastdebug_image \
-        create_fresh_product_bootdir \
-        create_fresh_debug_bootdir \
-        create_fresh_fastdebug_bootdir \
-        generic_debug_build
-
-# Force target
-FRC:
-
-endif # Original Makefile logic
-
+.PHONY: help
--- a/NewMakefile.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default:
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
-# /usr/ccs/bin/make lacks basically every other flow control mechanism.
-TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
-
-# Assume we have GNU make, but check version.
-ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
-  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
-endif
-
-# Locate this Makefile
-ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
-  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
-  makefile_path:=$(lastword $(MAKEFILE_LIST))
-endif
-root_dir:=$(dir $(makefile_path))
-
-# ... and then we can include our helper functions
-include $(root_dir)/common/makefiles/MakeHelpers.gmk
-
-$(eval $(call ParseLogLevel))
-$(eval $(call ParseConfAndSpec))
-
-# Now determine if we have zero, one or several configurations to build.
-ifeq ($(SPEC),)
-  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
-else
-  ifeq ($(words $(SPEC)),1)
-    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
-    include $(root_dir)/common/makefiles/Main.gmk
-  else
-    # We are building multiple configurations.
-    # First, find out the valid targets
-    # 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=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
-        $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
-        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
-
-    $(all_phony_targets):
-	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
-	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
-
-    .PHONY: $(all_phony_targets)
-
-  endif
-endif
-
-# Include this after a potential spec file has been included so that the bundles target
-# has access to the spec variables.
-include $(root_dir)/common/makefiles/Jprt.gmk
-
-# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
-# If you addd more global targets, please update the variable global_targets in MakeHelpers.
-
-help:
-	$(info )
-	$(info OpenJDK Makefile help)
-	$(info =====================)
-	$(info )
-	$(info Common make targets)
-	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
-	$(info .                         # corba and jdk)
-	$(info .  make all               # Compile everything, all repos and images)
-	$(info .  make images            # Create complete j2sdk and j2re images)
-	$(info .  make docs              # Create javadocs)
-	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
-	$(info .  make profiles          # Create complete j2re compact profile images)
-	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
-	$(info .  make install           # Install the generated images locally)
-	$(info .  make clean             # Remove all files generated by make, but not those)
-	$(info .                         # generated by configure)
-	$(info .  make dist-clean        # Remove all files, including configuration)
-	$(info .  make help              # Give some help on using make)
-	$(info .  make test              # Run tests, default is all tests (see TEST below))
-	$(info )
-	$(info Targets for specific components)
-	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
-	$(info .  make <component>       # Build <component> and everything it depends on. )
-	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
-	$(info .                         # is faster but can result in incorrect build results!)
-	$(info .  make clean-<component> # Remove files generated by make for <component>)
-	$(info )
-	$(info Useful make variables)
-	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
-	$(info .  make CONF=<substring>  # Build the configuration(s) with a name matching)
-	$(info .                         # <substring>)
-	$(info )
-	$(info .  make LOG=<loglevel>    # Change the log level from warn to <loglevel>)
-	$(info .                         # Available log levels are:)
-	$(info .                         # 'warn' (default), 'info', 'debug' and 'trace')
-	$(info .                         # To see executed command lines, use LOG=debug)
-	$(info )
-	$(info .  make JOBS=<n>          # Run <n> parallel make jobs)
-	$(info .                         # Note that -jN does not work as expected!)
-	$(info )
-	$(info .  make test TEST=<test>  # Only run the given test or tests, e.g.)
-	$(info .                         # make test TEST="jdk_lang jdk_net")
-	$(info )
-
-.PHONY: help
--- a/common/autoconf/Makefile.in	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/autoconf/Makefile.in	Wed Jul 05 19:24:14 2017 +0200
@@ -24,4 +24,4 @@
 # This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
 # GENERATED FILE, DO NOT EDIT
 SPEC:=@OUTPUT_ROOT@/spec.gmk
-include @SRC_ROOT@/NewMakefile.gmk
+include @SRC_ROOT@/Makefile
--- a/common/autoconf/basics.m4	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/autoconf/basics.m4	Wed Jul 05 19:24:14 2017 +0200
@@ -412,7 +412,7 @@
   # Test from where we are running configure, in or outside of src root.
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
       || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
+      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
     if test "x${CONF_NAME}" = x; then
--- a/common/autoconf/generated-configure.sh	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/autoconf/generated-configure.sh	Wed Jul 05 19:24:14 2017 +0200
@@ -3865,7 +3865,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1383151988
+DATE_WHEN_GENERATED=1384422786
 
 ###############################################################################
 #
@@ -8042,7 +8042,7 @@
   # Test from where we are running configure, in or outside of src root.
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
       || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
+      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
     if test "x${CONF_NAME}" = x; then
@@ -16201,32 +16201,25 @@
     cd "$CURDIR"
     # Verify that the addon source root does not have any root makefiles.
     # If it does, then it is usually an error, prevent this.
-    if test -f $with_add_source_root/langtools/makefiles/Makefile || \
-      test -f $with_add_source_root/langtools/make/Makefile; then
+    if test -f $with_add_source_root/langtools/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/corba/makefiles/Makefile || \
-      test -f $with_add_source_root/corba/make/Makefile; then
+    if test -f $with_add_source_root/corba/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxp/make/Makefile; then
+    if test -f $with_add_source_root/jaxp/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxws/make/Makefile; then
+    if test -f $with_add_source_root/jaxws/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_add_source_root/hotspot/make/Makefile; then
+    if test -f $with_add_source_root/hotspot/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_add_source_root/nashorn/make/Makefile; then
+    if test -f $with_add_source_root/nashorn/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
-    if test -f $with_add_source_root/jdk/makefiles/Makefile || \
-      test -f $with_add_source_root/jdk/make/Makefile; then
+    if test -f $with_add_source_root/jdk/make/Makefile; then
       as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
     fi
   fi
@@ -16240,32 +16233,25 @@
     cd "$with_override_source_root"
     OVERRIDE_SRC_ROOT="`pwd`"
     cd "$CURDIR"
-    if test -f $with_override_source_root/langtools/makefiles/Makefile || \
-      test -f $with_override_source_root/langtools/make/Makefile; then
+    if test -f $with_override_source_root/langtools/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/corba/makefiles/Makefile || \
-      test -f $with_override_source_root/corba/make/Makefile; then
+    if test -f $with_override_source_root/corba/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxp/make/Makefile; then
+    if test -f $with_override_source_root/jaxp/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxws/make/Makefile; then
+    if test -f $with_override_source_root/jaxws/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_override_source_root/hotspot/make/Makefile; then
+    if test -f $with_override_source_root/hotspot/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_override_source_root/nashorn/make/Makefile; then
+    if test -f $with_override_source_root/nashorn/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
-    if test -f $with_override_source_root/jdk/makefiles/Makefile || \
-      test -f $with_override_source_root/jdk/make/Makefile; then
+    if test -f $with_override_source_root/jdk/make/Makefile; then
       as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
     fi
   fi
@@ -16344,7 +16330,7 @@
     cd "$with_override_langtools"
     LANGTOOLS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
@@ -16357,7 +16343,7 @@
     cd "$with_override_corba"
     CORBA_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
+    if ! test -f $CORBA_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
@@ -16370,7 +16356,7 @@
     cd "$with_override_jaxp"
     JAXP_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXP_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
@@ -16383,7 +16369,7 @@
     cd "$with_override_jaxws"
     JAXWS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
@@ -16396,8 +16382,7 @@
     cd "$with_override_hotspot"
     HOTSPOT_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
-        ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
+    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
@@ -16410,7 +16395,7 @@
     cd "$with_override_nashorn"
     NASHORN_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
+    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
@@ -16423,7 +16408,7 @@
     cd "$with_override_jdk"
     JDK_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JDK_TOPDIR/make/Makefile; then
       as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
     fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5
--- a/common/autoconf/hotspot-spec.gmk.in	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/autoconf/hotspot-spec.gmk.in	Wed Jul 05 19:24:14 2017 +0200
@@ -129,4 +129,4 @@
 
 # Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
 # This is needed to get the LOG setting to work properly.
-include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
+include $(SRC_ROOT)/make/common/MakeBase.gmk
--- a/common/autoconf/source-dirs.m4	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/autoconf/source-dirs.m4	Wed Jul 05 19:24:14 2017 +0200
@@ -80,32 +80,25 @@
     cd "$CURDIR"
     # Verify that the addon source root does not have any root makefiles.
     # If it does, then it is usually an error, prevent this.
-    if test -f $with_add_source_root/langtools/makefiles/Makefile || \
-      test -f $with_add_source_root/langtools/make/Makefile; then
+    if test -f $with_add_source_root/langtools/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/corba/makefiles/Makefile || \
-      test -f $with_add_source_root/corba/make/Makefile; then
+    if test -f $with_add_source_root/corba/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxp/make/Makefile; then
+    if test -f $with_add_source_root/jaxp/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_add_source_root/jaxws/make/Makefile; then
+    if test -f $with_add_source_root/jaxws/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_add_source_root/hotspot/make/Makefile; then
+    if test -f $with_add_source_root/hotspot/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_add_source_root/nashorn/make/Makefile; then
+    if test -f $with_add_source_root/nashorn/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
     fi
-    if test -f $with_add_source_root/jdk/makefiles/Makefile || \
-      test -f $with_add_source_root/jdk/make/Makefile; then
+    if test -f $with_add_source_root/jdk/make/Makefile; then
       AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
     fi
   fi
@@ -119,32 +112,25 @@
     cd "$with_override_source_root"
     OVERRIDE_SRC_ROOT="`pwd`"
     cd "$CURDIR"
-    if test -f $with_override_source_root/langtools/makefiles/Makefile || \
-      test -f $with_override_source_root/langtools/make/Makefile; then
+    if test -f $with_override_source_root/langtools/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/corba/makefiles/Makefile || \
-      test -f $with_override_source_root/corba/make/Makefile; then
+    if test -f $with_override_source_root/corba/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxp/make/Makefile; then
+    if test -f $with_override_source_root/jaxp/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
-      test -f $with_override_source_root/jaxws/make/Makefile; then
+    if test -f $with_override_source_root/jaxws/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
-      test -f $with_override_source_root/hotspot/make/Makefile; then
+    if test -f $with_override_source_root/hotspot/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
-      test -f $with_override_source_root/nashorn/make/Makefile; then
+    if test -f $with_override_source_root/nashorn/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.])
     fi
-    if test -f $with_override_source_root/jdk/makefiles/Makefile || \
-      test -f $with_override_source_root/jdk/make/Makefile; then
+    if test -f $with_override_source_root/jdk/make/Makefile; then
       AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
     fi
   fi
@@ -195,7 +181,7 @@
     cd "$with_override_langtools"
     LANGTOOLS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
     fi
     AC_MSG_CHECKING([if langtools should be overridden])
@@ -206,7 +192,7 @@
     cd "$with_override_corba"
     CORBA_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
+    if ! test -f $CORBA_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override corba with a full corba repo!])
     fi
     AC_MSG_CHECKING([if corba should be overridden])
@@ -217,7 +203,7 @@
     cd "$with_override_jaxp"
     JAXP_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXP_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
     fi
     AC_MSG_CHECKING([if jaxp should be overridden])
@@ -228,7 +214,7 @@
     cd "$with_override_jaxws"
     JAXWS_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
     fi
     AC_MSG_CHECKING([if jaxws should be overridden])
@@ -239,8 +225,7 @@
     cd "$with_override_hotspot"
     HOTSPOT_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
-        ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
+    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
     fi
     AC_MSG_CHECKING([if hotspot should be overridden])
@@ -251,7 +236,7 @@
     cd "$with_override_nashorn"
     NASHORN_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
+    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
     fi
     AC_MSG_CHECKING([if nashorn should be overridden])
@@ -262,7 +247,7 @@
     cd "$with_override_jdk"
     JDK_TOPDIR="`pwd`"
     cd "$CURDIR"
-    if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
+    if ! test -f $JDK_TOPDIR/make/Makefile; then
       AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
     fi
     AC_MSG_CHECKING([if JDK should be overridden])
--- a/common/autoconf/spec.gmk.in	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/autoconf/spec.gmk.in	Wed Jul 05 19:24:14 2017 +0200
@@ -65,8 +65,8 @@
 endif
 
 # Specify where the common include directory for makefiles is.
-ifeq (,$(findstring -I @SRC_ROOT@/common/makefiles,$(MAKE)))
-  MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
+ifeq (,$(findstring -I @SRC_ROOT@/make/common,$(MAKE)))
+  MAKE:=$(MAKE) -I @SRC_ROOT@/make/common
 endif
 
 # The "human readable" name of this configuration
--- a/common/bin/compare.sh	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/bin/compare.sh	Wed Jul 05 19:24:14 2017 +0200
@@ -1113,14 +1113,15 @@
 if [ -d "$THIS/install/j2sdk-image" ]; then
     THIS_J2SDK="$THIS/install/j2sdk-image"
     THIS_J2RE="$THIS/install/j2re-image"
-    echo "Comparing install images"
+    echo "Selecting install images in this build"
 elif [ -d "$THIS/deploy/j2sdk-image" ]; then
     THIS_J2SDK="$THIS/deploy/j2sdk-image"
     THIS_J2RE="$THIS/deploy/j2re-image"
-    echo "Comparing deploy images"
+    echo "Selecting deploy images in this build"
 elif [ -d "$THIS/images/j2sdk-image" ]; then
     THIS_J2SDK="$THIS/images/j2sdk-image"
     THIS_J2RE="$THIS/images/j2re-image"
+    echo "Selecting jdk images in this build"
 fi
 
 if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
@@ -1128,15 +1129,18 @@
         # If there is an install image, prefer that, it's also overlay
         THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
         THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
+        echo "Selecting install overlay images in this build"
     else
         THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
         THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
+        echo "Selecting jdk overlay images in this build"
     fi
 fi
 
 if [ -d "$THIS/images/j2sdk-bundle" ]; then
     THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
     THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
+    echo "Selecting bundles in this build"
 fi
 
 # Figure out the layout of the other build (old or new, normal or overlay image)
@@ -1144,21 +1148,34 @@
     if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
         OTHER_J2SDK="$OTHER/j2sdk-image"
         OTHER_J2RE="$OTHER/j2re-image"
+        echo "Selecting old-style images in other build"
     else
         OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
         OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
+        echo "Selecting overlay images in other build"
     fi
+elif [ -d "$OTHER/install/j2sdk-image" ]; then
+    OTHER_J2SDK="$OTHER/install/j2sdk-image"
+    OTHER_J2RE="$OTHER/install/j2re-image"
+    echo "Selecting install images in other build"
+elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
+    OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
+    OTHER_J2RE="$OTHER/deploy/j2re-image"
+    echo "Selecting deploy images in other build"
 elif [ -d "$OTHER/images/j2sdk-image" ]; then
     OTHER_J2SDK="$OTHER/images/j2sdk-image"
     OTHER_J2RE="$OTHER/images/j2re-image"
+    echo "Selecting jdk images in other build"
 fi
 
 if [ -d "$OTHER/j2sdk-bundle" ]; then
     OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
     OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
+    echo "Selecting bundles in other build"
 elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
     OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
     OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
+    echo "Selecting jdk bundles in other build"
 fi
 
 if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
--- a/common/makefiles/HotspotWrapper.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Include the legacy hotspot-spec.gmk (which in turns includes spec.gmk)
-BASE_SPEC:=$(SPEC)
-include $(dir $(SPEC))hotspot-spec.gmk
-include MakeBase.gmk
-
-# Inclusion of this pseudo-target will cause make to execute this file
-# serially, regardless of -j. Recursively called makefiles will not be
-# affected, however. This is required for correct dependency management.
-.NOTPARALLEL:
-
-default: all
-
-# Get all files except .hg in the hotspot directory.
-HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
-
-# The old build creates hotspot output dir before calling hotspot and
-# 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))
-	$(TOUCH) $@
-
-hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
-
-all: hotspot
-
-.PHONY: default all hotspot
--- a/common/makefiles/IdlCompilation.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-PREFIXES=-pkgPrefix CORBA org.omg \
-    -pkgPrefix CosNaming org.omg \
-    -pkgPrefix CosTransactions org.omg \
-    -pkgPrefix CosTSInteroperation org.omg \
-    -pkgPrefix DynamicAny org.omg \
-    -pkgPrefix Dynamic org.omg \
-    -pkgPrefix IOP org.omg \
-    -pkgPrefix Messaging org.omg \
-    -pkgPrefix PortableInterceptor org.omg \
-    -pkgPrefix PortableServer org.omg \
-    -pkgPrefix activation com.sun.corba.se.spi \
-    -pkgPrefix GIOP com.sun.corba.se \
-    -pkgPrefix PortableActivationIDL com.sun.corba.se \
-    -pkgPrefix messages com.sun.corba.se
-
-define add_idl_package
-  # param 1 = MYPACKAGE
-  # param 2 = src root
-  # param 3 = gensrc root
-  # param 4 = source idl to compile
-  # param 5 = target idl package
-  # param 6 = delete these files that were output from the idlj
-  # param 7 = idls that match these patterns should be compiled with -oldImplBase
-  # param 8 = the idlj command
-  # Save the generated java files to a temporary directory so
-  # that we can find them and create proper dependencies.
-  # After that, we move them to the real gensrc target dir.
-  $4_TMPDIR:=tmp___$(subst /,_,$(patsubst $2/%,%,$4))___
-  ifneq ($$(filter $7,$4),)
-    $4_OLDIMPLBASE:=-oldImplBase
-    $4_OLDIMPLBASE_MSG:=with -oldImplBase
-  endif
-  $5 : $4
-	$(MKDIR) -p $3/$$($4_TMPDIR)
-	$(RM) -rf $3/$$($4_TMPDIR)
-	$(MKDIR) -p $(dir $5)
-	$(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4)
-	$8 -td $3/$$($4_TMPDIR) \
-	    -i $2/org/omg/CORBA \
-	    -i $2/org/omg/PortableInterceptor \
-	    -i $2/org/omg/PortableServer \
-	    -D CORBA3 -corba 3.0 \
-	    -fall \
-	    $$($4_OLDIMPLBASE) \
-	    $(PREFIXES) \
-	    $4
-	$(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
-	$(CP) -r $3/$$($4_TMPDIR)/* $3
-	($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5)
-	$(RM) -rf $3/$$($4_TMPDIR)
-endef
-
-define SetupIdlCompilation
-  # param 1 is for example BUILD_IDLS
-  # param 2,3,4,5,6,7,8 are named args.
-  #   IDLJ,SRC,BIN,INCLUDES,EXCLUDES,OLDIMPLBASES,DELETES
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
-
-  # Find all existing java files and existing class files.
-  $$(eval $$(call MakeDir,$$($1_BIN)))
-  $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
-  $1_BINS := $$(shell find $$($1_BIN) -name "*.java")
-  # Prepend the source/bin path to the filter expressions.
-  $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES))
-  $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES))
-  $1_BIN_INCLUDES := $$(addprefix $$($1_BIN)/,$$($1_INCLUDES))
-  $1_BIN_EXCLUDES := $$(addprefix $$($1_BIN)/,$$($1_EXCLUDES))
-  $1_OLDIMPLBASES := $$(addprefix $$($1_SRC)/,$$($1_OLDIMPLBASES))
-  # Now remove unwanted java/class files.
-  $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  $1_BINS := $$(filter $$($1_BIN_INCLUDES),$$($1_BINS))
-  $1_BINS := $$(filter-out $$($1_BIN_EXCLUDES),$$($1_BINS))
-  $1 := $$(sort $$(patsubst $$($1_SRC)/%.idl,$$($1_BIN)/%.idl.d,$$($1_SRCS)))
-  # Now create the dependencies for each idl target.
-  $$(foreach p,$$($1),$$(eval $$(call add_idl_package,$1,$$($1_SRC),$$($1_BIN),$$(patsubst $$($1_BIN)/%.idl.d,$$($1_SRC)/%.idl,$$p),$$p,$$($1_DELETES),$$($1_OLDIMPLBASES),$$($1_IDLJ))))
-endef
-
-.SUFFIXES: .java .class .package
--- a/common/makefiles/JavaCompilation.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,592 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This makefile is much simpler now that it can use the smart javac wrapper
-# for dependency tracking between java packages and incremental compiles.
-# It could be even more simple if we added support for incremental jar updates
-# directly from the smart javac wrapper.
-
-# Cleaning/copying properties here is not a good solution. The properties
-# should be cleaned/copied by a annotation processor in sjavac.
-
-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
-ifeq (,$(_MAKEBASE_GMK))
-  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
-endif
-
-FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
-
-define SetupJavaCompiler
-  # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
-  # This is the name of the compiler setup.
-  # param 2-9 are named args.
-  #   JVM:=The jvm used to run the javac/javah command
-  #   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
-  #   FLAGS:=Flags to be supplied to javac
-  #   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
-  #   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
-
-  # The port file contains the tcp/ip on which the server listens
-  # and the cookie necessary to talk to the server.
-  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
-  # You can use a different JVM to run the background javac server.
-  ifeq ($$($1_SERVER_JVM),)
-    # It defaults to the same JVM that is used to start the javac command.
-    $1_SERVER_JVM:=$$($1_JVM)
-  endif
-endef
-
-define SetupArchive
-  # param 1 is for example ARCHIVE_MYPACKAGE
-  # param 2 are the dependecies
-  # param 3,4,5,6,7,8,9 are named args.
-  #   SRCS:=List of directories in where to find files to add to archive
-  #   SUFFIXES:=File suffixes to include in jar
-  #   INCLUDES:=List of directories/packages in SRCS that should be included
-  #   EXCLUDES:=List of directories/packages in SRCS that should be excluded
-  #   EXCLUDE_FILES:=List of files in SRCS that should be excluded
-  #   EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
-  #   JAR:=Jar file to create
-  #   MANIFEST:=Optional manifest file template.
-  #   JARMAIN:=Optional main class to add to manifest
-  #   JARINDEX:=true means generate the index in the jar file.
-  #   SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
-  #       added to the archive.
-  #   EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
-  #   CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
-
-  # NOTE: $2 is dependencies, not a named argument!
-  $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
-
-  $1_JARMAIN:=$(strip $$($1_JARMAIN))
-  $1_JARNAME:=$$(notdir $$($1_JAR))
-  $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
-  $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
-  $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
-  $1_BIN:=$$(dir $$($1_JAR))
-
-  ifeq (,$$($1_SUFFIXES))
-    # No suffix was set, default to classes.
-    $1_SUFFIXES:=.class
-  endif
-  # Convert suffixes to a find expression
-  $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
-  # On windows, a lot of includes/excludes risk making the command line too long, so
-  # writing the grep patterns to files.
-  ifneq (,$$($1_INCLUDES))
-    $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
-        $$(addprefix $$(src)/,$$($1_INCLUDES)))
-    # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
-      $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
-    else
-      $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
-          $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
-          >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
-      $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
-    endif
-  endif
-  ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
-    $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
-        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
-    # If there are a lot of include patterns, output to file to shorten command lines
-    ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
-      $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
-    else
-      $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
-          $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
-          >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
-      $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
-    endif
-  endif
-
-  # Check if this jar needs to have its index generated.
-  ifneq (,$$($1_JARINDEX))
-    $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
-  else
-    $1_JARINDEX = true
-  endif
-  # When this macro is run in the same makefile as the java compilation, dependencies are
-  # transfered in make variables. When the macro is run in a different makefile than the
-  # java compilation, the dependencies need to be found in the filesystem.
-  ifneq (,$2)
-    $1_DEPS:=$2
-  else
-    $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
-        $$(call CacheFind,$$($1_SRCS)))
-    ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
-      $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
-    endif
-    ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
-      $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
-    endif
-    # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
-    # lines, but not here for use in make dependencies.
-    $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
-    ifeq (,$$($1_SKIP_METAINF))
-      $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
-    endif
-  endif
-
-  # Utility macros, to make the shell script receipt somewhat easier to decipher.
-
-  # The capture contents macro finds all files (matching the patterns, typically
-  # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
-  $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-  # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
-  endif
-  # The capture deletes macro finds all deleted files and concatenates them. The resulting file
-  # tells us what to remove from the jar-file.
-  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
-  # The update contents macro updates the jar file with the previously capture contents.
-  # xargs is used to trim the whitespace from the contents file, to see if it is empty.
-  $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && \
-       if [ -n "`$(CAT) _the.$$($1_JARNAME)_contents | $(XARGS)`" ]; then \
-         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
-       fi) $$(NEWLINE))
-  # The s-variants of the above macros are used when the jar is created from scratch.
-  $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
-          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
-      $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
-      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-
-  ifeq (,$$($1_SKIP_METAINF))
-    $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
-        ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
-        $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-  endif
-  $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
-      (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
-
-  # Use a slightly shorter name for logging, but with enough path to identify this jar.
-  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
-
-  ifneq (,$$($1_CHECK_COMPRESS_JAR))
-    $1_JAR_CREATE_OPTIONS := c0fm
-    $1_JAR_UPDATE_OPTIONS := u0f
-    ifeq ($(COMPRESS_JARS), true)
-      $1_JAR_CREATE_OPTIONS := cfm
-      $1_JAR_UPDATE_OPTIONS := uf
-    endif
-  else
-    $1_JAR_CREATE_OPTIONS := cfm
-    $1_JAR_UPDATE_OPTIONS := uf
-  endif
-
-  # Here is the rule that creates/updates the jar file.
-  $$($1_JAR) : $$($1_DEPS)
-	$(MKDIR) -p $$($1_BIN)
-	$$($1_GREP_INCLUDE_OUTPUT)
-	$$($1_GREP_EXCLUDE_OUTPUT)
-	$$(if $$($1_MANIFEST), \
-	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
-	, \
-	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
-	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
-	$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
-	$$(if $$(wildcard $$@), \
-	  $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
-	  $$($1_CAPTURE_CONTENTS) \
-	  $$($1_CAPTURE_METAINF) \
-	  $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
-	  $$($1_CAPTURE_DELETES) \
-	  $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
-	  if [ -s $$($1_DELETESS_FILE) ]; then \
-	    $(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
-	    $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
-	  fi $$(NEWLINE) \
-	  $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
-	  $$($1_JARINDEX) && true \
-	, \
-	  $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
-	  $$($1_SCAPTURE_CONTENTS) \
-	  $$($1_SCAPTURE_METAINF) \
-	  $$($1_SUPDATE_CONTENTS) \
-	  $$($1_JARINDEX) && true )
-
-endef
-
-define SetupZipArchive
-  # param 1 is for example ZIP_MYSOURCE
-  # param 2,3,4,5,6,7,8,9 are named args.
-  #   SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
-
-  # To avoid running find over too large sets of files, which causes make to crash
-  # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
-  # of directories to run find in, if available.
-  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
-    $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
-        $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
-  else
-    $1_FIND_LIST := $$($1_SRC)
-  endif
-
-  # Find all files in the source tree.
-  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
-
-  # Filter on suffixes if set
-  ifneq ($$($1_SUFFIXES),)
-    $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
-  endif
-
-  ifneq ($$($1_INCLUDES),)
-    ifneq ($$($1_SUFFIXES),)
-      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
-          $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
-    else
-      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
-    endif
-  endif
-  ifneq ($$($1_INCLUDE_FILES),)
-    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
-    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
-  endif
-
-  # Use a slightly shorter name for logging, but with enough path to identify this zip.
-  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
-
-  # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
-  # I.e. the zip -i and -x options should match the filtering done in the makefile.
-  # Explicitly excluded files can be given with absolute path. The patsubst solution
-  # isn't perfect but the likelyhood of an absolute path to match something in a src
-  # dir is very small.
-  # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
-  # and only fail if it's not.
-  $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
-	$(MKDIR) -p $$(@D)
-	$(ECHO) Updating $$($1_NAME)
-	$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
-	$(TOUCH) $$@
-endef
-
-define add_file_to_copy
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = The source file to copy.
-  $2_TARGET:=$2
-  # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
-	$(MKDIR) -p $$(@D)
-	$(CP) $$< $$@
-	$(CHMOD) -f ug+w $$@
-
-  # And do not forget this target
-  $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-
-# This macro is used only for properties files that are to be
-# copied over to the classes directory in cleaned form:
-# Previously this was inconsistently done in different repositories.
-# This is the new clean standard. Though it is to be superseded by
-# a standard annotation processor from with sjavac.
-define add_file_to_copy_and_clean
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = The source file to copy and clean.
-  $2_TARGET:=$2
-  # Remove the source prefix.
-  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
-  # Now we can setup the depency that will trigger the copying.
-  $$($1_BIN)$$($2_TARGET) : $2
-	$(MKDIR) -p $$(@D)
-	$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
-	    | $(SED) -f "$(SRC_ROOT)/common/makefiles/support/unicode2x.sed" \
-	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
-	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
-	        -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
-	        -e 's/\\=/=/' | LANG=C $(SORT) > $$@
-	$(CHMOD) -f ug+w $$@
-
-  # And do not forget this target
-  $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
-endef
-
-define remove_string
-  $2 := $$(subst $1,,$$($2))
-endef
-
-define replace_space_with_pathsep
-  $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
-endef
-
-define SetupJavaCompilation
-  # param 1 is for example BUILD_MYPACKAGE
-  # param 2,3,4,5,6,7,8 are named args.
-  #   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
-  #   JVM:=path to ..bin/java
-  #   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
-  #   SRC:=one or more directories to search for sources
-  #   BIN:=store classes here
-  #   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
-  #   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
-  #   COPY:=.prp means copy all prp files to the corresponding package in BIN.
-  #   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
-  #   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
-  #   SRCZIP:=Create a src.zip based on the found sources and copied files.
-  #   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
-  #   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
-  #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
-  #   JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
-  #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
-  #   HEADERS:=path to directory where all generated c-headers are written.
-  #   DEPENDS:=Extra dependecy
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
-
-  # Extract the info from the java compiler setup.
-  $1_JVM := $$($$($1_SETUP)_JVM)
-  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
-  $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
-  ifeq ($$($1_JAVAC),)
-    $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
-  endif
-  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
-  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
-
-  # Handle addons and overrides.
-  $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
-  # Make sure the dirs exist.
-  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
-  $$(eval $$(call MakeDir,$$($1_BIN)))
-  # Find all files in the source trees.
-  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
-  # Extract the java files.
-  ifneq ($$($1_EXCLUDE_FILES),)
-    $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
-  endif
-  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
-  ifneq ($$($1_INCLUDE_FILES),)
-    $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
-    $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
-  endif
-
-  # Now we have a list of all java files to compile: $$($1_SRCS)
-
-  # Create the corresponding smart javac wrapper command line.
-  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
-      $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
-      $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
-      $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
-      -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
-
-  # Prepend the source/bin path to the filter expressions.
-  ifneq ($$($1_INCLUDES),)
-    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
-    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  endif
-
-  # Find all files to be copied from source to bin.
-  ifneq (,$$($1_COPY))
-    # Search for all files to be copied.
-    $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
-    # Copy these explicitly
-    $1_ALL_COPIES += $$($1_COPY_FILES)
-    # Copy must also respect filters.
-    ifneq (,$$($1_INCLUDES))
-      $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
-    endif
-    ifneq (,$$($1_EXCLUDES))
-      $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
-    endif
-    ifneq (,$$($1_EXCLUDE_FILES))
-      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
-    endif
-    # All files below META-INF are always copied.
-    $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
-    ifneq (,$$($1_ALL_COPIES))
-      # Yep, there are files to be copied!
-      $1_ALL_COPY_TARGETS:=
-          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
-      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
-    endif
-  endif
-
-  # Find all property files to be copied and cleaned from source to bin.
-  ifneq (,$$($1_CLEAN))
-    # Search for all files to be copied.
-    $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
-    # Copy and clean must also respect filters.
-    ifneq (,$$($1_INCLUDES))
-      $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_EXCLUDES))
-      $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_EXCLUDE_FILES))
-      $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
-    endif
-    ifneq (,$$($1_ALL_CLEANS))
-      # Yep, there are files to be copied and cleaned!
-      $1_ALL_COPY_CLEAN_TARGETS:=
-          $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
-      # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
-    endif
-  endif
-
-  # Prep the source paths.
-  ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
-    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
-  else
-    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
-  endif
-
-  # Create a sed expression to remove the source roots and to replace / with .
-  # and remove .java at the end.
-  $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
-
-  ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
-    ifneq (,$$($1_HEADERS))
-      $1_HEADERS_ARG := -h $$($1_HEADERS)
-    endif
-
-    # Using sjavac to compile.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
-
-    # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
-    # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
-    # and javac is simply replaced with sjavac.
-    $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
-
-    # Set the $1_REMOTE to spawn a background javac server.
-    $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
-
-    $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
-	$(MKDIR) -p $$(@D)
-	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
-	$(ECHO) Compiling $1
-	($$($1_JVM) $$($1_SJAVAC) \
-	    $$($1_REMOTE) \
-	    -j $(JOBS) \
-	    --permit-unidentified-artifacts \
-	    --permit-sources-without-package \
-	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
-	    --log=$(LOG_LEVEL) \
-	    $$($1_SJAVAC_ARGS) \
-	    $$($1_FLAGS) \
-	    $$($1_HEADERS_ARG) \
-	    -d $$($1_BIN) && \
-	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
-  else
-    # Using plain javac to batch compile everything.
-    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
-
-    # When building in batch, put headers in a temp dir to filter out those that actually
-    # changed before copying them to the real header dir.
-    ifneq (,$$($1_HEADERS))
-      $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
-
-      $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
-		$(MKDIR) -p $$(@D)
-		for f in `ls $$($1_HEADERS).tmp`; do \
-		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
-		    $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
-		  fi; \
-		done
-		$(RM) -r $$($1_HEADERS).tmp
-		$(TOUCH) $$@
-
-      $1 += $$($1_HEADERS)/_the.$1_headers
-    endif
-
-    # When not using sjavac, pass along all sources to javac using an @file.
-    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
-	$(MKDIR) -p $$(@D)
-	$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
-	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
-	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
-	($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
-	    -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
-	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
-	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
-
-  endif
-
-  # Check if a jar file was specified, then setup the rules for the jar.
-  ifneq (,$$($1_JAR))
-    # If no suffixes was explicitly set for this jar file.
-    # Use class and the cleaned/copied properties file suffixes as the default
-    # for the types of files to be put into the jar.
-    ifeq (,$$($1_SUFFIXES))
-      $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
-    endif
-
-    $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
-        SRCS:=$$($1_BIN), \
-        SUFFIXES:=$$($1_SUFFIXES), \
-        EXCLUDE:=$$($1_EXCLUDES), \
-        INCLUDES:=$$($1_INCLUDES), \
-        EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
-        JAR:=$$($1_JAR), \
-        JARMAIN:=$$($1_JARMAIN), \
-        MANIFEST:=$$($1_MANIFEST), \
-        EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
-        JARINDEX:=$$($1_JARINDEX), \
-        HEADERS:=$$($1_HEADERS), \
-        SETUP:=$$($1_SETUP)))
-  endif
-
-  # Check if a srczip was specified, then setup the rules for the srczip.
-  ifneq (,$$($1_SRCZIP))
-    $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
-        SRC:=$$($1_SRC), \
-        ZIP:=$$($1_SRCZIP), \
-        INCLUDES:=$$($1_INCLUDES), \
-        EXCLUDES:=$$($1_EXCLUDES), \
-        EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
-  endif
-
-endef
--- a/common/makefiles/Jprt.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This file is included by the root NewerMakefile and contains targets
-# and utilities needed by JPRT.
-
-# Utilities used in this Makefile. Most of this makefile executes without
-# the context of a spec file from configure.
-CAT=cat
-CMP=cmp
-CP=cp
-ECHO=echo
-MKDIR=mkdir
-PRINTF=printf
-PWD=pwd
-# Insure we have a path that looks like it came from pwd
-# (This is mostly for Windows sake and drive letters)
-define UnixPath # path
-$(shell (cd "$1" && $(PWD)))
-endef
-
-BUILD_DIR_ROOT:=$(root_dir)/build
-
-ifdef OPENJDK
-  OPEN_BUILD=true
-else
-  OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
-      $(wildcard $(root_dir)/jdk/make/closed), \
-      $(wildcard $(root_dir)/jdk/test/closed), \
-      $(wildcard $(root_dir)/hotspot/src/closed), \
-      $(wildcard $(root_dir)/hotspot/make/closed), \
-      $(wildcard $(root_dir)/hotspot/test/closed)), \
-      false,true)
-endif
-
-HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
-
-###########################################################################
-# To help in adoption of the new configure&&make build process, a bridge
-# build will use the old settings to run configure and do the build.
-
-# Build with the configure bridge. After running configure, restart make
-# to parse the new spec file.
-BRIDGE_TARGETS := all
-# Add bootcycle-images target if legacy variable is set.
-ifeq ($(SKIP_BOOT_CYCLE),false)
-  BRIDGE_TARGETS += bootcycle-images
-endif
-bridgeBuild: bridge2configure
-	@cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS)
-
-# Bridge from old Makefile ALT settings to configure options
-bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
-	bash ./configure $(strip $(shell $(CAT) $<))
-
-# Create a file with configure options created from old Makefile mechanisms.
-$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
-	$(RM) $@
-	$(CP) $< $@
-
-# Use this file to only change when obvious things have changed
-$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
-	$(RM) $@.tmp
-	$(MKDIR) -p $(BUILD_DIR_ROOT)
-	@$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
-        ifdef ARCH_DATA_MODEL
-	  @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
-        endif
-        ifeq ($(ARCH_DATA_MODEL),32)
-	  @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
-        endif
-        ifdef ALT_PARALLEL_COMPILE_JOBS
-	  @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
-        endif
-        ifdef ALT_BOOTDIR
-	  @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
-        endif
-        ifdef ALT_CUPS_HEADERS_PATH
-	  @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
-        endif
-        ifdef ALT_FREETYPE_HEADERS_PATH
-	  @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
-        endif
-        ifdef ENABLE_SJAVAC
-	  @$(ECHO) " --enable-sjavac" >> $@.tmp
-        endif
-        ifeq ($(HOTSPOT_AVAILABLE),false)
-          ifdef ALT_JDK_IMPORT_PATH
-	    @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
-          endif
-        endif
-        ifeq ($(OPEN_BUILD),true)
-	  @$(ECHO) " --enable-openjdk-only " >> $@.tmp
-        else
-#         Todo: move to closed?
-          ifdef ALT_MOZILLA_HEADERS_PATH
-	    @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
-          endif
-          ifdef ALT_JUNIT_DIR
-	    @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
-          endif
-          ifdef ANT_HOME
-	    @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
-          endif
-          ifdef ALT_JAVAFX_ZIP_DIR
-	    @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
-          endif
-          ifdef ALT_JMC_ZIP_DIR
-	    @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
-          endif
-          ifdef ALT_WIXDIR
-	    @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
-          endif
-          ifdef ALT_INSTALL_LZMA_PATH
-	    @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
-          endif
-          ifdef ALT_INSTALL_UPX_PATH
-	    @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
-          endif
-          ifdef ALT_INSTALL_UPX_FILENAME
-	    @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
-          endif
-          ifdef ALT_CCSS_SIGNING_DIR
-	    @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
-          endif
-          ifdef ALT_SLASH_JAVA
-	    @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
-          endif
-          ifdef ALT_SPARKLE_FRAMEWORK_DIR
-	    @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
-          endif
-        endif
-	@if [ -f $@ ] ; then \
-	  if ! $(CMP) $@ $@.tmp > /dev/null ; then \
-	    $(CP) $@.tmp $@ ; \
-	  fi ; \
-	else \
-	  $(CP) $@.tmp $@ ; \
-	fi
-	$(RM) $@.tmp
-
-PHONY_LIST += bridge2configure bridgeBuild
-
-###########################################################################
-# JPRT targets
-
-ifndef JPRT_ARCHIVE_BUNDLE
-  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
-endif
-ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
-  JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
-endif
-
-# These targets execute in a SPEC free context, before calling bridgeBuild
-# to generate the SPEC.
-jprt_build_product: DEBUG_LEVEL=release
-jprt_build_product: BUILD_DIRNAME=*-release
-jprt_build_product: jprt_build_generic
-
-jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
-jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
-jprt_build_fastdebug: jprt_build_generic
-
-jprt_build_debug: DEBUG_LEVEL=slowdebug
-jprt_build_debug: BUILD_DIRNAME=*-debug
-jprt_build_debug: jprt_build_generic
-
-jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
-jprt_build_generic: bridgeBuild
-
-# This target must be called in the context of a SPEC file
-jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
-	@$(call CheckIfMakeAtEnd)
-
-# This target must be called in the context of a SPEC file
-$(JPRT_ARCHIVE_BUNDLE): bundles
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
-
-SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
-SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
-SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
-SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
-
-# Bundle up the images
-bundles: all bundles-only
-bundles-only: start-make
-	@$(call TargetEnter)
-	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
-	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
-	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
-	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
-	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
-	fi
-	@$(call TargetExit)
-
-# Copy images to one unified location regardless of platform etc.
-final-images: all final-images-only
-final-images-only: start-make
-	@$(call TargetEnter)
-	$(RM) -r $(BUILD_OUTPUT)/final-images
-	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
-	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
-	$(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
-	$(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
-        ifeq ($(OPENJDK_TARGET_OS),macosx)
-	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
-	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
-	  $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
-	  $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
-        endif
-	@$(call TargetExit)
-
-
-# Keep track of phony targets
-PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
-    jprt_build_generic bundles jprt_bundle \
-    final-images final-images-only
-
-###########################################################################
-# Phony targets
-.PHONY: $(PHONY_LIST)
-
-# Force target
-FRC:
--- a/common/makefiles/Main.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
-
-# Now load the spec
-include $(SPEC)
-
-# Load the vital tools for all the makefiles.
-include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
-
-# Include the corresponding custom file, if present.
--include $(CUSTOM_MAKE_DIR)/Main.gmk
-
-### Clean up from previous run
-
-# Remove any build.log from a previous run, if they exist
-ifneq (,$(BUILD_LOG))
-  ifneq (,$(BUILD_LOG_PREVIOUS))
-    # Rotate old log
-    $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-    $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
-  else
-    $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
-  endif
-  $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
-endif
-# Remove any javac server logs and port files. This
-# prevents a new make run to reuse the previous servers.
-ifneq (,$(SJAVAC_SERVER_DIR))
-  $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
-endif
-
-# Reset the build timers.
-$(eval $(call ResetAllTimers))
-
-# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
-# hence this workaround.
-MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
-
-### Main targets
-
-default: jdk
-	@$(call CheckIfMakeAtEnd)
-
-all: images docs
-	@$(call CheckIfMakeAtEnd)
-
-# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
-# is up to date after changes to configure
-$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
-	@$(ECHO) ERROR: $(SPEC) is not up to date
-	@$(ECHO) Please rerun configure!
-	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
-
-start-make: $(SPEC)
-	@$(call AtMakeStart)
-
-langtools: langtools-only
-langtools-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
-	@$(call TargetExit)
-
-corba: langtools corba-only
-corba-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
-	@$(call TargetExit)
-
-jaxp: langtools jaxp-only
-jaxp-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
-	@$(call TargetExit)
-
-jaxws: langtools jaxp jaxws-only
-jaxws-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
-	@$(call TargetExit)
-
-ifeq ($(BUILD_HOTSPOT),true)
-  hotspot: hotspot-only
-  hotspot-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
-	@$(call TargetExit)
-endif
-
-jdk: langtools hotspot corba jaxp jaxws jdk-only
-jdk-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
-	@$(call TargetExit)
-
-nashorn: jdk nashorn-only
-nashorn-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
-	@$(call TargetExit)
-
-demos: jdk demos-only
-demos-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
-	@$(call TargetExit)
-
-# Note: This double-colon rule is intentional, to support
-# custom make file integration.
-images:: source-tips demos nashorn images-only
-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
-	@$(call TargetExit)
-
-overlay-images: source-tips demos overlay-images-only
-overlay-images-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
-	@$(call TargetExit)
-
-profiles: profiles-oscheck source-tips jdk hotspot profiles-only
-profiles-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
-	@$(call TargetExit)
-
-profiles-oscheck:
-        ifneq ($(OPENJDK_TARGET_OS), linux)
-	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
-        endif
-
-install: images install-only
-install-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
-	@$(call TargetExit)
-
-docs: jdk docs-only
-docs-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
-	@$(call TargetExit)
-
-sign-jars: jdk sign-jars-only
-sign-jars-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
-	@$(call TargetExit)
-
-bootcycle-images: images bootcycle-images-only
-bootcycle-images-only: start-make
-	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
-	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-
-test: images test-only
-test-only: start-make
-	@$(call TargetEnter)
-	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
-	@$(call TargetExit)
-
-# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
-# used to track the exact sources used to build that image.
-source-tips: $(OUTPUT_ROOT)/source_tips
-$(OUTPUT_ROOT)/source_tips: FRC
-	@$(MKDIR) -p $(@D)
-	@$(RM) $@
-	@$(call GetSourceTips)
-
-
-# Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
-	@$(ECHO) Cleaned all build artifacts.
-
-# Remove everything, including configure configuration.
-# If the output directory was created by configure and now becomes empty, remove it as well.
-# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
-dist-clean: clean
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
-	@$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
-	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
-	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
-	  else \
-	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
-	  fi \
-	)
-	@$(ECHO) Cleaned everything, you will have to re-run configure.
-
-clean-langtools:
-	$(call CleanComponent,langtools)
-clean-corba:
-	$(call CleanComponent,corba)
-clean-jaxp:
-	$(call CleanComponent,jaxp)
-clean-jaxws:
-	$(call CleanComponent,jaxws)
-clean-hotspot:
-	$(call CleanComponent,hotspot)
-clean-jdk:
-	$(call CleanComponent,jdk)
-clean-nashorn:
-	$(call CleanComponent,nashorn)
-clean-images:
-	$(call CleanComponent,images)
-clean-overlay-images:
-	$(call CleanComponent,overlay-images)
-clean-bootcycle-build:
-	$(call CleanComponent,bootcycle-build)
-clean-docs:
-	$(call CleanComponent,docs)
-	$(call CleanComponent,docstemp)
-clean-test:
-	$(call CleanComponent,testoutput)
-
-.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
-.PHONY: default all clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
-.PHONY: profiles profiles-only profiles-oscheck
-
-FRC: # Force target
--- a/common/makefiles/MakeBase.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,449 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-#
-# Check that GNU make and cygwin are recent enough.
-# Setup common utility functions.
-#
-################################################################
-
-ifndef _MAKEBASE_GMK
-_MAKEBASE_GMK := 1
-
-# If the variable that you want to send to stdout for piping into a file or otherwise,
-# is potentially long, for example the a list of file paths, eg a list of all package directories.
-# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
-# calls as well as use compression on recurrent file paths segments, to get around the potential
-# command line length problem that exists in cygwin and other shells.
-compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-pre-compress.incl))
-compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-post-compress.incl))
-compress_paths=$(compress_pre)\
-$(subst $(SRC_ROOT),X97,\
-$(subst $(OUTPUT_ROOT),X98,\
-$(subst X,X00,\
-$(subst $(SPACE),\n,$(strip $1)))))\
-$(compress_post)
-
-decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
-    -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
-    -e 's|X00|X|g' | tr '\n' '$2'
-
-define ListPathsSafely_If
-	$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
-endef
-
-define ListPathsSafely_Printf
-	$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
-	    -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
-endef
-
-# Receipt example:
-#   rm -f thepaths
-#   $(call ListPathsSafely,THEPATHS,\n, >> thepaths)
-# The \n argument means translate spaces into \n
-# if instead , , (a space) is supplied, then spaces remain spaces.
-define ListPathsSafely
-	$(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!))
-	$(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3'
-	$(call ListPathsSafely_If,$1,$2,1,250)
-	$(call ListPathsSafely_If,$1,$2,251,500)
-	$(call ListPathsSafely_If,$1,$2,501,750)
-	$(call ListPathsSafely_If,$1,$2,751,1000)
-
-	$(call ListPathsSafely_If,$1,$2,1001,1250)
-	$(call ListPathsSafely_If,$1,$2,1251,1500)
-	$(call ListPathsSafely_If,$1,$2,1501,1750)
-	$(call ListPathsSafely_If,$1,$2,1751,2000)
-
-	$(call ListPathsSafely_If,$1,$2,2001,2250)
-	$(call ListPathsSafely_If,$1,$2,2251,2500)
-	$(call ListPathsSafely_If,$1,$2,2501,2750)
-	$(call ListPathsSafely_If,$1,$2,2751,3000)
-
-	$(call ListPathsSafely_If,$1,$2,3001,3250)
-	$(call ListPathsSafely_If,$1,$2,3251,3500)
-	$(call ListPathsSafely_If,$1,$2,3501,3750)
-	$(call ListPathsSafely_If,$1,$2,3751,4000)
-
-	$(call ListPathsSafely_If,$1,$2,4001,4250)
-	$(call ListPathsSafely_If,$1,$2,4251,4500)
-	$(call ListPathsSafely_If,$1,$2,4501,4750)
-	$(call ListPathsSafely_If,$1,$2,4751,5000)
-
-	$(call ListPathsSafely_If,$1,$2,5001,5250)
-	$(call ListPathsSafely_If,$1,$2,5251,5500)
-	$(call ListPathsSafely_If,$1,$2,5501,5750)
-	$(call ListPathsSafely_If,$1,$2,5751,6000)
-
-	$(call ListPathsSafely_If,$1,$2,6001,6250)
-	$(call ListPathsSafely_If,$1,$2,6251,6500)
-	$(call ListPathsSafely_If,$1,$2,6501,6750)
-	$(call ListPathsSafely_If,$1,$2,6751,7000)
-
-	$(call ListPathsSafely_If,$1,$2,7001,7250)
-	$(call ListPathsSafely_If,$1,$2,7251,7500)
-	$(call ListPathsSafely_If,$1,$2,7501,7750)
-	$(call ListPathsSafely_If,$1,$2,7751,8000)
-
-	$(call ListPathsSafely_If,$1,$2,8001,8250)
-	$(call ListPathsSafely_If,$1,$2,8251,8500)
-	$(call ListPathsSafely_If,$1,$2,8501,8750)
-	$(call ListPathsSafely_If,$1,$2,8751,9000)
-
-	$(call ListPathsSafely_If,$1,$2,9001,9250)
-	$(call ListPathsSafely_If,$1,$2,9251,9500)
-	$(call ListPathsSafely_If,$1,$2,9501,9750)
-	$(call ListPathsSafely_If,$1,$2,9751,10000)
-
-	$(call ListPathsSafely_If,$1,$2,10001,10250)
-	$(call ListPathsSafely_If,$1,$2,10251,10500)
-	$(call ListPathsSafely_If,$1,$2,10501,10750)
-	$(call ListPathsSafely_If,$1,$2,10751,11000)
-
-	$(call ListPathsSafely_If,$1,$2,11001,11250)
-	$(call ListPathsSafely_If,$1,$2,11251,11500)
-	$(call ListPathsSafely_If,$1,$2,11501,11750)
-	$(call ListPathsSafely_If,$1,$2,11751,12000)
-
-	$(call ListPathsSafely_If,$1,$2,12001,12250)
-	$(call ListPathsSafely_If,$1,$2,12251,12500)
-	$(call ListPathsSafely_If,$1,$2,12501,12750)
-	$(call ListPathsSafely_If,$1,$2,12751,13000)
-
-	$(call ListPathsSafely_If,$1,$2,13001,13250)
-	$(call ListPathsSafely_If,$1,$2,13251,13500)
-	$(call ListPathsSafely_If,$1,$2,13501,13750)
-	$(call ListPathsSafely_If,$1,$2,13751,14000)
-
-	$(call ListPathsSafely_If,$1,$2,14001,14250)
-	$(call ListPathsSafely_If,$1,$2,14251,14500)
-	$(call ListPathsSafely_If,$1,$2,14501,14750)
-	$(call ListPathsSafely_If,$1,$2,14751,15000)
-
-	$(call ListPathsSafely_If,$1,$2,15001,15250)
-	$(call ListPathsSafely_If,$1,$2,15251,15500)
-	$(call ListPathsSafely_If,$1,$2,15501,15750)
-	$(call ListPathsSafely_If,$1,$2,15751,16000)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,1)
-	$(call ListPathsSafely_Printf,$1,$2,$3,251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,1001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,1751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,2001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,2751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,3001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,3751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,4001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,4751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,5001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,5751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,6001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,6751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,7001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,7751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,8001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,8751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,9001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,9751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,10001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,10751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,11001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,11751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,12001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,12751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,13001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,13751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,14001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,14751)
-
-	$(call ListPathsSafely_Printf,$1,$2,$3,15001)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15251)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15501)
-	$(call ListPathsSafely_Printf,$1,$2,$3,15751)
-endef
-
-define ListPathsSafelyNow_IfPrintf
-  ifneq (,$$(word $4,$$($1)))
-    $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1))))
-    $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3)
-  endif
-endef
-
-# And an non-receipt version:
-define ListPathsSafelyNow
-  ifneq (,$$(word 10001,$$($1)))
-    $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
-  endif
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000)
-
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750)
-  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000)
-
-endef
-
-# The source tips can come from the Mercurial repository, or in the files
-# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
-# directory as the original $(HGDIR) directory.
-# These should not be := assignments, only used from the root Makefile.
-HG_VERSION = $(shell $(HG) version 2> /dev/null)
-HG_DIRECTORY=.hg
-HGTIP_FILENAME=.hgtip
-HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
-REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
-    $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
-        $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
-        2> /dev/null)))))
-
-# Emit the repo:tip pairs to $@
-define GetSourceTips
-	$(CD) $(SRC_ROOT) ; \
-	for i in $(REPO_LIST) IGNORE ; do \
-	  if [ "$${i}" = "IGNORE" ] ; then \
-	    continue; \
-	  elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
-	    $(PRINTF) " %s:%s" \
-	        "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
-	  elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
-	    $(PRINTF) " %s:%s" \
-	        "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
-	  fi; \
-	done >> $@
-	$(PRINTF) "\n" >> $@
-endef
-
-# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
-define CreateHgTip
-	$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
-	$(ECHO) $1/$(HGTIP_FILENAME)
-endef
-
-define SetupLogging
-  ifeq ($$(LOG_LEVEL),trace)
-    # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
-    # For each target executed, will print
-    # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
-    # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
-    # (and causing a crash on Cygwin).
-    # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
-    # Only use time if it's GNU time which supports format and output file.
-    WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
-    SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
-  endif
-  # Never remove warning messages; this is just for completeness
-  LOG_WARN=
-  ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
-    LOG_INFO=
-  else
-    LOG_INFO=> /dev/null
-  endif
-  ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
-    LOG_DEBUG=
-  else
-    LOG_DEBUG=> /dev/null
-  endif
-  ifneq ($$(findstring $$(LOG_LEVEL),trace),)
-    LOG_TRACE=
-  else
-    LOG_TRACE=> /dev/null
-  endif
-endef
-
-# Make sure logging is setup for everyone that includes MakeBase.gmk.
-$(eval $(call SetupLogging))
-
-# This is to be called by all SetupFoo macros
-define LogSetupMacroEntry
-  $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
-  $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
-endef
-
-# Make directory without forking mkdir if not needed
-define MakeDir
-  ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
-    $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
-  endif
-endef
-
-ifeq ($(OPENJDK_TARGET_OS),solaris)
-  # On Solaris, if the target is a symlink and exists, cp won't overwrite.
-  # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
-  # name of the target file differs from the source file, rename after copy.
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(RM) '$@'
-	$(CP) -f -r -P '$<' '$(@D)'
-	if [ "$(@F)" != "$(<F)" ]; then $(MV) '$(@D)/$(<F)' '$@'; fi
-  endef
-else ifeq ($(OPENJDK_TARGET_OS),macosx)
-  # On mac, extended attributes sometimes creep into the source files, which may later
-  # cause the creation of ._* files which confuses testing. Clear these with xattr if
-  # set. Some files get their write permissions removed after being copied to the
-  # output dir. When these are copied again to images, xattr would fail. By only clearing
-  # attributes when they are present, failing on this is avoided.
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fRP '$<' '$@'
-	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
-  endef
-else
-  define install-file
-	$(MKDIR) -p $(@D)
-	$(CP) -fP '$<' '$@'
-  endef
-endif
-
-# Convenience functions for working around make's limitations with $(filter ).
-containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
-not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
-
-################################################################################
-# In Cygwin, finds are very costly, both because of expensive forks and because
-# of bad file system caching. Find is used extensively in $(shell) commands to
-# find source files. This makes rerunning make with no or few changes rather
-# expensive. To speed this up, these two macros are used to cache the results
-# of simple find commands for reuse.
-#
-# Runs a find and stores both the directories where it was run and the results.
-# This macro can be called multiple times to add to the cache. Only finds files
-# with no filters.
-#
-# Needs to be called with $(eval )
-#
-# Param 1 - Dir to find in
-ifeq ($(OPENJDK_BUILD_OS),windows)
-  define FillCacheFind
-    FIND_CACHE_DIR += $1
-    FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
-  endef
-else
-  define FillCacheFind
-  endef
-endif
-
-# Mimics find by looking in the cache if all of the directories have been cached.
-# Otherwise reverts to shell find. This is safe to call on all platforms, even if
-# cache is deactivated.
-#
-# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
-# Param 1 - Dirs to find in
-define CacheFind
-  $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \
-    $(shell $(FIND) $1 -type f -o -type l), \
-    $(filter $(addsuffix %,$1),$(FIND_CACHE)))
-endef
-
-################################################################################
-
-endif # _MAKEBASE_GMK
--- a/common/makefiles/MakeHelpers.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,306 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-#
-# This file contains helper functions for the top-level Makefile that does
-# not depend on the spec.gmk file having been read. (The purpose of this
-# file is ju to avoid cluttering the top-level Makefile.)
-#
-################################################################
-
-ifndef _MAKEHELPERS_GMK
-_MAKEHELPERS_GMK := 1
-
-##############################
-# Stuff to run at include time
-##############################
-
-# Find out which variables were passed explicitely on the make command line. These
-# will be passed on to sub-makes, overriding spec.gmk settings.
-MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var)))
-
-list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
-list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
-
-# Store the build times in this directory.
-BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
-
-# Global targets are possible to run either with or without a SPEC. The prototypical
-# global target is "help".
-global_targets=help jprt% bridgeBuild
-
-##############################
-# Functions
-##############################
-
-define CheckEnvironment
-        # Find all environment or command line variables that begin with ALT.
-	$(if $(list_alt_overrides),
-	  @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n"
-	  @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n"
-	  @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n\n"
-	)
-endef
-
-### Functions for timers
-
-# Record starting time for build of a sub repository.
-define RecordStartTime
-	$(MKDIR) -p $(BUILDTIMESDIR)
-	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
-endef
-
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more.
-define RecordEndTime
-	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
-	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
-	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
-	    $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
-	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
-	    > $(BUILDTIMESDIR)/build_time_diff_$1
-endef
-
-# Find all build_time_* files and print their contents in a list sorted
-# on the name of the sub repository.
-define ReportBuildTimes
-	$(BUILD_LOG_WRAPPER) $(PRINTF) -- "----- Build times -------\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
-	    "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
-endef
-
-define ResetAllTimers
-  $$(shell $(MKDIR) -p $(BUILDTIMESDIR) && $(RM) $(BUILDTIMESDIR)/build_time_*)
-endef
-
-define StartGlobalTimer
-	$(call RecordStartTime,TOTAL)
-endef
-
-define StopGlobalTimer
-	$(call RecordEndTime,TOTAL)
-endef
-
-### Functions for managing makefile structure (start/end of makefile and individual targets)
-
-# Do not indent this function, this will add whitespace at the start which the caller won't handle
-define GetRealTarget
-$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
-endef
-
-# Do not indent this function, this will add whitespace at the start which the caller won't handle
-define LastGoal
-$(strip $(lastword $(call GetRealTarget)))
-endef
-
-# Check if the current target is the final target, as specified by
-# the user on the command line. If so, call AtRootMakeEnd.
-define CheckIfMakeAtEnd
-        # Check if the current target is the last goal
-	$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
-        # If the target is 'foo-only', check if our goal was stated as 'foo'
-	$(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
-endef
-
-# Hook to be called when starting to execute a top-level target
-define TargetEnter
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
-	$(call RecordStartTime,$(patsubst %-only,%,$@))
-endef
-
-# Hook to be called when finish executing a top-level target
-define TargetExit
-	$(call RecordEndTime,$(patsubst %-only,%,$@))
-	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
-	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
-	$(call CheckIfMakeAtEnd)
-endef
-
-# Hook to be called as the very first thing when running a normal build
-define AtMakeStart
-	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
-	$(call CheckEnvironment)
-	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
-	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
-	$(call StartGlobalTimer)
-endef
-
-# Hook to be called as the very last thing for targets that are "top level" targets
-define AtMakeEnd
-	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && echo Stopping sjavac server && $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
-	$(call StopGlobalTimer)
-	$(call ReportBuildTimes)
-	@$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
-	$(call CheckEnvironment)
-endef
-
-### Functions for parsing and setting up make options from command-line
-
-define FatalError
-  # If the user specificed a "global" target (e.g. 'help'), do not exit but continue running
-  $$(if $$(filter-out $(global_targets),$$(call GetRealTarget)),$$(error Cannot continue))
-endef
-
-define ParseLogLevel
-  ifeq ($$(origin VERBOSE),undefined)
-    # Setup logging according to LOG (but only if VERBOSE is not given)
-
-    # If the "nofile" argument is given, act on it and strip it away
-    ifneq ($$(findstring nofile,$$(LOG)),)
-      # Reset the build log wrapper, regardless of other values
-      override BUILD_LOG_WRAPPER=
-      # COMMA is defined in spec.gmk, but that is not included yet
-      COMMA=,
-      # First try to remove ",nofile" if it exists
-      LOG_STRIPPED1=$$(subst $$(COMMA)nofile,,$$(LOG))
-      # Otherwise just remove "nofile"
-      LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1))
-      # We might have ended up with a leading comma. Remove it
-      LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2)))
-      LOG_LEVEL:=$$(LOG_STRIPPED3)
-    else
-      LOG_LEVEL:=$$(LOG)
-    endif
-
-    ifeq ($$(LOG_LEVEL),)
-      # Set LOG to "warn" as default if not set (and no VERBOSE given)
-      override LOG_LEVEL=warn
-    endif
-    ifeq ($$(LOG_LEVEL),warn)
-      VERBOSE=-s
-    else ifeq ($$(LOG_LEVEL),info)
-      VERBOSE=-s
-    else ifeq ($$(LOG_LEVEL),debug)
-      VERBOSE=
-    else ifeq ($$(LOG_LEVEL),trace)
-      VERBOSE=
-    else
-      $$(info Error: LOG must be one of: warn, info, debug or trace.)
-      $$(eval $$(call FatalError))
-    endif
-  else
-    # Provide resonable interpretations of LOG_LEVEL if VERBOSE is given.
-    ifeq ($(VERBOSE),)
-      LOG_LEVEL:=debug
-    else
-      LOG_LEVEL:=warn
-    endif
-    ifneq ($$(LOG),)
-      # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves,
-      # but complain if this is the top-level make call.
-      ifeq ($$(MAKELEVEL),0)
-        $$(info Cannot use LOG=$$(LOG) and VERBOSE=$$(VERBOSE) at the same time. Choose one.)
-        $$(eval $$(call FatalError))
-      endif
-    endif
-  endif
-endef
-
-define ParseConfAndSpec
-  ifneq ($$(filter-out $(global_targets),$$(call GetRealTarget)),)
-    # If we only have global targets, no need to bother with SPEC or CONF
-    ifneq ($$(origin SPEC),undefined)
-      # We have been given a SPEC, check that it works out properly
-      ifeq ($$(wildcard $$(SPEC)),)
-        $$(info Cannot locate spec.gmk, given by SPEC=$$(SPEC))
-        $$(eval $$(call FatalError))
-      endif
-      ifneq ($$(origin CONF),undefined)
-        # We also have a CONF argument. This is OK only if this is a repeated call by ourselves,
-        # but complain if this is the top-level make call.
-        ifeq ($$(MAKELEVEL),0)
-          $$(info Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
-          $$(eval $$(call FatalError))
-        endif
-      endif
-      # ... OK, we're satisfied, we'll use this SPEC later on
-    else
-      # Find all spec.gmk files in the build output directory
-      output_dir=$$(root_dir)/build
-      all_spec_files=$$(wildcard $$(output_dir)/*/spec.gmk)
-      ifeq ($$(all_spec_files),)
-        $$(info No configurations found for $$(root_dir)! Please run configure to create a configuration.)
-        $$(eval $$(call FatalError))
-      endif
-      # Extract the configuration names from the path
-      all_confs=$$(patsubst %/spec.gmk,%,$$(patsubst $$(output_dir)/%,%,$$(all_spec_files)))
-
-      ifneq ($$(origin CONF),undefined)
-        # User have given a CONF= argument.
-        ifeq ($$(CONF),)
-          # If given CONF=, match all configurations
-          matching_confs=$$(strip $$(all_confs))
-        else
-          # Otherwise select those that contain the given CONF string
-          matching_confs=$$(strip $$(foreach var,$$(all_confs),$$(if $$(findstring $$(CONF),$$(var)),$$(var))))
-        endif
-        ifeq ($$(matching_confs),)
-          $$(info No configurations found matching CONF=$$(CONF))
-          $$(info Available configurations:)
-          $$(foreach var,$$(all_confs),$$(info * $$(var)))
-          $$(eval $$(call FatalError))
-        else
-          ifeq ($$(words $$(matching_confs)),1)
-            $$(info Building '$$(matching_confs)' (matching CONF=$$(CONF)))
-          else
-            $$(info Building target '$(call GetRealTarget)' in the following configurations (matching CONF=$$(CONF)):)
-            $$(foreach var,$$(matching_confs),$$(info * $$(var)))
-          endif
-        endif
-
-        # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
-        SPEC=$$(addsuffix /spec.gmk,$$(addprefix $$(output_dir)/,$$(matching_confs)))
-      else
-        # No CONF or SPEC given, check the available configurations
-        ifneq ($$(words $$(all_spec_files)),1)
-          $$(info No CONF given, but more than one configuration found in $$(output_dir).)
-          $$(info Available configurations:)
-          $$(foreach var,$$(all_confs),$$(info * $$(var)))
-          $$(info Please retry building with CONF=<config pattern> (or SPEC=<specfile>))
-          $$(eval $$(call FatalError))
-        endif
-
-        # We found exactly one configuration, use it
-        SPEC=$$(strip $$(all_spec_files))
-      endif
-    endif
-  endif
-endef
-
-### Convenience functions from Main.gmk
-
-# Cleans the component given as $1
-define CleanComponent
-	@$(PRINTF) "Cleaning $1 build artifacts ..."
-	@($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
-	@$(PRINTF) " done\n"
-endef
-
-endif # _MAKEHELPERS_GMK
--- a/common/makefiles/Makefile	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include ../../NewMakefile.gmk
--- a/common/makefiles/NativeCompilation.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,594 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# When you read this source. Remember that $(sort ...) has the side effect
-# of removing duplicates. It is actually this side effect that is
-# desired whenever sort is used below!
-
-ifeq (,$(_MAKEBASE_GMK))
-  $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
-endif
-
-ifeq ($(COMPILER_TYPE),CC)
-  COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
-  LINKING_MSG=echo $(LOG_INFO) "Linking $1"
-  LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
-  ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
-else
-  COMPILING_MSG=
-  LINKING_MSG=
-  LINKING_EXE_MSG=
-  ARCHIVING_MSG=
-endif
-
-define add_native_source
-  # param 1 = BUILD_MYPACKAGE
-  # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
-  # param 3 = the bin dir that stores all .o (.obj) and .d files.
-  # param 4 = the c flags to the compiler
-  # param 5 = the c compiler
-  # param 6 = the c++ flags to the compiler
-  # param 7 = the c++ compiler
-  # param 8 = the flags to the assembler
-
-  ifneq (,$$(filter %.c,$2))
-    # Compile as a C file
-    $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$5
-    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
-  else ifneq (,$$(filter %.m,$2))
-    # Compile as a objective-c file
-    $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$5
-    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
-  else ifneq (,$$(filter %.s,$2))
-    # Compile as assembler file
-    $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
-    $1_$2_COMP=$(AS)
-    $1_$2_DEP_FLAG:=
-  else
-    # Compile as a C++ file
-    $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
-    $1_$2_COMP=$7
-    $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
-  endif
-  # Generate the .o (.obj) file name and place it in the bin dir.
-  $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $2)))))
-  # Only continue if this object file hasn't been processed already. This lets the first found
-  # source file override any other with the same name.
-  ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR)))
-    $1_OBJS_SO_FAR+=$$($1_$2_OBJ)
-    ifeq (,$$(filter %.s,$2))
-      # And this is the dependency file for this obj file.
-      $1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ))
-      # Include previously generated dependency information. (if it exists)
-      -include $$($1_$2_DEP)
-
-      ifeq ($(COMPILER_TYPE),CL)
-        $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
-            -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
-      endif
-    endif
-
-    $$($1_$2_OBJ) : $2
-        ifeq ($(COMPILER_TYPE),CC)
-	  $$(call COMPILING_MSG,$2,$$($1_TARGET))
-          # The Sun studio compiler doesn't output the full path to the object file in the
-          # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
-          ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
-	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
-	    $(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
-          else
-	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
-          endif
-        endif
-        # The Visual Studio compiler lacks a feature for generating make dependencies, but by
-        # setting -showIncludes, all included files are printed. These are filtered out and
-        # parsed into make dependences.
-        ifeq ($(COMPILER_TYPE),CL)
-	  ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
-	      $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
-	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
-	      && exit `cat $$($1_$2_DEP).exitvalue`
-	  $(RM) $$($1_$2_DEP).exitvalue
-	  ($(ECHO) $$@: \\ \
-	  && $(SED) -e '/^Note: including file:/!d' \
-	      -e 's|Note: including file: *||' \
-	      -e 's|\\|/|g' \
-	      -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
-	      -e '/$(subst /,\/,$(TOPDIR))/!d' \
-	      -e 's|$$$$| \\|g' \
-	      $$($1_$2_DEP).raw) > $$($1_$2_DEP)
-        endif
-  endif
-endef
-
-define SetupNativeCompilation
-  # param 1 is for example BUILD_MYPACKAGE
-  # param 2,3,4,5,6,7,8 are named args.
-  #   SRC one or more directory roots to scan for C/C++ files.
-  #   LANG C or C++
-  #   CFLAGS the compiler flags to be used, used both for C and C++.
-  #   CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS.
-  #   LDFLAGS the linker flags to be used, used both for C and C++.
-  #   LDFLAGS_SUFFIX the linker flags to be added last on the commandline
-  #       typically the libraries linked to.
-  #   ARFLAGS the archiver flags to be used
-  #   OBJECT_DIR the directory where we store the object files
-  #   LIBRARY the resulting library file
-  #   PROGRAM the resulting exec file
-  #   INCLUDES only pick source from these directories
-  #   EXCLUDES do not pick source from these directories
-  #   INCLUDE_FILES only compile exactly these files!
-  #   EXCLUDE_FILES with these names
-  #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
-  #   RC_FLAGS flags for RC.
-  #   MAPFILE mapfile
-  #   REORDER reorder file
-  #   DEBUG_SYMBOLS add debug symbols (if configured on)
-  #   CC the compiler to use, default is $(CC)
-  #   LDEXE the linker to use for linking executables, default is $(LDEXE)
-  #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
-  $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
-
-  ifneq (,$$($1_BIN))
-    $$(error BIN has been replaced with OBJECT_DIR)
-  endif
-
-  ifneq (,$$($1_LIB))
-    $$(error LIB has been replaced with LIBRARY)
-  endif
-
-  ifneq (,$$($1_EXE))
-    $$(error EXE has been replaced with PROGRAM)
-  endif
-
-  ifneq (,$$($1_LIBRARY))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error LIBRARY requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
-      $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
-      $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
-    endif
-
-    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
-      $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
-    endif
-
-    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$(SHARED_LIBRARY_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-
-  endif
-
-  ifneq (,$$($1_STATIC_LIBRARY))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error STATIC_LIBRARY requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
-      $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
-      $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
-    endif
-
-    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
-      $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
-    endif
-
-    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$(STATIC_LIBRARY_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-  endif
-
-  ifneq (,$$($1_PROGRAM))
-    ifeq (,$$($1_OUTPUT_DIR))
-      $$(error PROGRAM requires OUTPUT_DIR)
-    endif
-
-    ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
-      $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
-    endif
-
-    ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
-      $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
-    endif
-
-    $1_BASENAME:=$$($1_PROGRAM)$(EXE_SUFFIX)
-    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
-
-  endif
-
-  ifeq (,$$($1_TARGET))
-    $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
-  endif
-
-  ifeq (,$$($1_LANG))
-    $$(error You have to specify LANG for native compilation $1)
-  endif
-  ifeq (C,$$($1_LANG))
-    ifeq ($$($1_LDEXE),)
-      $1_LDEXE:=$(LDEXE)
-    endif
-    $1_LD:=$(LD)
-  else
-    ifeq (C++,$$($1_LANG))
-      $1_LD:=$(LDCXX)
-      $1_LDEXE:=$(LDEXECXX)
-    else
-      $$(error Unknown native language $$($1_LANG) for $1)
-    endif
-  endif
-
-  ifeq ($$($1_CC),)
-    $1_CC:=$(CC)
-  endif
-
-  # Make sure the dirs exist.
-  $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
-  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
-
-  # Find all files in the source trees. Sort to remove duplicates.
-  $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
-  # Extract the C/C++ files.
-  $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
-  $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
-  ifneq ($$($1_EXCLUDE_FILES),)
-    $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
-  endif
-  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.s %.c %.cpp %.m,$$($1_ALL_SRCS)))
-  ifneq (,$$(strip $$($1_INCLUDE_FILES)))
-    $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
-  endif
-  ifeq (,$$($1_SRCS))
-    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
-  endif
-  # There can be only a single bin dir root, no need to foreach over the roots.
-  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
-  # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
-  # and we have a list of all existing object files: $$($1_BINS)
-
-  # Prepend the source/bin path to the filter expressions. Then do the filtering.
-  ifneq ($$($1_INCLUDES),)
-    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
-    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
-  endif
-  ifneq ($$($1_EXCLUDES),)
-    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
-    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
-  endif
-
-  # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
-  # a reproducable order on the input files to the linker).
-  $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))))
-  # Are there too many object files on disk? Perhaps because some source file was removed?
-  $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
-  # Clean out the superfluous object files.
-  ifneq ($$($1_SUPERFLUOUS_OBJS),)
-    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
-  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
-  ifneq ($(DEBUG_LEVEL),release)
-    # Pickup extra debug dependent variables for CFLAGS
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
-  else
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
-    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
-  $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
-  ifneq ($(DEBUG_LEVEL),release)
-    # Pickup extra debug dependent variables for CXXFLAGS
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
-  else
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
-    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
-  endif
-
-  ifneq (,$$($1_DEBUG_SYMBOLS))
-    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-      ifdef OPENJDK
-        # Always add debug symbols
-        $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
-        $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
-      else
-        # Programs don't get the debug symbols added in the old build. It's not clear if
-        # this is intentional.
-        ifeq ($$($1_PROGRAM),)
-          $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
-          $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
-        endif
-      endif
-    endif
-  endif
-
-  ifeq ($$($1_CXXFLAGS),)
-    $1_CXXFLAGS:=$$($1_CFLAGS)
-  endif
-  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
-    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
-  endif
-
-  ifneq (,$$($1_REORDER))
-    $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
-    $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
-  endif
-
-  ifeq (NONE, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
-  else ifeq (LOW, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
-  else ifeq (HIGH, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
-  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
-    $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
-    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
-  else ifneq (, $$($1_OPTIMIZATION))
-    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
-  endif
-
-  # Now call add_native_source for each source file we are going to compile.
-  $$(foreach p,$$($1_SRCS), \
-      $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
-          $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
-          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
-
-  # On windows we need to create a resource file
-  ifeq ($(OPENJDK_TARGET_OS), windows)
-    ifneq (,$$($1_VERSIONINFO_RESOURCE))
-      $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
-      $$($1_RES): $$($1_VERSIONINFO_RESOURCE)
-		$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE)
-    endif
-    ifneq (,$$($1_MANIFEST))
-      $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
-      IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
-      $$($1_GEN_MANIFEST): $$($1_MANIFEST)
-		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
-    endif
-  endif
-
-  # mapfile doesnt seem to be implemented on macosx (yet??)
-  ifneq ($(OPENJDK_TARGET_OS),macosx)
-    ifneq ($(OPENJDK_TARGET_OS),windows)
-      $1_REAL_MAPFILE:=$$($1_MAPFILE)
-      ifneq (,$$($1_REORDER))
-        $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
-
-        $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
-		$$(MKDIR) -p $$(@D)
-		$$(CP) $$($1_MAPFILE) $$@.tmp
-		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
-		$$(MV) $$@.tmp $$@
-      endif
-    endif
-  endif
-
-  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
-  # for LDFLAGS and LDFLAGS_SUFFIX
-  $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
-  $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
-  ifneq (,$$($1_REAL_MAPFILE))
-    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
-  endif
-
-  $1 := $$($1_TARGET)
-  ifneq (,$$($1_LIBRARY))
-    # Generating a dynamic library.
-    $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
-    ifeq ($(OPENJDK_TARGET_OS), windows)
-      $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
-    endif
-
-    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
-
-    ifneq (,$$($1_DEBUG_SYMBOLS))
-      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-        ifeq ($(OPENJDK_TARGET_OS), windows)
-          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
-              "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
-        endif
-
-        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
-          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
-		$(CP) $$< $$@
-        endif
-
-        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
-          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
-            ifeq ($(OPENJDK_TARGET_OS), solaris)
-              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-              # empty section headers until a fixed $(OBJCOPY) is available.
-              # An empty section header has sh_addr == 0 and sh_size == 0.
-              # This problem has only been seen on Solaris X64, but we call this tool
-              # on all Solaris builds just in case.
-              #
-              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
-				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
-		$(RM) $$@
-		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-            else # not solaris
-              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
-		$(RM) $$@
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-            endif # Touch to not retrigger rule on rebuild
-		$(TOUCH) $$@
-          endif # !windows
-        endif # !macosx
-
-        ifeq ($(ZIP_DEBUGINFO_FILES), true)
-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
-          $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
-
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
-          else
-            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
-                $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-          endif
-endif # no MacOS X support yet
-        else
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
-                $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
-          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-            $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-          endif
-        endif
-      endif
-    endif
-
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE)
-	$$(call LINKING_MSG,$$($1_BASENAME))
-	$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
-	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
-	$$($1_EXTRA_LDFLAGS_SUFFIX)
-
-  endif
-
-  ifneq (,$$($1_STATIC_LIBRARY))
-    # Generating a static library, ie object file archive.
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES)
-	$$(call ARCHIVING_MSG,$$($1_LIBRARY))
-	$(AR) $$($1_AR_FLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
-	    $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
-  endif
-
-  ifneq (,$$($1_PROGRAM))
-    # A executable binary has been specified, setup the target for it.
-    ifneq (,$$($1_DEBUG_SYMBOLS))
-      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
-        ifeq ($(OPENJDK_TARGET_OS), windows)
-          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
-              "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
-        endif
-
-        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
-          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
-		$(CP) $$< $$@
-        endif
-
-        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
-          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
-            ifeq ($(OPENJDK_TARGET_OS), solaris)
-              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
-              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
-              # empty section headers until a fixed $(OBJCOPY) is available.
-              # An empty section header has sh_addr == 0 and sh_size == 0.
-              # This problem has only been seen on Solaris X64, but we call this tool
-              # on all Solaris builds just in case.
-              #
-              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
-				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
-		$(RM) $$@
-		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-            else # not solaris
-              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
-		$(RM) $$@
-		$(OBJCOPY) --only-keep-debug $$< $$@
-		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-            endif
-		$(TOUCH) $$@
-          endif # !windows
-        endif # !macosx
-
-        ifeq ($(ZIP_DEBUGINFO_FILES), true)
-ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
-          $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
-
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
-          else
-            $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
-                $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
-		$(CD) $$($1_OBJECT_DIR) \
-		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
-          endif
-endif # no MacOS X support yet
-        else
-          ifeq ($(OPENJDK_TARGET_OS), windows)
-            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
-                $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
-          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
-            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-          endif
-        endif
-      endif
-    endif
-
-    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
-
-    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
-	$$(call LINKING_EXE_MSG,$$($1_BASENAME))
-	$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
-	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
-	$$($1_EXTRA_LDFLAGS_SUFFIX)
-        ifneq (,$$($1_GEN_MANIFEST))
-	  $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
-        endif
-        # This only works if the openjdk_codesign identity is present on the system. Let
-        # silently fail otherwise.
-        ifneq (,$(CODESIGN))
-          ifneq (,$$($1_CODESIGN))
-	    $(CODESIGN) -s openjdk_codesign $$@
-          endif
-        endif
-  endif
-endef
--- a/common/makefiles/RMICompilation.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-define SetupRMICompilation
-  # param 1 is a name for a variable to depend on.
-  # param 2 and up are named args.
-  #   CLASSES:=List of classes to generate stubs for
-  #   CLASSES_DIR:=Directory where to look for classes
-  #   STUB_CLASSES_DIR:=Directory in where to put stub classes
-  #   RUN_V11:=Set to run rmic with -v1.1
-  #   RUN_V12:=Set to run rmic with -v1.2
-  #   RUN_IIOP:=Set to run rmic with -iiop
-  #   RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
-  #   KEEP_GENERATED:=Set to keep generated sources around
-  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
-  $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
-  $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
-
-  $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
-
-  $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
-  $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
-  $1_STUB_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Stub.class,$$($1_CLASSES_SLASH)))
-  $1_TARGETS := $$($1_STUB_FILES)
-  $1_ARGS :=
-  ifneq (,$$($1_RUN_V11))
-    $1_SKEL_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Skel.class,$$($1_CLASSES_SLASH)))
-    $1_TARGETS += $$($1_SKEL_FILES)
-    $1_ARGS += -v1.1
-  endif
-  ifneq (,$$($1_RUN_V12))
-    $1_ARGS += -v1.2
-  endif
-
-  $1_TIE_BASE_FILES := $$(foreach f,$$($1_CLASSES_SLASH),$$(dir $$f)_$$(notdir $$f))
-  $1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
-  $1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
-
-  ifneq (,$$($1_RUN_IIOP))
-    $1_TARGETS += $$($1_TIE_FILES)
-    $1_ARGS += -iiop -emitPermissionCheck
-  endif
-  ifneq (,$$($1_RUN_IIOP_STDPKG))
-    $1_TARGETS += $$($1_TIE_STDPKG_FILES)
-    $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
-  endif
-
-  ifneq (,$$($1_KEEP_GENERATED))
-    $1_ARGS += -keepgenerated
-    $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
-  endif
-
-  $1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
-
-  $$($1_TARGETS): $$($1_DEP_FILE) $$($1_CLASS_FILES)
-
-  $$($1_DEP_FILE): $$($1_CLASS_FILES)
-	$(MKDIR) -p $$($1_STUB_CLASSES_DIR)
-	if [ "x$$($1_ARGS)" != "x" ]; then \
-	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) && \
-	  $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
-	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
-	fi;
-	if [ "x$$($1_ARGS2)" != "x" ]; then \
-	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) && \
-	  $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
-	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
-	fi;
-	$(TOUCH) $$@
-
-
-  $1 := $$($1_TARGETS) $$($1_DEP_FILE)
-
-endef
--- a/common/makefiles/devkit/Makefile	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-##########################################################################################
-#
-# This Makefile, together with Tools.gmk, can be used to compile a set of
-# gcc based cross compilation, portable, self contained packages, capable
-# of building OpenJDK.
-#
-# In addition to the makefiles, access to Oracle Linux installation
-# media is required. This has been tested against Oracle Enterprise Linux
-# 5.5. Set variables RPM_DIR_x86_64 and RPM_DIR_i686 respectively to point
-# to directory containing the RPMs.
-#
-# By default this Makefile will build crosstools for:
-# * i686-unknown-linux-gnu
-# * x86_64-unknown-linux-gnu
-# The x86_64 version of the compilers will work in multi arch mode and will
-# be able to compile 32bit binaries with the -m32 flag. This makes the
-# explicit cross compiler for i686 somewhat redundant and is a known issue.
-#
-# To build the full set of crosstools, use a command line looking like this:
-#
-# make tars RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
-#
-# To create a x86_64 package without the redundant i686 cross compiler, do
-# like this:
-#
-# make tars platforms=x86_64-unknown-linux-gnu RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
-
-#
-# Main makefile which iterates over all host and target platforms.
-#
-
-os := $(shell uname -o)
-cpu := x86_64
-#$(shell uname -p)
-
-#
-# This wrapper script can handle exactly these platforms
-#
-platforms := $(foreach p,x86_64 i686,$(p)-unknown-linux-gnu)
-#platforms := $(foreach p,x86_64,$(p)-unknown-linux-gnu)
-
-# Figure out what platform this is building on.
-me := $(cpu)-$(if $(findstring Linux,$(os)),unknown-linux-gnu)
-
-$(info Building on platform $(me))
-
-all compile : $(platforms)
-
-ifeq (,$(SKIP_ME))
-  $(foreach p,$(filter-out $(me),$(platforms)),$(eval $(p) : $$(me)))
-endif
-
-OUTPUT_ROOT = $(abspath ../../../build/devkit)
-RESULT = $(OUTPUT_ROOT)/result
-
-submakevars = HOST=$@ BUILD=$(me) \
-    RESULT=$(RESULT) PREFIX=$(RESULT)/$@ \
-    OUTPUT_ROOT=$(OUTPUT_ROOT)
-$(platforms) :
-	@echo 'Building compilers for $@'
-	@echo 'Targets: $(platforms)'
-	for p in $@ $(filter-out $@,$(platforms)); do \
-	  $(MAKE) -f Tools.gmk all $(submakevars) \
-	      TARGET=$$p || exit 1 ; \
-	done
-	@echo 'Building ccache program for $@'
-	$(MAKE) -f Tools.gmk ccache $(submakevars) TARGET=$@
-	@echo 'All done"'
-
-$(foreach a,i686 x86_64,$(eval $(a) : $(filter $(a)%,$(platforms))))
-
-ia32 : i686
-today := $(shell date +%Y%m%d)
-
-
-define Mktar
-  $(1)_tar = $$(RESULT)/sdk-$(1)-$$(today).tar.gz
-  $$($(1)_tar) : PLATFORM = $(1)
-  TARFILES += $$($(1)_tar)
-  $$($(1)_tar) : $(1) $$(shell find $$(RESULT)/$(1))
-endef
-
-$(foreach p,$(platforms),$(eval $(call Mktar,$(p))))
-
-tars : all $(TARFILES)
-onlytars : $(TARFILES)
-%.tar.gz :
-	@echo 'Creating compiler package $@'
-	cd $(RESULT)/$(PLATFORM) && tar -czf $@ *
-	touch $@
-
-clean :
-	rm -rf build result
-
-FORCE :
-.PHONY : $(configs) $(platforms)
--- a/common/makefiles/devkit/Tools.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,473 +0,0 @@
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-##########################################################################################
-#
-# Workhorse makefile for creating ONE cross compiler
-# Needs either to be from BUILD -> BUILD OR have
-# BUILD -> HOST prebuilt
-#
-# NOTE: There is a bug here. We don't limit the
-# PATH when building BUILD -> BUILD, which means that
-# if you configure after you've once build the BUILD->BUILD
-# compiler THAT one will be picked up as the compiler for itself.
-# This is not so great, especially if you did a partial delete
-# of the target tree.
-#
-# Fix this...
-#
-
-$(info TARGET=$(TARGET))
-$(info HOST=$(HOST))
-$(info BUILD=$(BUILD))
-
-ARCH := $(word 1,$(subst -, ,$(TARGET)))
-
-##########################################################################################
-# Define external dependencies
-
-# Latest that could be made to work.
-gcc_ver := gcc-4.7.3
-binutils_ver := binutils-2.22
-ccache_ver := ccache-3.1.9
-mpfr_ver := mpfr-3.0.1
-gmp_ver := gmp-4.3.2
-mpc_ver := mpc-1.0.1
-
-GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.bz2
-BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.bz2
-CCACHE := http://samba.org/ftp/ccache/$(ccache_ver).tar.gz
-MPFR := http://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
-GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
-MPC := http://www.multiprecision.org/mpc/download/${mpc_ver}.tar.gz
-
-# RPMs in OEL5.5
-RPM_LIST := \
-    kernel-headers \
-    glibc-2 glibc-headers glibc-devel \
-    cups-libs cups-devel \
-    libX11 libX11-devel \
-    xorg-x11-proto-devel \
-    alsa-lib alsa-lib-devel \
-    libXext libXext-devel \
-    libXtst libXtst-devel \
-    libXrender libXrender-devel \
-    freetype freetype-devel \
-    libXt libXt-devel \
-    libSM libSM-devel \
-    libICE libICE-devel \
-    libXi libXi-devel \
-    libXdmcp libXdmcp-devel \
-    libXau libXau-devel \
-    libgcc
-
-
-ifeq ($(ARCH),x86_64)
-  RPM_DIR ?= $(RPM_DIR_x86_64)
-  RPM_ARCHS := x86_64
-  ifeq ($(BUILD),$(HOST))
-    ifeq ($(TARGET),$(HOST))
-      # When building the native compiler for x86_64, enable mixed mode.
-      RPM_ARCHS += i386 i686
-    endif
-  endif
-else
-  RPM_DIR ?= $(RPM_DIR_i686)
-  RPM_ARCHS := i386 i686
-endif
-
-# Sort to remove duplicates
-RPM_FILE_LIST := $(sort $(foreach a,$(RPM_ARCHS),$(wildcard $(patsubst %,$(RPM_DIR)/%*$a.rpm,$(RPM_LIST)))))
-
-ifeq ($(RPM_FILE_LIST),)
-  $(error Found no RPMs, RPM_DIR must point to list of directories to search for RPMs)
-endif
-
-##########################################################################################
-# Define common directories and files
-
-# Ensure we have 32-bit libs also for x64. We enable mixed-mode.
-ifeq (x86_64,$(ARCH))
-  LIBDIRS := lib64 lib
-  CFLAGS_lib := -m32
-else
-  LIBDIRS := lib
-endif
-
-# Define directories
-RESULT := $(OUTPUT_ROOT)/result
-BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET)
-PREFIX := $(RESULT)/$(HOST)
-TARGETDIR := $(PREFIX)/$(TARGET)
-SYSROOT := $(TARGETDIR)/sys-root
-DOWNLOAD := $(OUTPUT_ROOT)/download
-SRCDIR := $(OUTPUT_ROOT)/src
-
-# Marker file for unpacking rpms
-rpms := $(SYSROOT)/rpms_unpacked
-
-# Need to patch libs that are linker scripts to use non-absolute paths
-libs := $(SYSROOT)/libs_patched
-
-##########################################################################################
-# Unpack source packages
-
-# Generate downloading + unpacking of sources.
-define Download
-  $(1)_DIR = $(abspath $(SRCDIR)/$(basename $(basename $(notdir $($(1))))))
-  $(1)_CFG = $$($(1)_DIR)/configure
-  $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
-
-  $$($(1)_CFG) : $$($(1)_FILE)
-	mkdir -p $$(SRCDIR)
-	tar -C $$(SRCDIR) -x$$(if $$(findstring .gz, $$<),z,j)f $$<
-	$$(foreach p,$$(abspath $$(wildcard $$(notdir $$($(1)_DIR)).patch)), \
-	  echo PATCHING $$(p) ; \
-	  patch -d $$($(1)_DIR) -p1 -i $$(p) ; \
-	)
-	touch $$@
-
-  $$($(1)_FILE) :
-	wget -P $(DOWNLOAD) $$($(1))
-endef
-
-# Download and unpack all source packages
-$(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC,$(eval $(call Download,$(p))))
-
-##########################################################################################
-# Unpack RPMS
-
-# Note. For building linux you should install rpm2cpio.
-define unrpm
-  $(SYSROOT)/$(notdir $(1)).unpacked \
-    : $(1)
-  $$(rpms) : $(SYSROOT)/$(notdir $(1)).unpacked
-endef
-
-%.unpacked :
-	$(info Unpacking target rpms and libraries from $<)
-	@(mkdir -p $(@D); \
-	cd $(@D); \
-	rpm2cpio $< | \
-	    cpio --extract --make-directories \
-	        -f \
-	        "./usr/share/doc/*" \
-	        "./usr/share/man/*" \
-	        "./usr/X11R6/man/*" \
-	        "*/X11/locale/*" \
-	    || die ; )
-	touch $@
-
-$(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
-
-##########################################################################################
-
-# Note: MUST create a <sys-root>/usr/lib even if not really needed.
-# gcc will use a path relative to it to resolve lib64. (x86_64).
-# we're creating multi-lib compiler with 32bit libc as well, so we should
-# have it anyway, but just to make sure...
-# Patch libc.so and libpthread.so to force linking against libraries in sysroot
-# and not the ones installed on the build machine.
-$(libs) : $(rpms)
-	@echo Patching libc and pthreads
-	@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
-	  (cat $$f | sed -e 's|/usr/lib64/||g' \
-	      -e 's|/usr/lib/||g' \
-	      -e 's|/lib64/||g' \
-	      -e 's|/lib/||g' ) > $$f.tmp ; \
-	  mv $$f.tmp $$f ; \
-	done)
-	@mkdir -p $(SYSROOT)/usr/lib
-	@touch $@
-
-##########################################################################################
-
-# Define marker files for each source package to be compiled
-$(foreach t,binutils mpfr gmp mpc gcc ccache,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
-
-##########################################################################################
-
-# Default base config
-CONFIG = --target=$(TARGET) \
-    --host=$(HOST) --build=$(BUILD) \
-    --prefix=$(PREFIX)
-
-PATHEXT = $(RESULT)/$(BUILD)/bin:
-
-PATHPRE = PATH=$(PATHEXT)$(PATH)
-BUILDPAR = -j16
-
-# Default commands to when making
-MAKECMD =
-INSTALLCMD = install
-
-
-declare_tools = CC$(1)=$(2)gcc LD$(1)=$(2)ld AR$(1)=$(2)ar AS$(1)=$(2)as RANLIB$(1)=$(2)ranlib CXX$(1)=$(2)g++ OBJDUMP$(1)=$(2)objdump
-
-ifeq ($(HOST),$(BUILD))
-  ifeq ($(HOST),$(TARGET))
-    TOOLS = $(call declare_tools,_FOR_TARGET,)
-  endif
-endif
-
-TOOLS ?= $(call declare_tools,_FOR_TARGET,$(TARGET)-)
-
-##########################################################################################
-
-# Create a TARGET bfd + libiberty only.
-# Configure one or two times depending on mulitlib arch.
-# If multilib, the second should be 32-bit, and we resolve
-# CFLAG_<name> to most likely -m32.
-define mk_bfd
-  $$(info Libs for $(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
-      : CFLAGS += $$(CFLAGS_$(1))
-  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
-      : LIBDIRS = --libdir=$(TARGETDIR)/$(1)
-
-  bfdlib += $$(TARGETDIR)/$$(binutils_ver)-$(subst /,-,$(1)).done
-  bfdmakes += $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile
-endef
-
-# Create one set of bfds etc for each multilib arch
-$(foreach l,$(LIBDIRS),$(eval $(call mk_bfd,$(l))))
-
-# Only build these two libs.
-$(bfdlib) : MAKECMD = all-libiberty all-bfd
-$(bfdlib) : INSTALLCMD = install-libiberty install-bfd
-
-# Building targets libbfd + libiberty. HOST==TARGET, i.e not
-# for a cross env.
-$(bfdmakes) : CONFIG = --target=$(TARGET) \
-    --host=$(TARGET) --build=$(BUILD) \
-    --prefix=$(TARGETDIR) \
-    --with-sysroot=$(SYSROOT) \
-    $(LIBDIRS)
-
-$(bfdmakes) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
-
-##########################################################################################
-
-$(gcc) \
-    $(binutils) \
-    $(gmp) \
-    $(mpfr) \
-    $(mpc) \
-    $(bfdmakes) \
-    $(ccache) : ENVS += $(TOOLS)
-
-# libdir to work around hateful bfd stuff installing into wrong dirs...
-# ensure we have 64 bit bfd support in the HOST library. I.e our
-# compiler on i686 will know 64 bit symbols, BUT later
-# we build just the libs again for TARGET, then with whatever the arch
-# wants.
-$(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
-
-# Makefile creation. Simply run configure in build dir.
-$(bfdmakes) \
-$(BUILDDIR)/$(binutils_ver)/Makefile \
-    : $(BINUTILS_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(BINUTILS_CFG) \
-	      $(CONFIG) \
-	      --with-sysroot=$(SYSROOT) \
-	      --disable-nls \
-	      --program-prefix=$(TARGET)- \
-	      --enable-multilib \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(mpfr_ver)/Makefile \
-    : $(MPFR_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(MPFR_CFG) \
-	      $(CONFIG) \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-gmp=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(gmp_ver)/Makefile \
-    : $(GMP_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(GMP_CFG) \
-	      --host=$(HOST) --build=$(BUILD) \
-	      --prefix=$(PREFIX) \
-	      --disable-nls \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-mpfr=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-$(BUILDDIR)/$(mpc_ver)/Makefile \
-    : $(MPC_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
-	      $(MPC_CFG) \
-	      $(CONFIG) \
-	      --program-prefix=$(TARGET)- \
-	      --enable-shared=no \
-	      --with-mpfr=$(PREFIX) \
-	      --with-gmp=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-# Only valid if glibc target -> linux
-# proper destructor handling for c++
-ifneq (,$(findstring linux,$(TARGET)))
-  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --enable-__cxa_atexit
-endif
-
-# Want:
-# c,c++
-# shared libs
-# multilib (-m32/-m64 on x64)
-# skip native language.
-# and link and assemble with the binutils we created
-# earlier, so --with-gnu*
-$(BUILDDIR)/$(gcc_ver)/Makefile \
-    : $(GCC_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	mkdir -p $(@D)
-	( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) $(GCC_CFG) $(EXTRA_CFLAGS) \
-	      $(CONFIG) \
-	      --with-sysroot=$(SYSROOT) \
-	      --enable-languages=c,c++ \
-	      --enable-shared \
-	      --enable-multilib \
-	      --disable-nls \
-	      --with-gnu-as \
-	      --with-gnu-ld \
-	      --with-mpfr=$(PREFIX) \
-	      --with-gmp=$(PREFIX) \
-	      --with-mpc=$(PREFIX) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-# need binutils for gcc
-$(gcc) : $(binutils)
-
-# as of 4.3 or so need these for doing config
-$(BUILDDIR)/$(gcc_ver)/Makefile : $(gmp) $(mpfr) $(mpc)
-$(mpfr) : $(gmp)
-$(mpc) : $(gmp) $(mpfr)
-
-##########################################################################################
-# very straightforward. just build a ccache. it is only for host.
-$(BUILDDIR)/$(ccache_ver)/Makefile \
-    : $(CCACHE_CFG)
-	$(info Configuring $@. Log in $(@D)/log.config)
-	@mkdir -p $(@D)
-	@( \
-	  cd $(@D) ; \
-	  $(PATHPRE) $(ENVS) $(CCACHE_CFG) \
-	      $(CONFIG) \
-	) > $(@D)/log.config 2>&1
-	@echo 'done'
-
-gccpatch = $(TARGETDIR)/gcc-patched
-
-##########################################################################################
-# For some reason cpp is not created as a target-compiler
-ifeq ($(HOST),$(TARGET))
-  $(gccpatch) : $(gcc) link_libs
-	@echo -n 'Creating compiler symlinks...'
-	@for f in cpp; do \
-	  if [ ! -e $(PREFIX)/bin/$(TARGET)-$$f ]; \
-	  then \
-	    cd $(PREFIX)/bin && \
-	    ln -s $$f $(TARGET)-$$f ; \
-	  fi \
-	done
-	@touch $@
-	@echo 'done'
-
-  ##########################################################################################
-  # Ugly at best. Seems that when we compile host->host compiler, that are NOT
-  # the BUILD compiler, the result will not try searching for libs in package root.
-  # "Solve" this by create links from the target libdirs to where they are.
-  link_libs:
-	@echo -n 'Creating library symlinks...'
-	@$(foreach l,$(LIBDIRS), \
-	for f in `cd $(PREFIX)/$(l) && ls`; do \
-	  if [ ! -e $(TARGETDIR)/$(l)/$$f ]; then \
-	    mkdir -p $(TARGETDIR)/$(l) && \
-	    cd $(TARGETDIR)/$(l)/ && \
-	    ln -s $(if $(findstring /,$(l)),../,)../../$(l)/$$f $$f; \
-	  fi \
-	done;)
-	@echo 'done'
-else
-  $(gccpatch) :
-	@echo 'done'
-endif
-
-##########################################################################################
-# Build in two steps.
-# make <default>
-# make install.
-# Use path to our build hosts cross tools
-# Always need to build cross tools for build host self.
-$(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
-	$(info Building $(basename $@). Log in $(<D)/log.build)
-	$(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.build 2>&1
-	@echo -n 'installing...'
-	$(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.install 2>&1
-	@touch $@
-	@echo 'done'
-
-##########################################################################################
-
-bfdlib : $(bfdlib)
-binutils : $(binutils)
-rpms : $(rpms)
-libs : $(libs)
-sysroot : rpms libs
-gcc : sysroot $(gcc) $(gccpatch)
-all : binutils gcc bfdlib
-
-# this is only built for host. so separate.
-ccache : $(ccache)
-
-.PHONY : gcc all binutils bfdlib link_libs rpms libs sysroot
--- a/common/makefiles/javadoc/CORE_PKGS.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,300 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# EXCLUDE_PKGS is the list of packages to exclude from the
-# Java API Specification. Do not add these to CORE_PKGS.
-# The concatenation of EXCLUDE_PKGS and CORE_PKGS
-# should make up the list of all packages under the
-# src/shared/classes directory of the JDK source tree.
-#
-EXCLUDE_PKGS = \
-    java.awt.peer \
-    java.awt.dnd.peer \
-    sun.* \
-    com.sun.* \
-    org.apache.* \
-    org.jcp.* \
-    org.w3c.dom.css \
-    org.w3c.dom.html \
-    org.w3c.dom.stylesheets \
-    org.w3c.dom.traversal \
-    org.w3c.dom.ranges \
-    org.omg.stub.javax.management.remote.rmi
-
-#
-# ACTIVE_JSR_PKGS are packages that are part of an active JSR process--
-# one that is doing its own review. These packages are not included when
-# creating diff pages for the platform's JCP process.
-#
-# (see /java/pubs/apisrc/jdk/6.0/beta/make/docs/active_jsr_pkgs)
-# Note:
-# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
-#
-ACTIVE_JSR_PKGS= \
-    java.lang.invoke \
-    java.sql \
-    javax.activation \
-    javax.annotation.* \
-    javax.jws.* \
-    javax.lang.* \
-    javax.management.* \
-    javax.script \
-    javax.sql.* \
-    javax.tools.* \
-    javax.xml.* \
-    org.w3c.* \
-    org.xml.sax
-
-#
-# CORE_PKGS is the list of packages that form the
-# Java API Specification.
-#
-### ***IMPORTANT NOTE***
-### There is also a "REGEXP" variable in the docs/makefile that
-### determines which table the packages go in on the main page.
-### Currently, there is only table ("Platform Packages") and
-### everything goes in it, so REGEXP is "*". But if that policy
-### changes, packages added will need to be reflected in that
-### list of wildcard expressions, as well.
-###
-CORE_PKGS = \
-    java.applet \
-    java.awt \
-    java.awt.color \
-    java.awt.datatransfer \
-    java.awt.dnd \
-    java.awt.event \
-    java.awt.font \
-    java.awt.geom \
-    java.awt.im \
-    java.awt.im.spi \
-    java.awt.image \
-    java.awt.image.renderable \
-    java.awt.print \
-    java.beans \
-    java.beans.beancontext \
-    java.io \
-    java.lang \
-    java.lang.annotation \
-    java.lang.instrument \
-    java.lang.invoke \
-    java.lang.management \
-    java.lang.ref \
-    java.lang.reflect \
-    java.math \
-    java.net \
-    java.nio \
-    java.nio.channels \
-    java.nio.channels.spi \
-    java.nio.charset \
-    java.nio.charset.spi \
-    java.nio.file \
-    java.nio.file.attribute \
-    java.nio.file.spi \
-    java.rmi \
-    java.rmi.activation \
-    java.rmi.dgc \
-    java.rmi.registry \
-    java.rmi.server \
-    java.security \
-    java.security.acl \
-    java.security.cert \
-    java.security.interfaces \
-    java.security.spec \
-    java.sql \
-    java.text \
-    java.text.spi \
-    java.time \
-    java.time.chrono \
-    java.time.format \
-    java.time.temporal \
-    java.time.zone \
-    java.util \
-    java.util.concurrent \
-    java.util.concurrent.atomic \
-    java.util.concurrent.locks \
-    java.util.function \
-    java.util.jar \
-    java.util.logging \
-    java.util.prefs \
-    java.util.regex \
-    java.util.spi \
-    java.util.stream \
-    java.util.zip \
-    javax.accessibility \
-    javax.activation \
-    javax.activity \
-    javax.annotation \
-    javax.annotation.processing \
-    javax.crypto \
-    javax.crypto.interfaces \
-    javax.crypto.spec \
-    javax.imageio \
-    javax.imageio.event \
-    javax.imageio.metadata \
-    javax.imageio.plugins.jpeg \
-    javax.imageio.plugins.bmp \
-    javax.imageio.spi \
-    javax.imageio.stream \
-    javax.jws \
-    javax.jws.soap \
-    javax.lang.model \
-    javax.lang.model.element \
-    javax.lang.model.type \
-    javax.lang.model.util \
-    javax.management \
-    javax.management.loading \
-    javax.management.monitor \
-    javax.management.relation \
-    javax.management.openmbean \
-    javax.management.timer \
-    javax.management.modelmbean \
-    javax.management.remote \
-    javax.management.remote.rmi \
-    javax.naming \
-    javax.naming.directory \
-    javax.naming.event \
-    javax.naming.ldap \
-    javax.naming.spi \
-    javax.net \
-    javax.net.ssl \
-    javax.print \
-    javax.print.attribute \
-    javax.print.attribute.standard \
-    javax.print.event \
-    javax.rmi \
-    javax.rmi.CORBA \
-    javax.rmi.ssl \
-    javax.script \
-    javax.security.auth \
-    javax.security.auth.callback \
-    javax.security.auth.kerberos \
-    javax.security.auth.login \
-    javax.security.auth.spi \
-    javax.security.auth.x500 \
-    javax.security.cert \
-    javax.security.sasl \
-    javax.sound.sampled \
-    javax.sound.sampled.spi \
-    javax.sound.midi \
-    javax.sound.midi.spi \
-    javax.sql \
-    javax.sql.rowset \
-    javax.sql.rowset.serial \
-    javax.sql.rowset.spi \
-    javax.swing \
-    javax.swing.border \
-    javax.swing.colorchooser \
-    javax.swing.filechooser \
-    javax.swing.event \
-    javax.swing.table \
-    javax.swing.text \
-    javax.swing.text.html \
-    javax.swing.text.html.parser \
-    javax.swing.text.rtf \
-    javax.swing.tree \
-    javax.swing.undo \
-    javax.swing.plaf \
-    javax.swing.plaf.basic \
-    javax.swing.plaf.metal \
-    javax.swing.plaf.multi \
-    javax.swing.plaf.nimbus \
-    javax.swing.plaf.synth \
-    javax.tools \
-    javax.tools.annotation \
-    javax.transaction \
-    javax.transaction.xa \
-    javax.xml.parsers \
-    javax.xml.bind \
-    javax.xml.bind.annotation \
-    javax.xml.bind.annotation.adapters \
-    javax.xml.bind.attachment \
-    javax.xml.bind.helpers \
-    javax.xml.bind.util \
-    javax.xml.soap \
-    javax.xml.ws \
-    javax.xml.ws.handler \
-    javax.xml.ws.handler.soap \
-    javax.xml.ws.http \
-    javax.xml.ws.soap \
-    javax.xml.ws.spi \
-    javax.xml.ws.spi.http \
-    javax.xml.ws.wsaddressing \
-    javax.xml.transform \
-    javax.xml.transform.sax \
-    javax.xml.transform.dom \
-    javax.xml.transform.stax \
-    javax.xml.transform.stream \
-    javax.xml \
-    javax.xml.crypto \
-    javax.xml.crypto.dom \
-    javax.xml.crypto.dsig \
-    javax.xml.crypto.dsig.dom \
-    javax.xml.crypto.dsig.keyinfo \
-    javax.xml.crypto.dsig.spec \
-    javax.xml.datatype \
-    javax.xml.validation \
-    javax.xml.namespace \
-    javax.xml.xpath \
-    javax.xml.stream \
-    javax.xml.stream.events \
-    javax.xml.stream.util \
-    org.ietf.jgss \
-    org.omg.CORBA \
-    org.omg.CORBA.DynAnyPackage \
-    org.omg.CORBA.ORBPackage \
-    org.omg.CORBA.TypeCodePackage \
-    org.omg.stub.java.rmi \
-    org.omg.CORBA.portable \
-    org.omg.CORBA_2_3 \
-    org.omg.CORBA_2_3.portable \
-    org.omg.CosNaming \
-    org.omg.CosNaming.NamingContextExtPackage \
-    org.omg.CosNaming.NamingContextPackage \
-    org.omg.SendingContext \
-    org.omg.PortableServer \
-    org.omg.PortableServer.CurrentPackage \
-    org.omg.PortableServer.POAPackage \
-    org.omg.PortableServer.POAManagerPackage \
-    org.omg.PortableServer.ServantLocatorPackage \
-    org.omg.PortableServer.portable \
-    org.omg.PortableInterceptor \
-    org.omg.PortableInterceptor.ORBInitInfoPackage \
-    org.omg.Messaging \
-    org.omg.IOP \
-    org.omg.IOP.CodecFactoryPackage \
-    org.omg.IOP.CodecPackage \
-    org.omg.Dynamic \
-    org.omg.DynamicAny \
-    org.omg.DynamicAny.DynAnyPackage \
-    org.omg.DynamicAny.DynAnyFactoryPackage \
-    org.w3c.dom \
-    org.w3c.dom.events \
-    org.w3c.dom.bootstrap \
-    org.w3c.dom.ls \
-    org.w3c.dom.views \
-    org.xml.sax \
-    org.xml.sax.ext \
-    org.xml.sax.helpers
--- a/common/makefiles/javadoc/Javadoc.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1188 +0,0 @@
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-
-.SUFFIXES: # Delete the default suffixes
-.SUFFIXES: .java
-
-#
-# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
-#
-
-DOCSDIR=$(OUTPUT_ROOT)/docs
-TEMPDIR=$(OUTPUT_ROOT)/docstemp
-
-JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
-JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
-
-JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
-
-JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
-
-HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
-
-BUILD_NUMBER=$(JDK_BUILD_NUMBER)
-
-JAVADOC_CMD = $(JAVA) \
-    -Xmx1024m \
-    -Djava.awt.headless=true \
-    $(NEW_JAVADOC) \
-    -bootclasspath $(JDK_OUTPUTDIR)/classes
-
-# Copyright year for beginning of Java and some of the apis
-# (Needed when creating the javadocs)
-FIRST_COPYRIGHT_YEAR = 1993
-DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
-MIRROR_FIRST_COPYRIGHT_YEAR = 2004
-DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
-JDI_FIRST_COPYRIGHT_YEAR = 1999
-JAAS_FIRST_COPYRIGHT_YEAR = 1998
-JGSS_FIRST_COPYRIGHT_YEAR = 2000
-SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
-HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
-MGMT_FIRST_COPYRIGHT_YEAR = 2003
-ATTACH_FIRST_COPYRIGHT_YEAR = 2005
-JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
-SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
-TRACING_FIRST_COPYRIGHT_YEAR = 2008
-TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
-JNLP_FIRST_COPYRIGHT_YEAR = 1998
-PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
-
-# Oracle name
-FULL_COMPANY_NAME = Oracle and/or its affiliates
-
-# Copyright address
-COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
-
-# The trademark symbol
-TRADEMARK = &trade;
-
-# Common copyright lines used
-# The word "Copyright" might optionally be a link to the file cpyr.html.
-# The first year of copyright may vary or not be available.
-# The address to the company might be optional.
-COMMA:= ,
-EMPTY:=
-SPACE:=$(EMPTY) $(EMPTY)
-COPYRIGHT_SYMBOL = &\#x00a9;
-# Macro to construct the copyright line
-# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
-define CopyrightLine # optionalurl optionalfirstyear optionaladdress
-$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
-$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
-$(FULL_COMPANY_NAME). $3 All rights reserved.
-endef
-
-# Url to root of documents
-DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
-
-# Url to copyright html file
-COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
-# This isn't added in old build yet.
-#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
-COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
-
-# Url to bug filing site
-BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
-
-# Common line for how to submit a bug or rfe
-BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
-
-# Url to devdocs page
-# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
-DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
-DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
-DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
-DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
-
-# Common Java trademark line
-JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
-$(FULL_COMPANY_NAME) in the US and other countries.
-
-#################################################################
-# Macros:
-
-
-# List of all possible directories for javadoc to look for sources
-# NOTE: Quotes are required around sourcepath argument only on Windows.
-# Otherwise, you get "No packages or classes specified." due
-# to $(PATH_SEP) being interpreted as an end of
-# command (newline or shell ; character)
-ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
-    $(JDK_IMPSRC) \
-    $(JDK_GENSRC) \
-    $(JDK_OUTPUTDIR)/gendocsrc_rmic \
-    $(JDK_TOPDIR)/src/solaris/classes \
-    $(JDK_TOPDIR)/src/windows/classes \
-    $(JDK_SHARE_SRC)/doc/stub
-
-# List of directories that actually exist
-ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
-
-# List with classpath separator between them
-EMPTY:=
-SPACE:= $(EMPTY) $(EMPTY)
-RELEASEDOCS_SOURCEPATH = \
-    $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
-
-define prep-target
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-endef
-
-# Prep for javadoc creation, assumes $@ is an index.html file
-define prep-javadoc
-	@if [ -f "$@" -a "$?" != "" ] ; then \
-	  $(ECHO) "# Dependencies have changed: $?"; \
-	fi
-	$(RM) -r $(@D)
-	$(MKDIR) -p $(@D)
-endef
-
-# A cache of the directories in ALL_SOURCE_DIRS
-DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
-
-# Given a list of packages, return a list of files or dirs to be dependent on
-# (Currently only returning a list of directories)
-define PackageDependencies # packages
-  $(shell \
-      if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
-        for p in $1 ; do \
-          pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
-          $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
-        done; \
-      fi \
-  )
-endef
-
-# Given a list of packages, add packages that exist to $@, print summary
-define PackageFilter # packages
-	@if [ "$1" != "" ] ; then \
-	  for p in $1 ; do \
-	    pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
-	    found="false"; \
-	    for cp in $(ALL_SOURCE_DIRS) ; do \
-	      if [ -d $${cp}/$${pd} ] ; then \
-	        $(ECHO) "$${p}" >> $@; \
-	        found="true"; \
-	        break; \
-	      fi; \
-	    done; \
-	    if [ "$${found}" = "false" ] ; then \
-	      $(ECHO) "WARNING: Package not found: $${p}"; \
-	    fi; \
-	  done; \
-	fi
-endef
-
-# Print out a summary of the javadoc command about to be run
-define JavadocSummary # optionsfile packagesfile
-	@$(ECHO) "# Summary for $@"; \
-	$(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@#   @' $1; \
-	$(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@#   @' $2
-endef
-
-#
-# Temporary directory for javadoc creation
-#
-DOCSTMPDIR = $(TEMPDIR)/doctmp
-
-#
-# Different api directories created from root directory
-#
-COREAPI_DOCSDIR = $(DOCSDIR)/api
-JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
-JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
-PLATFORM_DOCSDIR = $(DOCSDIR)/platform
-
-# The non-core api javadocs need to be able to access the root of the core
-# api directory, so for jdk/api or jre/api to get to the core api/
-# directory we would use this:
-JDKJRE2COREAPI = ../../api
-
-# Common bottom argument
-define CommonBottom # year
-<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
-endef
-
-# Common trademark bottom argument (Not sure why this is used sometimes)
-define CommonTrademarkBottom # year
-<font size="-1">\
-$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
-$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
-</font>
-endef
-
-# Common echo of option
-define OptionOnly # opt
-	$(PRINTF) "%s\n" "$1"
-endef
-define OptionPair # opt arg
-	$(PRINTF) "%s '%s'\n" "$1" '$2'
-endef
-define OptionTrip # opt arg arg
-	$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
-endef
-
-# Core api bottom argument (with special sauce)
-COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
-<br>For further API reference and developer documentation, \
-see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
-That documentation contains more detailed, developer-targeted descriptions, \
-with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<br>\
-$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
-</font>
-
-# Common javadoc options used by all
-COMMON_JAVADOCFLAGS = \
-    -XDignore.symbol.file=true \
-    -quiet \
-    -use \
-    -keywords \
-    -Xdoclint:none \
-    -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
-    $(ADDITIONAL_JAVADOCFLAGS)
-
-ifdef OPENJDK
-  ADDITIONAL_JAVADOCFLAGS = \
-      -Xdocrootparent $(DOCS_BASE_URL)
-else
-  ADDITIONAL_JAVADOCFLAGS =
-endif
-
-# Draft used for non-fcs documents
-DRAFT_HEADER =
-ifneq ($(MILESTONE), fcs)
-  DRAFT_HEADER = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
-  DRAFT_BOTTOM = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
-  DRAFT_WINTITLE = $(BUILD_NUMBER)
-  # Early access top text (not used in FCS releases)
-  COREAPI_TOP_EARLYACCESS = \
-<div style="background-color: \#EEEEEE"> \
-<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
-margin-left: 6px; margin-right: 6px; text-align: justify; \
-font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
-font-weight: normal;"> \
-Please note that the specifications and other information \
-contained herein are not final and are subject to change. \
-The information is being made available to you solely for purpose of \
-evaluation. \
-</div> </div>
-
-endif
-
-#################################################################
-
-#
-# CORE_PKGS environment variable has been moved to the following file
-#
-include CORE_PKGS.gmk
-
-#
-# Load environment variables for API package names that are not part of
-# the Java SE platform
-#
-include NON_CORE_PKGS.gmk
-
-#################################################################
-
-#
-# Default target is same as docs target, create core api and all others it can
-#
-
-all: docs
-docs: coredocs otherdocs
-
-#################################################################
-# Production Targets -- USE THESE TARGETS WHEN:
-# a) You're generating docs outside of release engineering's
-#    standard control build.
-# b) The docs will be pushed to the web and/or included in
-#    the downloaded doc bundle.
-#
-# See: Notes.html#releaseTargets
-# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
-#
-
-sanitycheckcoredocs:
-	@$(ECHO) ""
-	@$(ECHO) "Building core api docs with these values:"
-	@$(ECHO) "    BUILD_NUMBER = $(BUILD_NUMBER)"
-	@$(ECHO) "    MILESTONE = $(MILESTONE)"
-	@$(ECHO) ""
-        ifeq ($(BUILD_NUMBER), b00)
-	  @$(ECHO) "ERROR: Build number must be defined"
-	  @$(ECHO) "MILESTONE is set to $(MILESTONE)"
-	  @$(ECHO) ""
-	  exit 1
-        endif
-
-#############################################################
-#
-# coredocs
-#
-COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
-$(JDK_MINOR_VERSION)<br>API Specification
-COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
-COREAPI_HEADER = \
-<strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong>
-
-# Java language specification cite
-TAG_JLS = jls:a:See <cite> \
-The Java&trade; Language Specification</cite>:
-
-# Overview file for core apis
-COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
-
-# The index.html, options, and packages files
-COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
-COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
-COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
-
-coredocs: $(COREAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
-
-# Run javadoc if the index file is out of date or missing
-$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
-	$(prep-javadoc)
-	$(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ISO-8859-1) ; \
-	  $(call OptionPair,-tag,beaninfo:X) ; \
-	  $(call OptionPair,-tag,revised:X) ; \
-	  $(call OptionPair,-tag,since.unbundled:X) ; \
-	  $(call OptionPair,-tag,spec:X) ; \
-	  $(call OptionPair,-tag,specdefault:X) ; \
-	  $(call OptionPair,-tag,Note:X) ; \
-	  $(call OptionPair,-tag,ToDo:X) ; \
-	  $(call OptionPair,-tag,apiNote:a:API Note:) ; \
-	  $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
-	  $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
-	  $(call OptionPair,-tag,param) ; \
-	  $(call OptionPair,-tag,return) ; \
-	  $(call OptionPair,-tag,throws) ; \
-	  $(call OptionPair,-tag,since) ; \
-	  $(call OptionPair,-tag,version) ; \
-	  $(call OptionPair,-tag,serialData) ; \
-	  $(call OptionPair,-tag,factory) ; \
-	  $(call OptionPair,-tag,see) ; \
-	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
-	  $(call OptionOnly,-splitIndex) ; \
-	  $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
-	  $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	) >> $@
-        ifdef COREAPI_TOP_EARLYACCESS
-	  @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
-        endif
-
-# Create a file with the package names in it
-$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(CORE_PKGS))
-
-#############################################################
-#
-# docletapidocs
-#
-
-ALL_OTHER_TARGETS += docletapidocs
-
-DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
-DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOCLETAPI_DOCTITLE := Doclet API
-DOCLETAPI_WINDOWTITLE := Doclet API
-DOCLETAPI_HEADER := <strong>Doclet API</strong>
-DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
-DOCLETAPI_GROUPNAME := Packages
-DOCLETAPI_REGEXP := com.sun.javadoc
-# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
-DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
-DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
-
-docletapidocs: $(DOCLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOCLETAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-breakiterator) ; \
-	  $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(DOCLETAPI_PKGS))
-
-#############################################################
-#
-# tagletapidocs
-#
-
-ALL_OTHER_TARGETS += tagletapidocs
-TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
-TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
-# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
-
-# Temporary directory (special generation rules)
-TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
-
-# The index.html, options, and packages files
-TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
-TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
-TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
-
-tagletapidocs: $(TAGLETAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(RM) -r $(TAGLETAPI_TEMPDIR)
-	$(MKDIR) -p $(TAGLETAPI_TEMPDIR)
-	$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
-	    @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
-	cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
-	cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
-	$(RM) -r $(TAGLETAPI_TEMPDIR)
-
-# Create file with javadoc options in it
-$(TAGLETAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nonavbar) ; \
-	  $(call OptionOnly,-noindex) ; \
-	  $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
-	$(prep-target)
-	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
-
-#############################################################
-#
-# domapidocs
-#
-
-ALL_OTHER_TARGETS += domapidocs
-
-DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
-DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-DOMAPI_DOCTITLE := Common DOM API
-DOMAPI_WINDOWTITLE := Common DOM API
-DOMAPI_HEADER := <strong>Common DOM API</strong>
-DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
-DOMAPI_GROUPNAME := Packages
-DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
-# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
-DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
-DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
-
-domapidocs: $(DOMAPI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(DOMAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-splitIndex) ; \
-	  $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(DOMAPI_PKGS))
-
-#############################################################
-#
-# jpdadocs
-#
-
-ALL_OTHER_TARGETS += jpdadocs
-
-jpdadocs: jdidocs jdwpdocs jvmtidocs
-
-#############################################################
-#
-# jdidocs
-#
-
-ALL_OTHER_TARGETS += jdidocs
-
-JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
-JDI2COREAPI := ../../$(JDKJRE2COREAPI)
-JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
-JDI_WINDOWTITLE := Java Debug Interface
-JDI_HEADER := <strong>Java Debug Interface</strong>
-JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
-JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
-# JDI_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
-JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
-JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
-
-jdidocs: $(JDI_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JDI_PKGS))
-
-#############################################################
-#
-# jdwpdocs
-#
-
-ALL_OTHER_TARGETS += jdwpdocs
-
-JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
-
-jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
-$(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
-	$(MKDIR) -p $(@D)
-	$(RM) $@
-	$(CP) $< $@
-
-#############################################################
-#
-# jvmtidocs
-#
-
-ALL_OTHER_TARGETS += jvmtidocs
-
-JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
-JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
-
-jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
-$(JVMTI_DOCDIR)/jvmti.html:
-	@$(prep-javadoc)
-	@if [ -f $(JVMTI_HTML) ] ; then \
-	  $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
-	  $(CP) $(JVMTI_HTML) $@; \
-	else \
-	  $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
-	fi
-
-#############################################################
-#
-# jaasdocs
-#
-
-ALL_OTHER_TARGETS += jaasdocs
-
-JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
-JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
-JAAS_WINDOWTITLE := Java Authentication and Authorization Service
-JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
-JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
-# JAAS_PKGS is located in NON_CORE_PKGS.gmk
-JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
-
-# The index.html, options, and packages files
-JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
-JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
-JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
-
-jaasdocs: $(JAAS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JAAS_PKGS))
-
-#############################################################
-#
-# jgssdocs
-#
-
-ALL_OTHER_TARGETS += jgssdocs
-
-JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
-JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
-JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
-JGSS_WINDOWTITLE := Java GSS-API Utilities
-JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
-JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
-JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
-# JGSS_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
-JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
-JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
-
-jgssdocs: $(JGSS_INDEX_FILE)
-
-# Set relative location to core api document root
-$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JGSS_PKGS))
-
-#############################################################
-#
-# smartcardiodocs
-#
-
-ALL_OTHER_TARGETS += smartcardiodocs
-
-SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
-SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
-SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
-SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
-SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
-SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
-# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
-SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
-SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
-
-smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
-
-# Set relative location to core api document root
-$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SMARTCARDIO_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
-	  $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
-	  $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(SMARTCARDIO_PKGS))
-
-#############################################################
-#
-# httpserverdocs
-#
-
-ALL_OTHER_TARGETS += httpserverdocs
-
-HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
-HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
-HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
-HTTPSERVER_WINDOWTITLE := Java HTTP Server
-HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
-HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
-# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
-
-HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
-HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
-HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
-
-httpserverdocs: $(HTTPSERVER_INDEX_HTML)
-
-# Set relative location to core api document root
-$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(HTTPSERVER_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
-	  $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
-	  $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(HTTPSERVER_PKGS))
-
-#############################################################
-#
-# mgmtdocs
-#
-
-ALL_OTHER_TARGETS += mgmtdocs
-
-MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
-MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
-JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
-JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
-MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
-MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
-MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
-MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
-MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
-# MGMT_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
-MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
-MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
-
-mgmtdocs: $(MGMT_INDEX_FILE)
-
-# Set relative location to core api document root
-$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	@if [ -f $(JVM_MIB_SRC) ] ; then \
-	  $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
-	  $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
-	else \
-	  $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
-	fi
-	$(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
-	  $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(MGMT_PKGS))
-
-#############################################################
-#
-# attachdocs
-#
-
-ALL_OTHER_TARGETS += attachdocs
-
-ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
-ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
-ATTACH_DOCTITLE := Attach API
-ATTACH_WINDOWTITLE := Attach API
-ATTACH_HEADER := <strong>Attach API</strong>
-ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
-# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
-
-ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
-ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
-ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
-
-attachdocs: $(ATTACH_INDEX_HTML)
-
-# Set relative location to core api document root
-$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(ATTACH_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(ATTACH_PKGS))
-
-#############################################################
-#
-# jconsoledocs
-#
-
-ALL_OTHER_TARGETS += jconsoledocs
-
-JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
-JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
-JCONSOLE_DOCTITLE := JConsole API
-JCONSOLE_WINDOWTITLE := JConsole API
-JCONSOLE_HEADER := <strong>JConsole API</strong>
-JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
-# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
-
-JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
-JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
-JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
-
-jconsoledocs: $(JCONSOLE_INDEX_HTML)
-
-# Set relative location to core api document root
-$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(JCONSOLE_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(JCONSOLE_PKGS))
-
-#############################################################
-#
-# treeapidocs
-#
-
-ALL_OTHER_TARGETS += treeapidocs
-
-TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
-TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
-TREEAPI_DOCTITLE := Compiler Tree API
-TREEAPI_WINDOWTITLE := Compiler Tree API
-TREEAPI_HEADER := <strong>Compiler Tree API</strong>
-TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
-TREEAPI_GROUPNAME := Packages
-TREEAPI_REGEXP := com.sun.source.*
-# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
-TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
-TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
-
-treeapidocs: $(TREEAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(TREEAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
-	  $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
-	  $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(TREEAPI_PKGS))
-
-#############################################################
-#
-# sctpdocs
-#
-
-ALL_OTHER_TARGETS += sctpdocs
-
-SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
-SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
-SCTPAPI_DOCTITLE := SCTP API
-SCTPAPI_WINDOWTITLE := SCTP API
-SCTPAPI_HEADER := <strong>SCTP API</strong>
-SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
-# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
-
-SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
-SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
-SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
-
-sctpdocs: $(SCTPAPI_INDEX_HTML)
-
-# Set relative location to core api document root
-$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
-	$(prep-javadoc)
-	$(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
-	$(JAVADOC_CMD) -d $(@D) \
-	    @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(SCTPAPI_OPTIONS_FILE):
-	$(prep-target)
-	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
-	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
-	  $(call OptionPair,-encoding,ascii) ; \
-	  $(call OptionOnly,-nodeprecatedlist) ; \
-	  $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
-	  $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
-	  $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
-	  $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
-	  $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
-	) >> $@
-
-# Create a file with the package names in it
-$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
-	$(prep-target)
-	$(call PackageFilter,$(SCTPAPI_PKGS))
-
-#############################################################
-#
-# Get a cache of all the directories
-
-$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
-	$(prep-target)
-	@for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
-	  $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
-	  $(FIND) $${cp} -type f >> $@; \
-	done
-
-#############################################################
-#release version of core packages ########
-# Maximize performance and ensure that build number & milestone are set.
-
-rel-coredocs: sanitycheckcoredocs
-	$(MAKE) coredocs
-
-rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
-#
-# end of production targets
-
-otherdocs: $(ALL_OTHER_TARGETS)
-
-clean:
-	$(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
-
-#############################################################
-# DEBUG TARGET
-# List the values defined in the makefile hierarchy, to make sure everything
-# is set properly, and to help identify values we can use instead of making new ones.
-# (Most of them come from common/shared/Defs.gmk)
-#
-# Notes:
-# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
-# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
-#
-
-#############################################################
-.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
-    sanitycheckcoredocs $(ALL_OTHER_TARGETS)
--- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# This file contains the package names of all the "non-core"
-# API published in the Java 2 SDK documentation. "Non-core" means
-# it includes all published API outside of the JDK API specification.
-#
-# These environment variables are used by javadoc in
-# make/docs/Makefile and are referenced by the localization
-# team when determining which APIs to extract javadoc
-# comments from.
-
-DOMAPI_PKGS = com.sun.java.browser.dom \
-    org.w3c.dom \
-    org.w3c.dom.bootstrap \
-    org.w3c.dom.ls \
-    org.w3c.dom.ranges \
-    org.w3c.dom.traversal \
-    org.w3c.dom.html \
-    org.w3c.dom.stylesheets \
-    org.w3c.dom.css \
-    org.w3c.dom.events \
-    org.w3c.dom.views
-
-JDI_PKGS = com.sun.jdi \
-    com.sun.jdi.event \
-    com.sun.jdi.request \
-    com.sun.jdi.connect \
-    com.sun.jdi.connect.spi
-
-MGMT_PKGS = com.sun.management
-
-JAAS_PKGS = com.sun.security.auth \
-    com.sun.security.auth.callback \
-    com.sun.security.auth.login \
-    com.sun.security.auth.module
-
-JGSS_PKGS = com.sun.security.jgss
-
-OLD_JSSE_PKGS = com.sun.net.ssl
-
-HTTPSERVER_PKGS = com.sun.net.httpserver \
-    com.sun.net.httpserver.spi
-
-NIO_PKGS = com.sun.nio.file
-
-DOCLETAPI_PKGS = com.sun.javadoc
-
-TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-
-TAGLETAPI_PKGS = com.sun.tools.doclets
-
-ATTACH_PKGS = com.sun.tools.attach \
-    com.sun.tools.attach.spi
-
-JCONSOLE_PKGS = com.sun.tools.jconsole
-
-TREEAPI_PKGS = com.sun.source.doctree \
-    com.sun.source.tree \
-    com.sun.source.util \
-    jdk
-
-SMARTCARDIO_PKGS = javax.smartcardio
-
-SCTPAPI_PKGS = com.sun.nio.sctp
-
-ifeq ($(PLATFORM), macosx)
-  APPLE_EXT_PKGS = com.apple.concurrent \
-      com.apple.eawt \
-      com.apple.eawt.event \
-      com.apple.eio
-endif
-
-JDK_PKGS = jdk
-
-# non-core packages in rt.jar
-NON_CORE_PKGS = $(DOMAPI_PKGS) \
-    $(MGMT_PKGS) \
-    $(JAAS_PKGS) \
-    $(JGSS_PKGS) \
-    $(NIO_PKGS) \
-    $(OLD_JSSE_PKGS) \
-    $(HTTPSERVER_PKGS) \
-    $(SMARTCARDIO_PKGS) \
-    $(SCTPAPI_PKGS) \
-    $(APPLE_EXT_PKGS) \
-    $(JDK_PKGS)
--- a/common/makefiles/javadoc/Notes.html	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Doc Process Notes</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<body>
-<h3><a name="REGEXP"></a><br>
-REGEXP</h3>
-<p> REGEXP is a list of wildcard patterns that determines which packages listed
-  in CORE_PKGS.gmk go into which summary-table on the main API index page. It
-  was motivated by the need to divide the world into &quot;core packages&quot;
-  (java.*) and &quot;extension packages&quot; (javax.*). In time, the distinction
-  went away. The whole table is now called &quot;Platform Packages&quot;--which
-  eliminated the need for this list of regular expressions. But it lingered on,
-  accreting all of the packages in the JVM, one by one. I pruned it back to &quot;*&quot;,
-  so it now covers every package in the Java platform API docs. If some separation
-  is needed in the future, it can grow back into a colon-separated list, starting
-  with this, which is in all respects equivalent to &quot;*&quot; at this point
-  in time:</p>
-<blockquote>
-  <pre>REGEXP = &quot;java.*:javax.*:org.ietf*:org.omg.</pre>
-</blockquote>
-<h3><a name="releaseTargets"></a><br>
-  Release Targets</h3>
-<p> (Thanks to Kelly O'Hair for this info.)</p>
-<p> The <tt>rel-coredocs</tt> and <tt>rel-docs</tt> targets were added by Eric
-  Armstrong. <tt>rel-coredocs</tt> assumes the kind of large, 32-bit machine used
-  in the javapubs group's docs-release process. It specifies memory settings accordingly
-  to maximize performance.</p>
-<p> The performance settings, like the sanity check, are most important for the
-  core docs--the platform APIs. Running javadoc on those APIs takes a significant
-  amount of time and memory. Setting the initial heap size as large as possible
-  is important to prevent thrashing as the heap grows. Setting the maximum as
-  large as necessary is also important to keep the job from failing.</p>
-<blockquote>
-  <p> <tt>-J-Xmx512</tt> sets a maximum of 512, which became necessary in 6.0<br>
-    <tt>-J-Xms256</tt> sets starting size to 256 (default is 8)</p>
-</blockquote>
-<p> <tt>rel-coredocs</tt> also includes a sanity check to help ensure that <tt>BUILD_NUMBER</tt>
-  and <tt>MILESTONE</tt> are specified properly when docs are built outside of
-  the normal release engineering process, with the intention of releasing them
-  on the web or in a downloaded docs bundle. (When invoked in release engineering's
-  control build, the values are always set properly. But when the targets are
-  run by themselves, they default to b00 and &quot;internal&quot;--which silently
-  sabotage the result of a build that can take many hours to complete.</p>
-</body>
-</html>
--- a/common/makefiles/support/ListPathsSafely-post-compress.incl	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
--- a/common/makefiles/support/ListPathsSafely-pre-compress.incl	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
--- a/common/makefiles/support/ListPathsSafely-uncompress.sed	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-s|X01|com|g
-s|X02|org|g
-s|X03|sun|g
-s|X04|java|g
-s|X05|javax|g
-s|X06|sun/io|g
-s|X07|com/sun|g
-s|X08|java/io|g
-s|X09|org/omg|g
-s|X10|org/w3c|g
-s|X11|org/xml|g
-s|X12|sun/awt|g
-s|X13|sun/net|g
-s|X14|sun/nio|g
-s|X15|sun/rmi|g
-s|X16|java/awt|g
-s|X17|java/net|g
-s|X18|java/nio|g
-s|X19|java/rmi|g
-s|X20|META-INF|g
-s|X21|sun/font|g
-s|X22|sun/misc|g
-s|X23|sun/text|g
-s|X24|sun/util|g
-s|X25|java/lang|g
-s|X26|java/math|g
-s|X27|java/text|g
-s|X28|java/util|g
-s|X29|javax/jws|g
-s|X30|javax/net|g
-s|X31|javax/rmi|g
-s|X32|javax/xml|g
-s|X33|sun/corba|g
-s|X34|sun/print|g
-s|X35|sun/swing|g
-s|X36|java/beans|g
-s|X37|javax/lang|g
-s|X38|sun/applet|g
-s|X39|sun/java2d|g
-s|X40|java/applet|g
-s|X41|javax/print|g
-s|X42|javax/sound|g
-s|X43|javax/swing|g
-s|X44|javax/tools|g
-s|X45|jdk/classes|g
-s|X46|org/relaxng|g
-s|X47|sun/reflect|g
-s|X48|javax/crypto|g
-s|X49|javax/naming|g
-s|X50|jaxp/classes|g
-s|X51|sun/security|g
-s|X52|corba/classes|g
-s|X53|java/security|g
-s|X54|javax/imageio|g
-s|X55|jdk/btclasses|g
-s|X56|javax/activity|g
-s|X57|javax/security|g
-s|X58|jdk/newclasses|g
-s|X59|sun/instrument|g
-s|X60|sun/management|g
-s|X61|corba/btclasses|g
-s|X62|jdk/democlasses|g
-s|X63|javax/activation|g
-s|X64|javax/annotation|g
-s|X65|javax/management|g
-s|X66|javax/transaction|g
-s|X67|jaxws/jaf_classes|g
-s|X68|langtools/classes|g
-s|X69|META-INF/services|g
-s|X70|jdk/newdemoclasses|g
-s|X71|javax/accessibility|g
-s|X72|jaxws/jaxws_classes|g
--- a/common/makefiles/support/unicode2x.sed	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-s/\\u0020/\x20/g
-s/\\u003A/\x3A/g
-s/\\u006B/\x6B/g
-s/\\u0075/\x75/g
-s/\\u00A0/\xA0/g
-s/\\u00A3/\xA3/g
-s/\\u00B0/\xB0/g
-s/\\u00B7/\xB7/g
-s/\\u00BA/\xBA/g
-s/\\u00BF/\xBF/g
-s/\\u00C0/\xC0/g
-s/\\u00C1/\xC1/g
-s/\\u00C2/\xC2/g
-s/\\u00C4/\xC4/g
-s/\\u00C5/\xC5/g
-s/\\u00C8/\xC8/g
-s/\\u00C9/\xC9/g
-s/\\u00CA/\xCA/g
-s/\\u00CD/\xCD/g
-s/\\u00CE/\xCE/g
-s/\\u00D3/\xD3/g
-s/\\u00D4/\xD4/g
-s/\\u00D6/\xD6/g
-s/\\u00DA/\xDA/g
-s/\\u00DC/\xDC/g
-s/\\u00DD/\xDD/g
-s/\\u00DF/\xDF/g
-s/\\u00E0/\xE0/g
-s/\\u00E1/\xE1/g
-s/\\u00E2/\xE2/g
-s/\\u00E3/\xE3/g
-s/\\u00E4/\xE4/g
-s/\\u00E5/\xE5/g
-s/\\u00E6/\xE6/g
-s/\\u00E7/\xE7/g
-s/\\u00E8/\xE8/g
-s/\\u00E9/\xE9/g
-s/\\u00EA/\xEA/g
-s/\\u00EB/\xEB/g
-s/\\u00EC/\xEC/g
-s/\\u00ED/\xED/g
-s/\\u00EE/\xEE/g
-s/\\u00EF/\xEF/g
-s/\\u00F1/\xF1/g
-s/\\u00F2/\xF2/g
-s/\\u00F3/\xF3/g
-s/\\u00F4/\xF4/g
-s/\\u00F5/\xF5/g
-s/\\u00F6/\xF6/g
-s/\\u00F9/\xF9/g
-s/\\u00FA/\xFA/g
-s/\\u00FC/\xFC/g
-s/\\u0020/\x20/g
-s/\\u003f/\x3f/g
-s/\\u006f/\x6f/g
-s/\\u0075/\x75/g
-s/\\u00a0/\xa0/g
-s/\\u00a3/\xa3/g
-s/\\u00b0/\xb0/g
-s/\\u00ba/\xba/g
-s/\\u00bf/\xbf/g
-s/\\u00c1/\xc1/g
-s/\\u00c4/\xc4/g
-s/\\u00c5/\xc5/g
-s/\\u00c8/\xc8/g
-s/\\u00c9/\xc9/g
-s/\\u00ca/\xca/g
-s/\\u00cd/\xcd/g
-s/\\u00d6/\xd6/g
-s/\\u00dc/\xdc/g
-s/\\u00dd/\xdd/g
-s/\\u00df/\xdf/g
-s/\\u00e0/\xe0/g
-s/\\u00e1/\xe1/g
-s/\\u00e2/\xe2/g
-s/\\u00e3/\xe3/g
-s/\\u00e4/\xe4/g
-s/\\u00e5/\xe5/g
-s/\\u00e7/\xe7/g
-s/\\u00e8/\xe8/g
-s/\\u00e9/\xe9/g
-s/\\u00ea/\xea/g
-s/\\u00eb/\xeb/g
-s/\\u00ec/\xec/g
-s/\\u00ed/\xed/g
-s/\\u00ee/\xee/g
-s/\\u00ef/\xef/g
-s/\\u00f0/\xf0/g
-s/\\u00f1/\xf1/g
-s/\\u00f2/\xf2/g
-s/\\u00f3/\xf3/g
-s/\\u00f4/\xf4/g
-s/\\u00f5/\xf5/g
-s/\\u00f6/\xf6/g
-s/\\u00f7/\xf7/g
-s/\\u00f8/\xf8/g
-s/\\u00f9/\xf9/g
-s/\\u00fa/\xfa/g
-s/\\u00fc/\xfc/g
-s/\\u00ff/\xff/g
--- a/common/nb_native/nbproject/configurations.xml	Tue Dec 03 12:37:30 2013 -0800
+++ b/common/nb_native/nbproject/configurations.xml	Wed Jul 05 19:24:14 2017 +0200
@@ -4987,7 +4987,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5064,7 +5064,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -5074,7 +5074,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -5083,7 +5083,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -5095,7 +5095,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -5108,7 +5108,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -5120,7 +5120,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -5135,7 +5135,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -5150,7 +5150,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -5163,7 +5163,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -5176,7 +5176,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -5188,7 +5188,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -5208,7 +5208,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5250,7 +5250,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -5342,7 +5342,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5373,7 +5373,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -5395,7 +5395,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5425,7 +5425,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5452,7 +5452,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -5484,7 +5484,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5521,7 +5521,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5565,7 +5565,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -5601,7 +5601,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5673,7 +5673,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5702,7 +5702,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5745,7 +5745,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5781,7 +5781,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5817,7 +5817,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5864,7 +5864,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -5900,7 +5900,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -5949,7 +5949,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -5988,7 +5988,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6011,7 +6011,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6041,7 +6041,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6072,7 +6072,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6094,7 +6094,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6136,7 +6136,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6161,7 +6161,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -6193,7 +6193,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6244,7 +6244,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -6256,7 +6256,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -6269,7 +6269,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -6283,7 +6283,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -6296,7 +6296,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -6315,7 +6315,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6344,7 +6344,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6375,7 +6375,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -6427,7 +6427,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>JDWP_LOGGING</Elem>
@@ -6463,7 +6463,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -6483,7 +6483,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_JPLIS_LOGGING</Elem>
@@ -6515,7 +6515,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6524,7 +6524,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
@@ -6541,7 +6541,7 @@
       <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Unix.c"</Elem>
@@ -6573,7 +6573,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6619,7 +6619,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6648,7 +6648,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6668,7 +6668,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -6682,7 +6682,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -6707,7 +6707,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -6744,7 +6744,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -6773,7 +6773,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -6808,7 +6808,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -6838,7 +6838,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
@@ -6860,7 +6860,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
@@ -6909,7 +6909,7 @@
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6941,7 +6941,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -6952,7 +6952,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_md.c"</Elem>
@@ -6965,7 +6965,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -6983,7 +6983,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
@@ -7001,7 +7001,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
@@ -7033,7 +7033,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -7071,7 +7071,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -7095,7 +7095,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="utf_md.c"</Elem>
@@ -7116,7 +7116,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="socket_md.c"</Elem>
@@ -10455,7 +10455,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -10466,7 +10466,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jli_util.c"</Elem>
@@ -10479,7 +10479,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/linux/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
@@ -10504,7 +10504,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="parse_manifest.c"</Elem>
@@ -10521,7 +10521,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
@@ -10538,7 +10538,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="version_comp.c"</Elem>
@@ -10552,7 +10552,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="wildcard.c"</Elem>
@@ -10992,7 +10992,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11013,7 +11013,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11035,7 +11035,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11057,7 +11057,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11079,7 +11079,7 @@
             <pElem>../../jdk/src/solaris/javavm/export</pElem>
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="main.cpp"</Elem>
@@ -11099,7 +11099,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11121,7 +11121,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11143,7 +11143,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -11307,7 +11307,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -11317,7 +11317,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="check_format.c"</Elem>
@@ -11345,7 +11345,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11378,7 +11378,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11411,7 +11411,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11444,7 +11444,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11477,7 +11477,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11565,7 +11565,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11598,7 +11598,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11631,7 +11631,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11664,7 +11664,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11697,7 +11697,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11730,7 +11730,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11763,7 +11763,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11796,7 +11796,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11829,7 +11829,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11862,7 +11862,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11895,7 +11895,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11928,7 +11928,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11961,7 +11961,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -11994,7 +11994,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12027,7 +12027,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12060,7 +12060,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12800,7 +12800,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -12833,7 +12833,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Adler32.c"</Elem>
@@ -12860,7 +12860,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="CRC32.c"</Elem>
@@ -12887,7 +12887,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Deflater.c"</Elem>
@@ -12914,7 +12914,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inflater.c"</Elem>
@@ -12941,7 +12941,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ZipFile.c"</Elem>
@@ -12968,7 +12968,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="zip_util.c"</Elem>
@@ -13213,7 +13213,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13253,7 +13253,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13293,7 +13293,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13333,7 +13333,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13388,7 +13388,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13433,7 +13433,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -13458,7 +13458,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -13483,7 +13483,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13514,7 +13514,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13545,7 +13545,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13576,7 +13576,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13607,7 +13607,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13638,7 +13638,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13669,7 +13669,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13700,7 +13700,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13731,7 +13731,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13762,7 +13762,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13793,7 +13793,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13824,7 +13824,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13855,7 +13855,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13886,7 +13886,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13917,7 +13917,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13948,7 +13948,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -13979,7 +13979,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14010,7 +14010,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14041,7 +14041,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14072,7 +14072,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14103,7 +14103,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14134,7 +14134,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14165,7 +14165,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14196,7 +14196,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14227,7 +14227,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14258,7 +14258,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14289,7 +14289,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14320,7 +14320,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14351,7 +14351,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14382,7 +14382,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14413,7 +14413,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14444,7 +14444,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14475,7 +14475,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14506,7 +14506,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14537,7 +14537,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14568,7 +14568,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14599,7 +14599,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14630,7 +14630,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14661,7 +14661,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14692,7 +14692,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14723,7 +14723,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14747,7 +14747,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jpegdecoder.c"</Elem>
@@ -14775,7 +14775,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14806,7 +14806,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -14837,7 +14837,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -15014,7 +15014,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -15029,7 +15029,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15045,7 +15045,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15061,7 +15061,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15077,7 +15077,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15093,7 +15093,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15109,7 +15109,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15125,7 +15125,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15141,7 +15141,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15157,7 +15157,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15173,7 +15173,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15189,7 +15189,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15205,7 +15205,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15221,7 +15221,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15237,7 +15237,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15253,7 +15253,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15269,7 +15269,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15285,7 +15285,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15301,7 +15301,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15317,7 +15317,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15333,7 +15333,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15349,7 +15349,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15365,7 +15365,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15381,7 +15381,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15397,7 +15397,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15413,7 +15413,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15429,7 +15429,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15445,7 +15445,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15461,7 +15461,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15477,7 +15477,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15493,7 +15493,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15509,7 +15509,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15525,7 +15525,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15541,7 +15541,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15557,7 +15557,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15573,7 +15573,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15589,7 +15589,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15605,7 +15605,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15621,7 +15621,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15637,7 +15637,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15653,7 +15653,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15669,7 +15669,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15685,7 +15685,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15701,7 +15701,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15717,7 +15717,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15733,7 +15733,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15749,7 +15749,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15765,7 +15765,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15781,7 +15781,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15797,7 +15797,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15813,7 +15813,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15829,7 +15829,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15845,7 +15845,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15861,7 +15861,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15877,7 +15877,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15893,7 +15893,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_OS64BIT</Elem>
@@ -15983,7 +15983,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16010,7 +16010,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16045,7 +16045,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16805,7 +16805,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -16836,7 +16836,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16869,7 +16869,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -16902,7 +16902,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -18449,7 +18449,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18466,7 +18466,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18484,7 +18484,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18502,7 +18502,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCHNAME="amd64"</Elem>
@@ -18514,7 +18514,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jexec.c"</Elem>
@@ -18895,7 +18895,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -18934,7 +18934,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -18971,7 +18971,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -19010,7 +19010,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19051,7 +19051,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19092,7 +19092,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19133,7 +19133,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19174,7 +19174,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19215,7 +19215,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19256,7 +19256,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19297,7 +19297,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19338,7 +19338,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19378,7 +19378,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19418,7 +19418,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19459,7 +19459,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19500,7 +19500,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19541,7 +19541,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19582,7 +19582,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19623,7 +19623,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19664,7 +19664,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19705,7 +19705,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19746,7 +19746,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19787,7 +19787,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19828,7 +19828,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19869,7 +19869,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19915,7 +19915,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19956,7 +19956,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -19997,7 +19997,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -20133,7 +20133,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
@@ -20149,7 +20149,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
@@ -20165,7 +20165,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPoll.c"</Elem>
@@ -20181,7 +20181,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPollArrayWrapper.c"</Elem>
@@ -20197,7 +20197,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="EPollPort.c"</Elem>
@@ -20213,7 +20213,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
@@ -20229,7 +20229,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
@@ -20245,7 +20245,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileKey.c"</Elem>
@@ -20261,7 +20261,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="IOUtil.c"</Elem>
@@ -20277,7 +20277,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="InheritedChannel.c"</Elem>
@@ -20293,7 +20293,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="NativeThread.c"</Elem>
@@ -20309,7 +20309,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Net.c"</Elem>
@@ -20325,7 +20325,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
@@ -20341,7 +20341,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
@@ -20357,7 +20357,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
@@ -20373,7 +20373,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
@@ -20389,7 +20389,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
@@ -20405,7 +20405,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
@@ -20454,7 +20454,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -20475,7 +20475,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxNativeDispatcher.c"</Elem>
@@ -20499,7 +20499,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxWatchService.c"</Elem>
@@ -20523,7 +20523,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MagicFileTypeDetector.c"</Elem>
@@ -20547,7 +20547,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixCopyFile.c"</Elem>
@@ -20571,7 +20571,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixNativeDispatcher.c"</Elem>
@@ -20584,7 +20584,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genUnixConstants.c"</Elem>
@@ -21464,7 +21464,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21541,7 +21541,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -21551,7 +21551,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -21560,7 +21560,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -21572,7 +21572,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -21585,7 +21585,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -21597,7 +21597,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -21612,7 +21612,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -21627,7 +21627,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -21640,7 +21640,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -21653,7 +21653,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -21665,7 +21665,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -21685,7 +21685,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21727,7 +21727,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -21820,7 +21820,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21851,7 +21851,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -21873,7 +21873,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21903,7 +21903,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21930,7 +21930,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -21962,7 +21962,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -21999,7 +21999,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22043,7 +22043,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -22079,7 +22079,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22151,7 +22151,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22180,7 +22180,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22223,7 +22223,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22259,7 +22259,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22295,7 +22295,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22342,7 +22342,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -22378,7 +22378,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22427,7 +22427,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -22466,7 +22466,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -22489,7 +22489,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22519,7 +22519,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22550,7 +22550,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -22572,7 +22572,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22614,7 +22614,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22639,7 +22639,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -22671,7 +22671,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22722,7 +22722,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -22734,7 +22734,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -22747,7 +22747,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -22761,7 +22761,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -22774,7 +22774,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -22793,7 +22793,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22822,7 +22822,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22853,7 +22853,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -22905,7 +22905,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>JDWP_LOGGING</Elem>
@@ -22941,7 +22941,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -22961,7 +22961,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_JPLIS_LOGGING</Elem>
@@ -22993,7 +22993,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -23002,7 +23002,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
@@ -23019,7 +23019,7 @@
       <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Unix.c"</Elem>
@@ -23051,7 +23051,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23097,7 +23097,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23126,7 +23126,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23146,7 +23146,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -23160,7 +23160,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -23185,7 +23185,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23222,7 +23222,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -23251,7 +23251,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -23286,7 +23286,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -23316,7 +23316,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
@@ -23338,7 +23338,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
@@ -23387,7 +23387,7 @@
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -23419,7 +23419,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -23430,7 +23430,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_md.c"</Elem>
@@ -23443,7 +23443,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -23461,7 +23461,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
@@ -23479,7 +23479,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
@@ -23511,7 +23511,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -23549,7 +23549,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -23573,7 +23573,7 @@
             <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="utf_md.c"</Elem>
@@ -23594,7 +23594,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="socket_md.c"</Elem>
@@ -28097,7 +28097,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28112,7 +28112,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28126,7 +28126,7 @@
           <incDir>
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
@@ -28152,7 +28152,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28171,7 +28171,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28190,7 +28190,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28206,7 +28206,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>LIBARCH32NAME="i386"</Elem>
@@ -28648,7 +28648,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28669,7 +28669,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28691,7 +28691,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28713,7 +28713,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28735,7 +28735,7 @@
             <pElem>../../jdk/src/solaris/javavm/export</pElem>
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="main.cpp"</Elem>
@@ -28755,7 +28755,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28777,7 +28777,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28799,7 +28799,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>NO_ZLIB</Elem>
@@ -28919,7 +28919,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -28929,7 +28929,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="check_format.c"</Elem>
@@ -28957,7 +28957,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -28990,7 +28990,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29023,7 +29023,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29056,7 +29056,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29089,7 +29089,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29177,7 +29177,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29210,7 +29210,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29243,7 +29243,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29276,7 +29276,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29309,7 +29309,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29342,7 +29342,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29375,7 +29375,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29408,7 +29408,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29441,7 +29441,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29474,7 +29474,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29507,7 +29507,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29540,7 +29540,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29573,7 +29573,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29606,7 +29606,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29639,7 +29639,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -29672,7 +29672,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -30412,7 +30412,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -30445,7 +30445,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Adler32.c"</Elem>
@@ -30472,7 +30472,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="CRC32.c"</Elem>
@@ -30499,7 +30499,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Deflater.c"</Elem>
@@ -30526,7 +30526,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inflater.c"</Elem>
@@ -30553,7 +30553,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ZipFile.c"</Elem>
@@ -30580,7 +30580,7 @@
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/solaris/native/java/io</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="zip_util.c"</Elem>
@@ -30825,7 +30825,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30864,7 +30864,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30903,7 +30903,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30942,7 +30942,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -30996,7 +30996,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -31040,7 +31040,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -31064,7 +31064,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </item>
@@ -31089,7 +31089,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31120,7 +31120,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31151,7 +31151,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31182,7 +31182,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31213,7 +31213,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31244,7 +31244,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31275,7 +31275,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31306,7 +31306,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31337,7 +31337,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31368,7 +31368,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31399,7 +31399,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31430,7 +31430,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31461,7 +31461,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31492,7 +31492,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31523,7 +31523,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31554,7 +31554,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31585,7 +31585,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31616,7 +31616,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31647,7 +31647,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31678,7 +31678,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31709,7 +31709,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31740,7 +31740,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31771,7 +31771,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31802,7 +31802,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31833,7 +31833,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31864,7 +31864,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31895,7 +31895,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31926,7 +31926,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31957,7 +31957,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -31988,7 +31988,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32019,7 +32019,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32050,7 +32050,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32081,7 +32081,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32112,7 +32112,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32143,7 +32143,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32174,7 +32174,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32205,7 +32205,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32236,7 +32236,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32267,7 +32267,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32298,7 +32298,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32329,7 +32329,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32353,7 +32353,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/jpeg</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="jpegdecoder.c"</Elem>
@@ -32381,7 +32381,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32412,7 +32412,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32443,7 +32443,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -32620,7 +32620,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -32635,7 +32635,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32652,7 +32652,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32669,7 +32669,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32686,7 +32686,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32703,7 +32703,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32720,7 +32720,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32737,7 +32737,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32754,7 +32754,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32771,7 +32771,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32788,7 +32788,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32805,7 +32805,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32822,7 +32822,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32839,7 +32839,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32856,7 +32856,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32873,7 +32873,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32890,7 +32890,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32907,7 +32907,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32924,7 +32924,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32941,7 +32941,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32958,7 +32958,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32975,7 +32975,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -32992,7 +32992,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33009,7 +33009,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33026,7 +33026,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33043,7 +33043,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33060,7 +33060,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33077,7 +33077,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33094,7 +33094,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33111,7 +33111,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33128,7 +33128,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33145,7 +33145,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33162,7 +33162,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33179,7 +33179,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33196,7 +33196,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33213,7 +33213,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33230,7 +33230,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33247,7 +33247,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33264,7 +33264,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33281,7 +33281,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33298,7 +33298,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33315,7 +33315,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33332,7 +33332,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33349,7 +33349,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33366,7 +33366,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33383,7 +33383,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33400,7 +33400,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33417,7 +33417,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33434,7 +33434,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33451,7 +33451,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33468,7 +33468,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33485,7 +33485,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33502,7 +33502,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33519,7 +33519,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33536,7 +33536,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33553,7 +33553,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/awt/medialib</pElem>
             <pElem>../../jdk/src/solaris/native/sun/awt/medialib</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MLIB_NO_LIBSUNMATH</Elem>
@@ -33644,7 +33644,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -33672,7 +33672,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -33707,7 +33707,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -34467,7 +34467,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -34498,7 +34498,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -34530,7 +34530,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -34562,7 +34562,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -36472,7 +36472,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36512,7 +36512,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -36549,7 +36549,7 @@
             <pElem>../../jdk/src/solaris/native/sun/awt</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS=true</Elem>
@@ -36588,7 +36588,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36630,7 +36630,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36672,7 +36672,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36714,7 +36714,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36756,7 +36756,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36798,7 +36798,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36840,7 +36840,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36882,7 +36882,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -36924,7 +36924,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -36963,7 +36963,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -37002,7 +37002,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37044,7 +37044,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37086,7 +37086,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37128,7 +37128,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37170,7 +37170,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37212,7 +37212,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37254,7 +37254,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37296,7 +37296,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37338,7 +37338,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37380,7 +37380,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37422,7 +37422,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37464,7 +37464,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37511,7 +37511,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37553,7 +37553,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37595,7 +37595,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -37732,7 +37732,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramChannelImpl.c"</Elem>
@@ -37748,7 +37748,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramDispatcher.c"</Elem>
@@ -37764,7 +37764,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DevPollArrayWrapper.c"</Elem>
@@ -37780,7 +37780,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileChannelImpl.c"</Elem>
@@ -37796,7 +37796,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileDispatcherImpl.c"</Elem>
@@ -37812,7 +37812,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="FileKey.c"</Elem>
@@ -37828,7 +37828,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="IOUtil.c"</Elem>
@@ -37844,7 +37844,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="InheritedChannel.c"</Elem>
@@ -37860,7 +37860,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="NativeThread.c"</Elem>
@@ -37876,7 +37876,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Net.c"</Elem>
@@ -37892,7 +37892,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="PollArrayWrapper.c"</Elem>
@@ -37908,7 +37908,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ServerSocketChannelImpl.c"</Elem>
@@ -37924,7 +37924,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketChannelImpl.c"</Elem>
@@ -37940,7 +37940,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SocketDispatcher.c"</Elem>
@@ -37956,7 +37956,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="SolarisEventPort.c"</Elem>
@@ -37972,7 +37972,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousServerSocketChannelImpl.c"</Elem>
@@ -37988,7 +37988,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="UnixAsynchronousSocketChannelImpl.c"</Elem>
@@ -38037,7 +38037,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38073,7 +38073,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38110,7 +38110,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38147,7 +38147,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38184,7 +38184,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -38210,7 +38210,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSolarisConstants.c"</Elem>
@@ -38223,7 +38223,7 @@
             flavor2="0">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39157,7 +39157,7 @@
       <folder path="$SRC/jdk/make">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -39192,7 +39192,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39278,7 +39278,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </ccTool>
       </folder>
@@ -39288,7 +39288,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -39297,7 +39297,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
@@ -39309,7 +39309,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="gctest.c"</Elem>
@@ -39322,7 +39322,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapTracker.c"</Elem>
@@ -39334,7 +39334,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="heapViewer.c"</Elem>
@@ -39349,7 +39349,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="debug_malloc.c"</Elem>
@@ -39364,7 +39364,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="java_crw_demo.c"</Elem>
@@ -39377,7 +39377,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="minst.c"</Elem>
@@ -39390,7 +39390,7 @@
             <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="mtrace.c"</Elem>
@@ -39402,7 +39402,7 @@
           <incDir>
             <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="versionCheck.c"</Elem>
@@ -39422,7 +39422,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39467,7 +39467,7 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -39571,7 +39571,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39602,7 +39602,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -39624,7 +39624,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39654,7 +39654,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39681,7 +39681,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="DatagramPacket.c"</Elem>
@@ -39713,7 +39713,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39750,7 +39750,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39794,7 +39794,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -39830,7 +39830,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -39905,7 +39905,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -39935,7 +39935,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -39978,7 +39978,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40013,7 +40013,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40048,7 +40048,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -40094,7 +40094,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -40130,7 +40130,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -40183,7 +40183,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>HEADLESS</Elem>
@@ -40225,7 +40225,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -40248,7 +40248,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40277,7 +40277,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>FUNCPROTO=15</Elem>
@@ -40309,7 +40309,7 @@
             <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
             <pElem>../../jdk/src/share/native/sun/font</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>INTERNAL_BUILD</Elem>
@@ -40330,7 +40330,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40375,7 +40375,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40403,7 +40403,7 @@
       <folder path="$SRC/jdk/src/share/native/sun/nio">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
@@ -40435,7 +40435,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40492,7 +40492,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
@@ -40504,7 +40504,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
             <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>MP_API_COMPATIBLE</Elem>
@@ -40517,7 +40517,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="GSSLibStub.c"</Elem>
@@ -40531,7 +40531,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_convert.c"</Elem>
@@ -40544,7 +40544,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc.c"</Elem>
@@ -40563,7 +40563,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40595,7 +40595,7 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40629,7 +40629,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40674,7 +40674,7 @@
             <pElem>../../jdk/src/share/back</pElem>
             <pElem>../../jdk/src/solaris/back</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40707,7 +40707,7 @@
             <pElem>../../jdk/src/share/bin</pElem>
             <pElem>../../jdk/src/solaris/bin</pElem>
             <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40762,7 +40762,7 @@
         <cTool>
           <incDir>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/democlasses/jni/Poller</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -40774,7 +40774,7 @@
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
             <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="hprof_md.c"</Elem>
@@ -40794,7 +40794,7 @@
             <pElem>../../jdk/src/share/instrument</pElem>
             <pElem>../../jdk/src/solaris/instrument</pElem>
             <pElem>../../jdk/src/share/bin</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40854,7 +40854,7 @@
         <cTool>
           <incDir>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -40863,7 +40863,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
             <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>EXTRA_SOUND_JNI_LIBS=""</Elem>
@@ -40878,7 +40878,7 @@
       <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
         <cTool>
           <incDir>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Solaris.c"</Elem>
@@ -40910,7 +40910,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -40982,7 +40982,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41011,7 +41011,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41031,7 +41031,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
@@ -41045,7 +41045,7 @@
             <pElem>../../jdk/src/share/native/java/io</pElem>
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
@@ -41070,7 +41070,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCHPROPNAME="amd64"</Elem>
@@ -41126,7 +41126,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>PNG_NO_MMX_CODE</Elem>
@@ -41155,7 +41155,7 @@
             <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
             <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
             <pElem>../../jdk/src/share/native/sun/java2d</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41203,7 +41203,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41247,7 +41247,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/management</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41282,7 +41282,7 @@
             <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
             <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41359,7 +41359,7 @@
             <pElem>../../jdk/src/share/native/java/net</pElem>
             <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
             <pElem>../../jdk/src/solaris/native/java/net</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -41404,7 +41404,7 @@
           <incDir>
             <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
         </cTool>
       </folder>
@@ -41415,7 +41415,7 @@
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
             <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="p11_md.c"</Elem>
@@ -41428,7 +41428,7 @@
             <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
             <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>THIS_FILE="pcsc_md.c"</Elem>
@@ -41446,7 +41446,7 @@
             <pElem>../../jdk/src/share/native/common</pElem>
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41477,7 +41477,7 @@
             <pElem>../../jdk/src/solaris/native/common</pElem>
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41522,7 +41522,7 @@
             <pElem>../../jdk/src/solaris/native/java/util</pElem>
             <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
             <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41573,7 +41573,7 @@
             <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
             <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
             <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41611,7 +41611,7 @@
             <pElem>../../build/solaris-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
             <pElem>../../jdk/src/share/npt</pElem>
             <pElem>../../jdk/src/solaris/npt</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
@@ -41645,7 +41645,7 @@
             <pElem>../../jdk/src/solaris/transport/socket</pElem>
             <pElem>../../jdk/src/share/back/export</pElem>
             <pElem>../../jdk/src/share/back</pElem>
-            <pElem>../../jdk/makefiles</pElem>
+            <pElem>../../jdk/make</pElem>
           </incDir>
           <preprocessorList>
             <Elem>ARCH="amd64"</Elem>
--- a/hotspot/.hgtags	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/.hgtags	Wed Jul 05 19:24:14 2017 +0200
@@ -397,3 +397,5 @@
 c78d517c7ea47501b456e707afd4b78e7b5b202e hs25-b59
 f573d00213b7170c2ff856f9cd83cd148437f5b9 jdk8-b117
 abad3b2d905d9e1ad767c94baa94aba6ed5b207b hs25-b60
+c9f439732b18ea16f7e65815327d5ea7092cc258 jdk8-b118
+b2426da30009cd3069d03de073f351e6432c7682 hs25-b61
--- a/hotspot/make/hotspot_version	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/make/hotspot_version	Wed Jul 05 19:24:14 2017 +0200
@@ -35,7 +35,7 @@
 
 HS_MAJOR_VER=25
 HS_MINOR_VER=0
-HS_BUILD_NUMBER=60
+HS_BUILD_NUMBER=61
 
 JDK_MAJOR_VER=1
 JDK_MINOR_VER=8
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -4483,8 +4483,8 @@
   for (int index = 0; index < num_methods; index++) {
     Method* m = methods->at(index);
 
-    // skip static and <init> methods
-    if ((!m->is_static()) &&
+    // skip private, static, and <init> methods
+    if ((!m->is_private() && !m->is_static()) &&
         (m->name() != vmSymbols::object_initializer_name())) {
 
       Symbol* name = m->name();
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -62,13 +62,13 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/synchronizer.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
 
 #if INCLUDE_TRACE
  #include "trace/tracing.hpp"
 #endif
 
-
 ClassLoaderData * ClassLoaderData::_the_null_class_loader_data = NULL;
 
 ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_anonymous, Dependencies dependencies) :
@@ -754,7 +754,7 @@
   if (Tracing::enabled()) {
     if (Tracing::is_event_enabled(TraceClassUnloadEvent)) {
       assert(_unloading != NULL, "need class loader data unload list!");
-      _class_unload_time = Tracing::time();
+      _class_unload_time = Ticks::now();
       classes_unloading_do(&class_unload_event);
     }
     Tracing::on_unloading_classes();
@@ -832,7 +832,7 @@
 
 #if INCLUDE_TRACE
 
-TracingTime ClassLoaderDataGraph::_class_unload_time;
+Ticks ClassLoaderDataGraph::_class_unload_time;
 
 void ClassLoaderDataGraph::class_unload_event(Klass* const k) {
 
--- a/hotspot/src/share/vm/classfile/classLoaderData.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/classLoaderData.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -33,7 +33,7 @@
 #include "utilities/growableArray.hpp"
 
 #if INCLUDE_TRACE
-# include "trace/traceTime.hpp"
+# include "utilities/ticks.hpp"
 #endif
 
 //
@@ -98,7 +98,7 @@
 
 #if INCLUDE_TRACE
  private:
-  static TracingTime _class_unload_time;
+  static Ticks _class_unload_time;
   static void class_unload_event(Klass* const k);
 #endif
 };
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -55,13 +55,13 @@
 #include "runtime/signature.hpp"
 #include "services/classLoadingService.hpp"
 #include "services/threadService.hpp"
+#include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
 
 #if INCLUDE_TRACE
  #include "trace/tracing.hpp"
- #include "trace/traceMacros.hpp"
 #endif
 
-
 Dictionary*            SystemDictionary::_dictionary          = NULL;
 PlaceholderTable*      SystemDictionary::_placeholders        = NULL;
 Dictionary*            SystemDictionary::_shared_dictionary   = NULL;
@@ -598,7 +598,7 @@
   assert(name != NULL && !FieldType::is_array(name) &&
          !FieldType::is_obj(name), "invalid class name");
 
-  TracingTime class_load_start_time = Tracing::time();
+  Ticks class_load_start_time = Ticks::now();
 
   // UseNewReflection
   // Fix for 4474172; see evaluation for more details
@@ -1006,7 +1006,7 @@
                                       TRAPS) {
   TempNewSymbol parsed_name = NULL;
 
-  TracingTime class_load_start_time = Tracing::time();
+  Ticks class_load_start_time = Ticks::now();
 
   ClassLoaderData* loader_data;
   if (host_klass.not_null()) {
@@ -2665,13 +2665,12 @@
 }
 
 // utility function for class load event
-void SystemDictionary::post_class_load_event(TracingTime start_time,
+void SystemDictionary::post_class_load_event(const Ticks& start_time,
                                              instanceKlassHandle k,
                                              Handle initiating_loader) {
 #if INCLUDE_TRACE
   EventClassLoad event(UNTIMED);
   if (event.should_commit()) {
-    event.set_endtime(Tracing::time());
     event.set_starttime(start_time);
     event.set_loadedClass(k());
     oop defining_class_loader = k->class_loader();
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -31,7 +31,6 @@
 #include "oops/symbol.hpp"
 #include "runtime/java.hpp"
 #include "runtime/reflectionUtils.hpp"
-#include "trace/traceTime.hpp"
 #include "utilities/hashtable.hpp"
 #include "utilities/hashtable.inline.hpp"
 
@@ -78,6 +77,7 @@
 template <MEMFLAGS F> class HashtableBucket;
 class ResolutionErrorTable;
 class SymbolPropertyTable;
+class Ticks;
 
 // Certain classes are preloaded, such as java.lang.Object and java.lang.String.
 // They are all "well-known", in the sense that no class loader is allowed
@@ -165,6 +165,7 @@
                                                                                                                          \
   do_klass(StringBuffer_klass,                          java_lang_StringBuffer,                    Pre                 ) \
   do_klass(StringBuilder_klass,                         java_lang_StringBuilder,                   Pre                 ) \
+  do_klass(misc_Unsafe_klass,                           sun_misc_Unsafe,                           Pre                 ) \
                                                                                                                          \
   /* It's NULL in non-1.4 JDKs. */                                                                                       \
   do_klass(StackTraceElement_klass,                     java_lang_StackTraceElement,               Opt                 ) \
@@ -637,7 +638,7 @@
   static void add_to_hierarchy(instanceKlassHandle k, TRAPS);
 
   // event based tracing
-  static void post_class_load_event(TracingTime start_time, instanceKlassHandle k,
+  static void post_class_load_event(const Ticks& start_time, instanceKlassHandle k,
                                     Handle initiating_loader);
   // We pass in the hashtable index so we can calculate it outside of
   // the SystemDictionary_lock.
--- a/hotspot/src/share/vm/classfile/verifier.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/verifier.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -2302,6 +2302,24 @@
   }
 }
 
+bool ClassVerifier::is_same_or_direct_interface(
+    instanceKlassHandle klass,
+    VerificationType klass_type,
+    VerificationType ref_class_type) {
+  if (ref_class_type.equals(klass_type)) return true;
+  Array<Klass*>* local_interfaces = klass->local_interfaces();
+  if (local_interfaces != NULL) {
+    for (int x = 0; x < local_interfaces->length(); x++) {
+      Klass* k = local_interfaces->at(x);
+      assert (k != NULL && k->is_interface(), "invalid interface");
+      if (ref_class_type.equals(VerificationType::reference_type(k->name()))) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 void ClassVerifier::verify_invoke_instructions(
     RawBytecodeStream* bcs, u4 code_length, StackMapFrame* current_frame,
     bool *this_uninit, VerificationType return_type,
@@ -2432,23 +2450,38 @@
       return;
     }
   } else if (opcode == Bytecodes::_invokespecial
-             && !ref_class_type.equals(current_type())
+             && !is_same_or_direct_interface(current_class(), current_type(), ref_class_type)
              && !ref_class_type.equals(VerificationType::reference_type(
                   current_class()->super()->name()))) {
     bool subtype = false;
+    bool have_imr_indirect = cp->tag_at(index).value() == JVM_CONSTANT_InterfaceMethodref;
     if (!current_class()->is_anonymous()) {
       subtype = ref_class_type.is_assignable_from(
                  current_type(), this, CHECK_VERIFY(this));
     } else {
-      subtype = ref_class_type.is_assignable_from(VerificationType::reference_type(
-                 current_class()->host_klass()->name()), this, CHECK_VERIFY(this));
+      VerificationType host_klass_type =
+                        VerificationType::reference_type(current_class()->host_klass()->name());
+      subtype = ref_class_type.is_assignable_from(host_klass_type, this, CHECK_VERIFY(this));
+
+      // If invokespecial of IMR, need to recheck for same or
+      // direct interface relative to the host class
+      have_imr_indirect = (have_imr_indirect &&
+                           !is_same_or_direct_interface(
+                             InstanceKlass::cast(current_class()->host_klass()),
+                             host_klass_type, ref_class_type));
     }
     if (!subtype) {
       verify_error(ErrorContext::bad_code(bci),
           "Bad invokespecial instruction: "
           "current class isn't assignable to reference class.");
        return;
+    } else if (have_imr_indirect) {
+      verify_error(ErrorContext::bad_code(bci),
+          "Bad invokespecial instruction: "
+          "interface method reference is in an indirect superinterface.");
+      return;
     }
+
   }
   // Match method descriptor with operand stack
   for (int i = nargs - 1; i >= 0; i--) {  // Run backwards
--- a/hotspot/src/share/vm/classfile/verifier.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/verifier.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -345,6 +345,9 @@
   // that a class has been verified and prepared for execution.
   bool was_recursively_verified() { return _klass->is_rewritten(); }
 
+  bool is_same_or_direct_interface(instanceKlassHandle klass,
+    VerificationType klass_type, VerificationType ref_class_type);
+
  public:
   enum {
     BYTECODE_OFFSET = 1,
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -331,6 +331,7 @@
   template(findNative_name,                           "findNative")                               \
   template(deadChild_name,                            "deadChild")                                \
   template(addClass_name,                             "addClass")                                 \
+  template(throwIllegalAccessError_name,              "throwIllegalAccessError")                  \
   template(getFromClass_name,                         "getFromClass")                             \
   template(dispatch_name,                             "dispatch")                                 \
   template(getSystemClassLoader_name,                 "getSystemClassLoader")                     \
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -1993,7 +1993,7 @@
   GenCollectedHeap* gch = GenCollectedHeap::heap();
 
   STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
-  gc_timer->register_gc_start(os::elapsed_counter());
+  gc_timer->register_gc_start();
 
   SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
   gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
@@ -2089,7 +2089,7 @@
     size_policy()->msc_collection_end(gch->gc_cause());
   }
 
-  gc_timer->register_gc_end(os::elapsed_counter());
+  gc_timer->register_gc_end();
 
   gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
 
@@ -2475,7 +2475,7 @@
 
 void CMSCollector::register_gc_start(GCCause::Cause cause) {
   _cms_start_registered = true;
-  _gc_timer_cm->register_gc_start(os::elapsed_counter());
+  _gc_timer_cm->register_gc_start();
   _gc_tracer_cm->report_gc_start(cause, _gc_timer_cm->gc_start());
 }
 
@@ -2483,7 +2483,7 @@
   if (_cms_start_registered) {
     report_heap_summary(GCWhen::AfterGC);
 
-    _gc_timer_cm->register_gc_end(os::elapsed_counter());
+    _gc_timer_cm->register_gc_end();
     _gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
     _cms_start_registered = false;
   }
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -145,7 +145,7 @@
                                 );
 #endif /* USDT2 */
 
-  _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark", os::elapsed_counter());
+  _collector->_gc_timer_cm->register_gc_pause_start("Initial Mark");
 
   GenCollectedHeap* gch = GenCollectedHeap::heap();
   GCCauseSetter gccs(gch, GCCause::_cms_initial_mark);
@@ -157,7 +157,7 @@
 
   VM_CMS_Operation::verify_after_gc();
 
-  _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
+  _collector->_gc_timer_cm->register_gc_pause_end();
 
 #ifndef USDT2
   HS_DTRACE_PROBE(hs_private, cms__initmark__end);
@@ -182,7 +182,7 @@
                                 );
 #endif /* USDT2 */
 
-  _collector->_gc_timer_cm->register_gc_pause_start("Final Mark", os::elapsed_counter());
+  _collector->_gc_timer_cm->register_gc_pause_start("Final Mark");
 
   GenCollectedHeap* gch = GenCollectedHeap::heap();
   GCCauseSetter gccs(gch, GCCause::_cms_final_remark);
@@ -195,7 +195,7 @@
   VM_CMS_Operation::verify_after_gc();
 
   _collector->save_heap_summary();
-  _collector->_gc_timer_cm->register_gc_pause_end(os::elapsed_counter());
+  _collector->_gc_timer_cm->register_gc_pause_end();
 
 #ifndef USDT2
   HS_DTRACE_PROBE(hs_private, cms__remark__end);
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -56,6 +56,7 @@
 #include "oops/oop.inline.hpp"
 #include "oops/oop.pcgc.inline.hpp"
 #include "runtime/vmThread.hpp"
+#include "utilities/ticks.hpp"
 
 size_t G1CollectedHeap::_humongous_object_threshold_in_words = 0;
 
@@ -1284,7 +1285,7 @@
   }
 
   STWGCTimer* gc_timer = G1MarkSweep::gc_timer();
-  gc_timer->register_gc_start(os::elapsed_counter());
+  gc_timer->register_gc_start();
 
   SerialOldTracer* gc_tracer = G1MarkSweep::gc_tracer();
   gc_tracer->report_gc_start(gc_cause(), gc_timer->gc_start());
@@ -1552,7 +1553,7 @@
 
     post_full_gc_dump(gc_timer);
 
-    gc_timer->register_gc_end(os::elapsed_counter());
+    gc_timer->register_gc_end();
     gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
   }
 
@@ -2482,7 +2483,7 @@
   FullGCCount_lock->notify_all();
 }
 
-void G1CollectedHeap::register_concurrent_cycle_start(jlong start_time) {
+void G1CollectedHeap::register_concurrent_cycle_start(const Ticks& start_time) {
   _concurrent_cycle_started = true;
   _gc_timer_cm->register_gc_start(start_time);
 
@@ -2496,7 +2497,7 @@
       _gc_tracer_cm->report_concurrent_mode_failure();
     }
 
-    _gc_timer_cm->register_gc_end(os::elapsed_counter());
+    _gc_timer_cm->register_gc_end();
     _gc_tracer_cm->report_gc_end(_gc_timer_cm->gc_end(), _gc_timer_cm->time_partitions());
 
     _concurrent_cycle_started = false;
@@ -3887,7 +3888,7 @@
     return false;
   }
 
-  _gc_timer_stw->register_gc_start(os::elapsed_counter());
+  _gc_timer_stw->register_gc_start();
 
   _gc_tracer_stw->report_gc_start(gc_cause(), _gc_timer_stw->gc_start());
 
@@ -4265,7 +4266,7 @@
 
     _gc_tracer_stw->report_evacuation_info(&evacuation_info);
     _gc_tracer_stw->report_tenuring_threshold(_g1_policy->tenuring_threshold());
-    _gc_timer_stw->register_gc_end(os::elapsed_counter());
+    _gc_timer_stw->register_gc_end();
     _gc_tracer_stw->report_gc_end(_gc_timer_stw->gc_end(), _gc_timer_stw->time_partitions());
   }
   // It should now be safe to tell the concurrent mark thread to start
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -72,6 +72,7 @@
 class G1OldTracer;
 class EvacuationFailedInfo;
 class nmethod;
+class Ticks;
 
 typedef OverflowTaskQueue<StarTask, mtGC>         RefToScanQueue;
 typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;
@@ -746,7 +747,7 @@
     return _old_marking_cycles_completed;
   }
 
-  void register_concurrent_cycle_start(jlong start_time);
+  void register_concurrent_cycle_start(const Ticks& start_time);
   void register_concurrent_cycle_end();
   void trace_heap_after_concurrent_cycle();
 
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -915,7 +915,7 @@
 
   GenCollectedHeap* gch = GenCollectedHeap::heap();
 
-  _gc_timer->register_gc_start(os::elapsed_counter());
+  _gc_timer->register_gc_start();
 
   assert(gch->kind() == CollectedHeap::GenCollectedHeap,
     "not a CMS generational heap");
@@ -1091,7 +1091,7 @@
   gch->trace_heap_after_gc(&gc_tracer);
   gc_tracer.report_tenuring_threshold(tenuring_threshold());
 
-  _gc_timer->register_gc_end(os::elapsed_counter());
+  _gc_timer->register_gc_end();
 
   gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
 }
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -114,7 +114,7 @@
   assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
   GCCause::Cause gc_cause = heap->gc_cause();
 
-  _gc_timer->register_gc_start(os::elapsed_counter());
+  _gc_timer->register_gc_start();
   _gc_tracer->report_gc_start(gc_cause, _gc_timer->gc_start());
 
   PSAdaptiveSizePolicy* size_policy = heap->size_policy();
@@ -390,7 +390,7 @@
   ParallelTaskTerminator::print_termination_counts();
 #endif
 
-  _gc_timer->register_gc_end(os::elapsed_counter());
+  _gc_timer->register_gc_end();
 
   _gc_tracer->report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
 
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -2006,7 +2006,7 @@
 
   ParallelScavengeHeap* heap = gc_heap();
 
-  _gc_timer.register_gc_start(os::elapsed_counter());
+  _gc_timer.register_gc_start();
   _gc_tracer.report_gc_start(heap->gc_cause(), _gc_timer.gc_start());
 
   TimeStamp marking_start;
@@ -2244,7 +2244,7 @@
   ParallelTaskTerminator::print_termination_counts();
 #endif
 
-  _gc_timer.register_gc_end(os::elapsed_counter());
+  _gc_timer.register_gc_end();
 
   _gc_tracer.report_dense_prefix(dense_prefix(old_space_id));
   _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -263,7 +263,7 @@
   assert(_preserved_mark_stack.is_empty(), "should be empty");
   assert(_preserved_oop_stack.is_empty(), "should be empty");
 
-  _gc_timer.register_gc_start(os::elapsed_counter());
+  _gc_timer.register_gc_start();
 
   TimeStamp scavenge_entry;
   TimeStamp scavenge_midpoint;
@@ -691,7 +691,7 @@
 #endif
 
 
-  _gc_timer.register_gc_end(os::elapsed_counter());
+  _gc_timer.register_gc_end();
 
   _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions());
 
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -25,52 +25,55 @@
 #include "precompiled.hpp"
 #include "gc_implementation/shared/gcTimer.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/ticks.inline.hpp"
 
-void GCTimer::register_gc_start(jlong time) {
+// the "time" parameter for most functions
+// has a default value set by Ticks::now()
+
+void GCTimer::register_gc_start(const Ticks& time) {
   _time_partitions.clear();
   _gc_start = time;
 }
 
-void GCTimer::register_gc_end(jlong time) {
+void GCTimer::register_gc_end(const Ticks& time) {
   assert(!_time_partitions.has_active_phases(),
       "We should have ended all started phases, before ending the GC");
 
   _gc_end = time;
 }
 
-void GCTimer::register_gc_pause_start(const char* name, jlong time) {
+void GCTimer::register_gc_pause_start(const char* name, const Ticks& time) {
   _time_partitions.report_gc_phase_start(name, time);
 }
 
-void GCTimer::register_gc_pause_end(jlong time) {
+void GCTimer::register_gc_pause_end(const Ticks& time) {
   _time_partitions.report_gc_phase_end(time);
 }
 
-void GCTimer::register_gc_phase_start(const char* name, jlong time) {
+void GCTimer::register_gc_phase_start(const char* name, const Ticks& time) {
   _time_partitions.report_gc_phase_start(name, time);
 }
 
-void GCTimer::register_gc_phase_end(jlong time) {
+void GCTimer::register_gc_phase_end(const Ticks& time) {
   _time_partitions.report_gc_phase_end(time);
 }
 
-
-void STWGCTimer::register_gc_start(jlong time) {
+void STWGCTimer::register_gc_start(const Ticks& time) {
   GCTimer::register_gc_start(time);
   register_gc_pause_start("GC Pause", time);
 }
 
-void STWGCTimer::register_gc_end(jlong time) {
+void STWGCTimer::register_gc_end(const Ticks& time) {
   register_gc_pause_end(time);
   GCTimer::register_gc_end(time);
 }
 
-void ConcurrentGCTimer::register_gc_pause_start(const char* name, jlong time) {
-  GCTimer::register_gc_pause_start(name, time);
+void ConcurrentGCTimer::register_gc_pause_start(const char* name) {
+  GCTimer::register_gc_pause_start(name);
 }
 
-void ConcurrentGCTimer::register_gc_pause_end(jlong time) {
-  GCTimer::register_gc_pause_end(time);
+void ConcurrentGCTimer::register_gc_pause_end() {
+  GCTimer::register_gc_pause_end();
 }
 
 void PhasesStack::clear() {
@@ -111,11 +114,11 @@
 void TimePartitions::clear() {
   _phases->clear();
   _active_phases.clear();
-  _sum_of_pauses = 0;
-  _longest_pause = 0;
+  _sum_of_pauses = Tickspan();
+  _longest_pause = Tickspan();
 }
 
-void TimePartitions::report_gc_phase_start(const char* name, jlong time) {
+void TimePartitions::report_gc_phase_start(const char* name, const Ticks& time) {
   assert(_phases->length() <= 1000, "Too many recored phases?");
 
   int level = _active_phases.count();
@@ -133,13 +136,13 @@
 void TimePartitions::update_statistics(GCPhase* phase) {
   // FIXME: This should only be done for pause phases
   if (phase->level() == 0) {
-    jlong pause = phase->end() - phase->start();
+    const Tickspan pause = phase->end() - phase->start();
     _sum_of_pauses += pause;
     _longest_pause = MAX2(pause, _longest_pause);
   }
 }
 
-void TimePartitions::report_gc_phase_end(jlong time) {
+void TimePartitions::report_gc_phase_end(const Ticks& time) {
   int phase_index = _active_phases.pop();
   GCPhase* phase = _phases->adr_at(phase_index);
   phase->set_end(time);
@@ -157,14 +160,6 @@
   return _phases->adr_at(index);
 }
 
-jlong TimePartitions::sum_of_pauses() {
-  return _sum_of_pauses;
-}
-
-jlong TimePartitions::longest_pause() {
-  return _longest_pause;
-}
-
 bool TimePartitions::has_active_phases() {
   return _active_phases.count() > 0;
 }
@@ -194,7 +189,7 @@
     max_nested_pause_phases();
   }
 
-  static void validate_pause_phase(GCPhase* phase, int level, const char* name, jlong start, jlong end) {
+  static void validate_pause_phase(GCPhase* phase, int level, const char* name, const Ticks& start, const Ticks& end) {
     assert(phase->level() == level, "Incorrect level");
     assert(strcmp(phase->name(), name) == 0, "Incorrect name");
     assert(phase->start() == start, "Incorrect start");
@@ -209,8 +204,8 @@
     TimePartitionPhasesIterator iter(&time_partitions);
 
     validate_pause_phase(iter.next(), 0, "PausePhase", 2, 8);
-    assert(time_partitions.sum_of_pauses() == 8-2, "Incorrect");
-    assert(time_partitions.longest_pause() == 8-2, "Incorrect");
+    assert(time_partitions.sum_of_pauses() == Ticks(8) - Ticks(2), "Incorrect");
+    assert(time_partitions.longest_pause() == Ticks(8) - Ticks(2), "Incorrect");
 
     assert(!iter.has_next(), "Too many elements");
   }
@@ -227,8 +222,8 @@
     validate_pause_phase(iter.next(), 0, "PausePhase1", 2, 3);
     validate_pause_phase(iter.next(), 0, "PausePhase2", 4, 6);
 
-    assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
-    assert(time_partitions.longest_pause() == 2, "Incorrect");
+    assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
+    assert(time_partitions.longest_pause() == Ticks(2) - Ticks(0), "Incorrect");
 
     assert(!iter.has_next(), "Too many elements");
   }
@@ -245,8 +240,8 @@
     validate_pause_phase(iter.next(), 0, "PausePhase", 2, 5);
     validate_pause_phase(iter.next(), 1, "SubPhase", 3, 4);
 
-    assert(time_partitions.sum_of_pauses() == 3, "Incorrect");
-    assert(time_partitions.longest_pause() == 3, "Incorrect");
+    assert(time_partitions.sum_of_pauses() == Ticks(3) - Ticks(0), "Incorrect");
+    assert(time_partitions.longest_pause() == Ticks(3) - Ticks(0), "Incorrect");
 
     assert(!iter.has_next(), "Too many elements");
   }
@@ -269,8 +264,8 @@
     validate_pause_phase(iter.next(), 2, "SubPhase2", 4, 7);
     validate_pause_phase(iter.next(), 3, "SubPhase3", 5, 6);
 
-    assert(time_partitions.sum_of_pauses() == 7, "Incorrect");
-    assert(time_partitions.longest_pause() == 7, "Incorrect");
+    assert(time_partitions.sum_of_pauses() == Ticks(7) - Ticks(0), "Incorrect");
+    assert(time_partitions.longest_pause() == Ticks(7) - Ticks(0), "Incorrect");
 
     assert(!iter.has_next(), "Too many elements");
   }
@@ -298,8 +293,8 @@
     validate_pause_phase(iter.next(), 1, "SubPhase3", 7, 8);
     validate_pause_phase(iter.next(), 1, "SubPhase4", 9, 10);
 
-    assert(time_partitions.sum_of_pauses() == 9, "Incorrect");
-    assert(time_partitions.longest_pause() == 9, "Incorrect");
+    assert(time_partitions.sum_of_pauses() == Ticks(9) - Ticks(0), "Incorrect");
+    assert(time_partitions.longest_pause() == Ticks(9) - Ticks(0), "Incorrect");
 
     assert(!iter.has_next(), "Too many elements");
   }
@@ -336,8 +331,8 @@
     validate_pause_phase(iter.next(), 2, "SubPhase22", 12, 13);
     validate_pause_phase(iter.next(), 1, "SubPhase3", 15, 16);
 
-    assert(time_partitions.sum_of_pauses() == 15, "Incorrect");
-    assert(time_partitions.longest_pause() == 15, "Incorrect");
+    assert(time_partitions.sum_of_pauses() == Ticks(15) - Ticks(0), "Incorrect");
+    assert(time_partitions.longest_pause() == Ticks(15) - Ticks(0), "Incorrect");
 
     assert(!iter.has_next(), "Too many elements");
   }
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -28,6 +28,7 @@
 #include "memory/allocation.hpp"
 #include "prims/jni_md.h"
 #include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
 
 class ConcurrentPhase;
 class GCPhase;
@@ -45,21 +46,21 @@
 class GCPhase {
   const char* _name;
   int _level;
-  jlong _start;
-  jlong _end;
+  Ticks _start;
+  Ticks _end;
 
  public:
   void set_name(const char* name) { _name = name; }
-  const char* name() { return _name; }
+  const char* name() const { return _name; }
 
-  int level() { return _level; }
+  int level() const { return _level; }
   void set_level(int level) { _level = level; }
 
-  jlong start() { return _start; }
-  void set_start(jlong time) { _start = time; }
+  const Ticks start() const { return _start; }
+  void set_start(const Ticks& time) { _start = time; }
 
-  jlong end() { return _end; }
-  void set_end(jlong time) { _end = time; }
+  const Ticks end() const { return _end; }
+  void set_end(const Ticks& time) { _end = time; }
 
   virtual void accept(PhaseVisitor* visitor) = 0;
 };
@@ -102,22 +103,22 @@
   GrowableArray<PausePhase>* _phases;
   PhasesStack _active_phases;
 
-  jlong _sum_of_pauses;
-  jlong _longest_pause;
+  Tickspan _sum_of_pauses;
+  Tickspan _longest_pause;
 
  public:
   TimePartitions();
   ~TimePartitions();
   void clear();
 
-  void report_gc_phase_start(const char* name, jlong time);
-  void report_gc_phase_end(jlong time);
+  void report_gc_phase_start(const char* name, const Ticks& time);
+  void report_gc_phase_end(const Ticks& time);
 
   int num_phases() const;
   GCPhase* phase_at(int index) const;
 
-  jlong sum_of_pauses();
-  jlong longest_pause();
+  const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
+  const Tickspan longest_pause() const { return _longest_pause; }
 
   bool has_active_phases();
  private:
@@ -133,40 +134,37 @@
 class GCTimer : public ResourceObj {
   NOT_PRODUCT(friend class GCTimerTest;)
  protected:
-  jlong _gc_start;
-  jlong _gc_end;
+  Ticks _gc_start;
+  Ticks _gc_end;
   TimePartitions _time_partitions;
 
  public:
-  virtual void register_gc_start(jlong time);
-  virtual void register_gc_end(jlong time);
+  virtual void register_gc_start(const Ticks& time = Ticks::now());
+  virtual void register_gc_end(const Ticks& time = Ticks::now());
 
-  void register_gc_phase_start(const char* name, jlong time);
-  void register_gc_phase_end(jlong time);
+  void register_gc_phase_start(const char* name, const Ticks& time);
+  void register_gc_phase_end(const Ticks& time);
 
-  jlong gc_start() { return _gc_start; }
-  jlong gc_end() { return _gc_end; }
+  const Ticks gc_start() const { return _gc_start; }
+  const Ticks gc_end() const { return _gc_end; }
 
   TimePartitions* time_partitions() { return &_time_partitions; }
 
-  long longest_pause();
-  long sum_of_pauses();
-
  protected:
-  void register_gc_pause_start(const char* name, jlong time);
-  void register_gc_pause_end(jlong time);
+  void register_gc_pause_start(const char* name, const Ticks& time = Ticks::now());
+  void register_gc_pause_end(const Ticks& time = Ticks::now());
 };
 
 class STWGCTimer : public GCTimer {
  public:
-  virtual void register_gc_start(jlong time);
-  virtual void register_gc_end(jlong time);
+  virtual void register_gc_start(const Ticks& time = Ticks::now());
+  virtual void register_gc_end(const Ticks& time = Ticks::now());
 };
 
 class ConcurrentGCTimer : public GCTimer {
  public:
-  void register_gc_pause_start(const char* name, jlong time);
-  void register_gc_pause_end(jlong time);
+  void register_gc_pause_start(const char* name);
+  void register_gc_pause_end();
 };
 
 class TimePartitionPhasesIterator {
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -32,6 +32,7 @@
 #include "memory/referenceProcessorStats.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/ticks.inline.hpp"
 
 #if INCLUDE_ALL_GCS
 #include "gc_implementation/g1/evacuationInfo.hpp"
@@ -45,7 +46,7 @@
   return GCTracer_next_gc_id++;
 }
 
-void GCTracer::report_gc_start_impl(GCCause::Cause cause, jlong timestamp) {
+void GCTracer::report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp) {
   assert_unset_gc_id();
 
   GCId gc_id = create_new_gc_id();
@@ -54,7 +55,7 @@
   _shared_gc_info.set_start_timestamp(timestamp);
 }
 
-void GCTracer::report_gc_start(GCCause::Cause cause, jlong timestamp) {
+void GCTracer::report_gc_start(GCCause::Cause cause, const Ticks& timestamp) {
   assert_unset_gc_id();
 
   report_gc_start_impl(cause, timestamp);
@@ -64,7 +65,7 @@
   return _shared_gc_info.id() != SharedGCInfo::UNSET_GCID;
 }
 
-void GCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void GCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
   assert_set_gc_id();
 
   _shared_gc_info.set_sum_of_pauses(time_partitions->sum_of_pauses());
@@ -75,7 +76,7 @@
   send_garbage_collection_event();
 }
 
-void GCTracer::report_gc_end(jlong timestamp, TimePartitions* time_partitions) {
+void GCTracer::report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions) {
   assert_set_gc_id();
 
   report_gc_end_impl(timestamp, time_partitions);
@@ -97,10 +98,10 @@
   const GCId _gc_id;
   const double _size_threshold_percentage;
   const size_t _total_size_in_words;
-  const jlong _timestamp;
+  const Ticks _timestamp;
 
  public:
-  ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, jlong timestamp) :
+  ObjectCountEventSenderClosure(GCId gc_id, size_t total_size_in_words, const Ticks& timestamp) :
     _gc_id(gc_id),
     _size_threshold_percentage(ObjectCountCutOffPercent / 100),
     _total_size_in_words(total_size_in_words),
@@ -131,9 +132,7 @@
     if (!cit.allocation_failed()) {
       HeapInspection hi(false, false, false, NULL);
       hi.populate_table(&cit, is_alive_cl);
-
-      jlong timestamp = os::elapsed_counter();
-      ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), timestamp);
+      ObjectCountEventSenderClosure event_sender(_shared_gc_info.id(), cit.size_of_instances_in_words(), Ticks::now());
       cit.iterate(&event_sender);
     }
   }
@@ -147,7 +146,7 @@
   send_meta_space_summary_event(when, meta_space_summary);
 }
 
-void YoungGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void YoungGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
   assert_set_gc_id();
   assert(_tenuring_threshold != UNSET_TENURING_THRESHOLD, "Tenuring threshold has not been reported");
 
@@ -167,14 +166,14 @@
   _tenuring_threshold = tenuring_threshold;
 }
 
-void OldGCTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void OldGCTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
   assert_set_gc_id();
 
   GCTracer::report_gc_end_impl(timestamp, time_partitions);
   send_old_gc_event();
 }
 
-void ParallelOldTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void ParallelOldTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
   assert_set_gc_id();
 
   OldGCTracer::report_gc_end_impl(timestamp, time_partitions);
@@ -200,7 +199,7 @@
   _g1_young_gc_info.set_type(type);
 }
 
-void G1NewTracer::report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions) {
+void G1NewTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions) {
   assert_set_gc_id();
 
   YoungGCTracer::report_gc_end_impl(timestamp, time_partitions);
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -35,6 +35,7 @@
 #include "gc_implementation/g1/g1YCTypes.hpp"
 #endif
 #include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
 
 typedef uint GCId;
 
@@ -47,8 +48,6 @@
 class BoolObjectClosure;
 
 class SharedGCInfo VALUE_OBJ_CLASS_SPEC {
-  static const jlong UNSET_TIMESTAMP = -1;
-
  public:
   static const GCId UNSET_GCID = (GCId)-1;
 
@@ -56,23 +55,30 @@
   GCId _id;
   GCName _name;
   GCCause::Cause _cause;
-  jlong _start_timestamp;
-  jlong _end_timestamp;
-  jlong _sum_of_pauses;
-  jlong _longest_pause;
+  Ticks     _start_timestamp;
+  Ticks     _end_timestamp;
+  Tickspan  _sum_of_pauses;
+  Tickspan  _longest_pause;
 
  public:
-  SharedGCInfo(GCName name) : _id(UNSET_GCID), _name(name), _cause(GCCause::_last_gc_cause),
-      _start_timestamp(UNSET_TIMESTAMP), _end_timestamp(UNSET_TIMESTAMP), _sum_of_pauses(0), _longest_pause(0) {}
+  SharedGCInfo(GCName name) :
+    _id(UNSET_GCID),
+    _name(name),
+    _cause(GCCause::_last_gc_cause),
+    _start_timestamp(),
+    _end_timestamp(),
+    _sum_of_pauses(),
+    _longest_pause() {
+  }
 
   void set_id(GCId id) { _id = id; }
   GCId id() const { return _id; }
 
-  void set_start_timestamp(jlong timestamp) { _start_timestamp = timestamp; }
-  jlong start_timestamp() const { return _start_timestamp; }
+  void set_start_timestamp(const Ticks& timestamp) { _start_timestamp = timestamp; }
+  const Ticks start_timestamp() const { return _start_timestamp; }
 
-  void set_end_timestamp(jlong timestamp) { _end_timestamp = timestamp; }
-  jlong end_timestamp() const { return _end_timestamp; }
+  void set_end_timestamp(const Ticks& timestamp) { _end_timestamp = timestamp; }
+  const Ticks end_timestamp() const { return _end_timestamp; }
 
   void set_name(GCName name) { _name = name; }
   GCName name() const { return _name; }
@@ -80,11 +86,11 @@
   void set_cause(GCCause::Cause cause) { _cause = cause; }
   GCCause::Cause cause() const { return _cause; }
 
-  void set_sum_of_pauses(jlong duration) { _sum_of_pauses = duration; }
-  jlong sum_of_pauses() const { return _sum_of_pauses; }
+  void set_sum_of_pauses(const Tickspan& duration) { _sum_of_pauses = duration; }
+  const Tickspan sum_of_pauses() const { return _sum_of_pauses; }
 
-  void set_longest_pause(jlong duration) { _longest_pause = duration; }
-  jlong longest_pause() const { return _longest_pause; }
+  void set_longest_pause(const Tickspan& duration) { _longest_pause = duration; }
+  const Tickspan longest_pause() const { return _longest_pause; }
 };
 
 class ParallelOldGCInfo VALUE_OBJ_CLASS_SPEC {
@@ -116,8 +122,8 @@
   SharedGCInfo _shared_gc_info;
 
  public:
-  void report_gc_start(GCCause::Cause cause, jlong timestamp);
-  void report_gc_end(jlong timestamp, TimePartitions* time_partitions);
+  void report_gc_start(GCCause::Cause cause, const Ticks& timestamp);
+  void report_gc_end(const Ticks& timestamp, TimePartitions* time_partitions);
   void report_gc_heap_summary(GCWhen::Type when, const GCHeapSummary& heap_summary, const MetaspaceSummary& meta_space_summary) const;
   void report_gc_reference_stats(const ReferenceProcessorStats& rp) const;
   void report_object_count_after_gc(BoolObjectClosure* object_filter) NOT_SERVICES_RETURN;
@@ -125,8 +131,8 @@
 
  protected:
   GCTracer(GCName name) : _shared_gc_info(name) {}
-  virtual void report_gc_start_impl(GCCause::Cause cause, jlong timestamp);
-  virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+  virtual void report_gc_start_impl(GCCause::Cause cause, const Ticks& timestamp);
+  virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
 
  private:
   void send_garbage_collection_event() const;
@@ -143,7 +149,7 @@
 
  protected:
   YoungGCTracer(GCName name) : GCTracer(name), _tenuring_threshold(UNSET_TENURING_THRESHOLD) {}
-  virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+  virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
 
  public:
   void report_promotion_failed(const PromotionFailedInfo& pf_info);
@@ -157,7 +163,7 @@
 class OldGCTracer : public GCTracer {
  protected:
   OldGCTracer(GCName name) : GCTracer(name) {}
-  virtual void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+  virtual void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
 
  public:
   void report_concurrent_mode_failure();
@@ -175,7 +181,7 @@
   void report_dense_prefix(void* dense_prefix);
 
  protected:
-  void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+  void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
 
  private:
   void send_parallel_old_event() const;
@@ -209,7 +215,7 @@
   G1NewTracer() : YoungGCTracer(G1New) {}
 
   void report_yc_type(G1YCType type);
-  void report_gc_end_impl(jlong timestamp, TimePartitions* time_partitions);
+  void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
   void report_evacuation_info(EvacuationInfo* info);
   void report_evacuation_failed(EvacuationFailedInfo& ef_info);
 
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -55,12 +55,11 @@
 }
 
 void GCTracer::send_reference_stats_event(ReferenceType type, size_t count) const {
-  EventGCReferenceStatistics e(UNTIMED);
+  EventGCReferenceStatistics e;
   if (e.should_commit()) {
       e.set_gcId(_shared_gc_info.id());
       e.set_type((u1)type);
       e.set_count(count);
-      e.set_endtime(os::elapsed_counter());
       e.commit();
   }
 }
@@ -107,22 +106,20 @@
 }
 
 void YoungGCTracer::send_promotion_failed_event(const PromotionFailedInfo& pf_info) const {
-  EventPromotionFailed e(UNTIMED);
+  EventPromotionFailed e;
   if (e.should_commit()) {
     e.set_gcId(_shared_gc_info.id());
     e.set_data(to_trace_struct(pf_info));
     e.set_thread(pf_info.thread()->thread_id());
-    e.set_endtime(os::elapsed_counter());
     e.commit();
   }
 }
 
 // Common to CMS and G1
 void OldGCTracer::send_concurrent_mode_failure_event() {
-  EventConcurrentModeFailure e(UNTIMED);
+  EventConcurrentModeFailure e;
   if (e.should_commit()) {
     e.set_gcId(_shared_gc_info.id());
-    e.set_endtime(os::elapsed_counter());
     e.commit();
   }
 }
@@ -140,7 +137,7 @@
 }
 
 void G1NewTracer::send_evacuation_info_event(EvacuationInfo* info) {
-  EventEvacuationInfo e(UNTIMED);
+  EventEvacuationInfo e;
   if (e.should_commit()) {
     e.set_gcId(_shared_gc_info.id());
     e.set_cSetRegions(info->collectionset_regions());
@@ -151,17 +148,15 @@
     e.set_allocRegionsUsedAfter(info->alloc_regions_used_before() + info->bytes_copied());
     e.set_bytesCopied(info->bytes_copied());
     e.set_regionsFreed(info->regions_freed());
-    e.set_endtime(os::elapsed_counter());
     e.commit();
   }
 }
 
 void G1NewTracer::send_evacuation_failed_event(const EvacuationFailedInfo& ef_info) const {
-  EventEvacuationFailed e(UNTIMED);
+  EventEvacuationFailed e;
   if (e.should_commit()) {
     e.set_gcId(_shared_gc_info.id());
     e.set_data(to_trace_struct(ef_info));
-    e.set_endtime(os::elapsed_counter());
     e.commit();
   }
 }
@@ -195,13 +190,12 @@
   void visit(const GCHeapSummary* heap_summary) const {
     const VirtualSpaceSummary& heap_space = heap_summary->heap();
 
-    EventGCHeapSummary e(UNTIMED);
+    EventGCHeapSummary e;
     if (e.should_commit()) {
       e.set_gcId(_id);
       e.set_when((u1)_when);
       e.set_heapSpace(to_trace_struct(heap_space));
       e.set_heapUsed(heap_summary->used());
-      e.set_endtime(os::elapsed_counter());
       e.commit();
     }
   }
@@ -216,7 +210,7 @@
     const SpaceSummary& from_space = ps_heap_summary->from();
     const SpaceSummary& to_space = ps_heap_summary->to();
 
-    EventPSHeapSummary e(UNTIMED);
+    EventPSHeapSummary e;
     if (e.should_commit()) {
       e.set_gcId(_id);
       e.set_when((u1)_when);
@@ -227,7 +221,6 @@
       e.set_edenSpace(to_trace_struct(ps_heap_summary->eden()));
       e.set_fromSpace(to_trace_struct(ps_heap_summary->from()));
       e.set_toSpace(to_trace_struct(ps_heap_summary->to()));
-      e.set_endtime(os::elapsed_counter());
       e.commit();
     }
   }
@@ -249,14 +242,13 @@
 }
 
 void GCTracer::send_meta_space_summary_event(GCWhen::Type when, const MetaspaceSummary& meta_space_summary) const {
-  EventMetaspaceSummary e(UNTIMED);
+  EventMetaspaceSummary e;
   if (e.should_commit()) {
     e.set_gcId(_shared_gc_info.id());
     e.set_when((u1) when);
     e.set_metaspace(to_trace_struct(meta_space_summary.meta_space()));
     e.set_dataSpace(to_trace_struct(meta_space_summary.data_space()));
     e.set_classSpace(to_trace_struct(meta_space_summary.class_space()));
-    e.set_endtime(os::elapsed_counter());
     e.commit();
   }
 }
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -31,12 +31,13 @@
 #include "runtime/thread.inline.hpp"
 #include "runtime/timer.hpp"
 #include "utilities/ostream.hpp"
+#include "utilities/ticks.inline.hpp"
 
 
 GCTraceTime::GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer) :
-    _title(title), _doit(doit), _print_cr(print_cr), _timer(timer) {
+    _title(title), _doit(doit), _print_cr(print_cr), _timer(timer), _start_counter() {
   if (_doit || _timer != NULL) {
-    _start_counter = os::elapsed_counter();
+    _start_counter.stamp();
   }
 
   if (_timer != NULL) {
@@ -57,10 +58,10 @@
 }
 
 GCTraceTime::~GCTraceTime() {
-  jlong stop_counter = 0;
+  Ticks stop_counter;
 
   if (_doit || _timer != NULL) {
-    stop_counter = os::elapsed_counter();
+    stop_counter.stamp();
   }
 
   if (_timer != NULL) {
@@ -68,11 +69,12 @@
   }
 
   if (_doit) {
-    double seconds = TimeHelper::counter_to_seconds(stop_counter - _start_counter);
+    const Tickspan duration = stop_counter - _start_counter;
+    double duration_in_seconds = TicksToTimeHelper::seconds(duration);
     if (_print_cr) {
-      gclog_or_tty->print_cr(", %3.7f secs]", seconds);
+      gclog_or_tty->print_cr(", %3.7f secs]", duration_in_seconds);
     } else {
-      gclog_or_tty->print(", %3.7f secs]", seconds);
+      gclog_or_tty->print(", %3.7f secs]", duration_in_seconds);
     }
     gclog_or_tty->flush();
   }
--- a/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -26,6 +26,7 @@
 #define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP
 
 #include "prims/jni_md.h"
+#include "utilities/ticks.hpp"
 
 class GCTimer;
 
@@ -34,7 +35,7 @@
   bool _doit;
   bool _print_cr;
   GCTimer* _timer;
-  jlong _start_counter;
+  Ticks _start_counter;
 
  public:
   GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer);
--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -28,10 +28,11 @@
 #include "memory/heapInspection.hpp"
 #include "trace/tracing.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/ticks.hpp"
 
 #if INCLUDE_SERVICES
 
-void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp) {
+void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp) {
 #if INCLUDE_TRACE
   assert(Tracing::is_event_enabled(EventObjectCountAfterGC::eventId),
          "Only call this method if the event is enabled");
--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -32,10 +32,11 @@
 #if INCLUDE_SERVICES
 
 class KlassInfoEntry;
+class Ticks;
 
 class ObjectCountEventSender : public AllStatic {
  public:
-  static void send(const KlassInfoEntry* entry, GCId gc_id, jlong timestamp);
+  static void send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp);
   static bool should_send_event();
 };
 
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -915,6 +915,25 @@
     return;
   }
 
+  // check if invokespecial's interface method reference is in an indirect superinterface
+  if (!current_klass.is_null() && resolved_klass->is_interface()) {
+    Klass *klass_to_check = !InstanceKlass::cast(current_klass())->is_anonymous() ?
+                                  current_klass() :
+                                  InstanceKlass::cast(current_klass())->host_klass();
+
+    if (!InstanceKlass::cast(klass_to_check)->is_same_or_direct_interface(resolved_klass())) {
+      ResourceMark rm(THREAD);
+      char buf[200];
+      jio_snprintf(buf, sizeof(buf),
+                   "Interface method reference: %s, is in an indirect superinterface of %s",
+                   Method::name_and_sig_as_C_string(resolved_klass(),
+                                                         resolved_method->name(),
+                                                         resolved_method->signature()),
+                   current_klass->external_name());
+      THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(), buf);
+    }
+  }
+
   // check if not static
   if (resolved_method->is_static()) {
     ResourceMark rm(THREAD);
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -562,7 +562,7 @@
 
   GenCollectedHeap* gch = GenCollectedHeap::heap();
 
-  _gc_timer->register_gc_start(os::elapsed_counter());
+  _gc_timer->register_gc_start();
   DefNewTracer gc_tracer;
   gc_tracer.report_gc_start(gch->gc_cause(), _gc_timer->gc_start());
 
@@ -709,7 +709,7 @@
   gch->trace_heap_after_gc(&gc_tracer);
   gc_tracer.report_tenuring_threshold(tenuring_threshold());
 
-  _gc_timer->register_gc_end(os::elapsed_counter());
+  _gc_timer->register_gc_end();
 
   gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
 }
--- a/hotspot/src/share/vm/memory/generation.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/memory/generation.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -635,16 +635,16 @@
     x(ref_processor(), gch->reserved_region());
 
   STWGCTimer* gc_timer = GenMarkSweep::gc_timer();
-  gc_timer->register_gc_start(os::elapsed_counter());
+  gc_timer->register_gc_start();
 
   SerialOldTracer* gc_tracer = GenMarkSweep::gc_tracer();
   gc_tracer->report_gc_start(gch->gc_cause(), gc_timer->gc_start());
 
   GenMarkSweep::invoke_at_safepoint(_level, ref_processor(), clear_all_soft_refs);
 
-  gc_timer->register_gc_end(os::elapsed_counter());
+  gc_timer->register_gc_end();
 
-  gc_tracer->report_gc_end(os::elapsed_counter(), gc_timer->time_partitions());
+  gc_tracer->report_gc_end(gc_timer->gc_end(), gc_timer->time_partitions());
 
   SpecializationStats::print();
 }
--- a/hotspot/src/share/vm/memory/universe.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/memory/universe.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -120,6 +120,7 @@
 oop Universe::_arithmetic_exception_instance          = NULL;
 oop Universe::_virtual_machine_error_instance         = NULL;
 oop Universe::_vm_exception                           = NULL;
+Method* Universe::_throw_illegal_access_error         = NULL;
 Array<int>* Universe::_the_empty_int_array            = NULL;
 Array<u2>* Universe::_the_empty_short_array           = NULL;
 Array<Klass*>* Universe::_the_empty_klass_array     = NULL;
@@ -1096,6 +1097,18 @@
   Universe::_finalizer_register_cache->init(
     SystemDictionary::Finalizer_klass(), m);
 
+  InstanceKlass::cast(SystemDictionary::misc_Unsafe_klass())->link_class(CHECK_false);
+  m = InstanceKlass::cast(SystemDictionary::misc_Unsafe_klass())->find_method(
+                                  vmSymbols::throwIllegalAccessError_name(),
+                                  vmSymbols::void_method_signature());
+  if (m != NULL && !m->is_static()) {
+    // Note null is okay; this method is used in itables, and if it is null,
+    // then AbstractMethodError is thrown instead.
+    tty->print_cr("Unable to link/verify Unsafe.throwIllegalAccessError method");
+    return false; // initialization failed (cannot throw exception yet)
+  }
+  Universe::_throw_illegal_access_error = m;
+
   // Setup method for registering loaded classes in class loader vector
   InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
   m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
--- a/hotspot/src/share/vm/memory/universe.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/memory/universe.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -149,6 +149,8 @@
   static LatestMethodCache* _loader_addClass_cache;    // method for registering loaded classes in class loader vector
   static LatestMethodCache* _pd_implies_cache;         // method for checking protection domain attributes
 
+  static Method* _throw_illegal_access_error;
+
   // preallocated error objects (no backtrace)
   static oop          _out_of_memory_error_java_heap;
   static oop          _out_of_memory_error_metaspace;
@@ -305,6 +307,7 @@
   static oop          arithmetic_exception_instance() { return _arithmetic_exception_instance; }
   static oop          virtual_machine_error_instance() { return _virtual_machine_error_instance; }
   static oop          vm_exception()                  { return _vm_exception; }
+  static Method*      throw_illegal_access_error()    { return _throw_illegal_access_error; }
 
   static Array<int>*       the_empty_int_array()    { return _the_empty_int_array; }
   static Array<u2>*        the_empty_short_array()  { return _the_empty_short_array; }
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -1051,6 +1051,18 @@
   return false;
 }
 
+bool InstanceKlass::is_same_or_direct_interface(Klass *k) const {
+  // Verify direct super interface
+  if (this == k) return true;
+  assert(k->is_interface(), "should be an interface class");
+  for (int i = 0; i < local_interfaces()->length(); i++) {
+    if (local_interfaces()->at(i) == k) {
+      return true;
+    }
+  }
+  return false;
+}
+
 objArrayOop InstanceKlass::allocate_objArray(int n, int length, TRAPS) {
   if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
   if (length > arrayOopDesc::max_array_length(T_OBJECT)) {
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -777,6 +777,7 @@
 
   // subclass/subinterface checks
   bool implements_interface(Klass* k) const;
+  bool is_same_or_direct_interface(Klass* k) const;
 
   // Access to the implementor of an interface.
   Klass* implementor() const
--- a/hotspot/src/share/vm/oops/klassVtable.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -1076,7 +1076,12 @@
       LinkResolver::lookup_instance_method_in_klasses(target, _klass, m->name(), m->signature(), CHECK);
     }
     if (target == NULL || !target->is_public() || target->is_abstract()) {
-      // Entry do not resolve. Leave it empty
+      // Entry does not resolve. Leave it empty for AbstractMethodError.
+        if (!(target == NULL) && !target->is_public()) {
+          // Stuff an IllegalAccessError throwing method in there instead.
+          itableOffsetEntry::method_entry(_klass(), method_table_offset)[m->itable_index()].
+              initialize(Universe::throw_illegal_access_error());
+        }
     } else {
       // Entry did resolve, check loader constraints before initializing
       // if checkconstraints requested
--- a/hotspot/src/share/vm/opto/compile.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/opto/compile.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -42,6 +42,7 @@
 #include "runtime/deoptimization.hpp"
 #include "runtime/vmThread.hpp"
 #include "trace/tracing.hpp"
+#include "utilities/ticks.hpp"
 
 class Block;
 class Bundle;
@@ -597,20 +598,19 @@
   bool              has_method_handle_invokes() const { return _has_method_handle_invokes;     }
   void          set_has_method_handle_invokes(bool z) {        _has_method_handle_invokes = z; }
 
-  jlong _latest_stage_start_counter;
+  Ticks _latest_stage_start_counter;
 
   void begin_method() {
 #ifndef PRODUCT
     if (_printer) _printer->begin_method(this);
 #endif
-    C->_latest_stage_start_counter = os::elapsed_counter();
+    C->_latest_stage_start_counter.stamp();
   }
 
   void print_method(CompilerPhaseType cpt, int level = 1) {
-    EventCompilerPhase event(UNTIMED);
+    EventCompilerPhase event;
     if (event.should_commit()) {
       event.set_starttime(C->_latest_stage_start_counter);
-      event.set_endtime(os::elapsed_counter());
       event.set_phase((u1) cpt);
       event.set_compileID(C->_compile_id);
       event.set_phaseLevel(level);
@@ -621,14 +621,13 @@
 #ifndef PRODUCT
     if (_printer) _printer->print_method(this, CompilerPhaseTypeHelper::to_string(cpt), level);
 #endif
-    C->_latest_stage_start_counter = os::elapsed_counter();
+    C->_latest_stage_start_counter.stamp();
   }
 
   void end_method(int level = 1) {
-    EventCompilerPhase event(UNTIMED);
+    EventCompilerPhase event;
     if (event.should_commit()) {
       event.set_starttime(C->_latest_stage_start_counter);
-      event.set_endtime(os::elapsed_counter());
       event.set_phase((u1) PHASE_END);
       event.set_compileID(C->_compile_id);
       event.set_phaseLevel(level);
--- a/hotspot/src/share/vm/runtime/sweeper.cpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/runtime/sweeper.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -38,6 +38,7 @@
 #include "runtime/vm_operations.hpp"
 #include "trace/tracing.hpp"
 #include "utilities/events.hpp"
+#include "utilities/ticks.inline.hpp"
 #include "utilities/xmlstream.hpp"
 
 #ifdef ASSERT
@@ -144,10 +145,10 @@
                                                                //   3) zombie      -> marked_for_reclamation
 
 int   NMethodSweeper::_total_nof_methods_reclaimed     = 0;    // Accumulated nof methods flushed
-jlong NMethodSweeper::_total_time_sweeping             = 0;    // Accumulated time sweeping
-jlong NMethodSweeper::_total_time_this_sweep           = 0;    // Total time this sweep
-jlong NMethodSweeper::_peak_sweep_time                 = 0;    // Peak time for a full sweep
-jlong NMethodSweeper::_peak_sweep_fraction_time        = 0;    // Peak time sweeping one fraction
+Tickspan NMethodSweeper::_total_time_sweeping;                 // Accumulated time sweeping
+Tickspan NMethodSweeper::_total_time_this_sweep;               // Total time this sweep
+Tickspan NMethodSweeper::_peak_sweep_time;                     // Peak time for a full sweep
+Tickspan NMethodSweeper::_peak_sweep_fraction_time;            // Peak time sweeping one fraction
 int   NMethodSweeper::_hotness_counter_reset_val       = 0;
 
 
@@ -209,7 +210,7 @@
     _sweep_fractions_left = NmethodSweepFraction;
     _current = CodeCache::first_nmethod();
     _traversals += 1;
-    _total_time_this_sweep = 0;
+    _total_time_this_sweep = Tickspan();
 
     if (PrintMethodFlushing) {
       tty->print_cr("### Sweep: stack traversal %d", _traversals);
@@ -303,7 +304,7 @@
 }
 
 void NMethodSweeper::sweep_code_cache() {
-  jlong sweep_start_counter = os::elapsed_counter();
+  Ticks sweep_start_counter = Ticks::now();
 
   _flushed_count                = 0;
   _zombified_count              = 0;
@@ -367,8 +368,8 @@
 
   assert(_sweep_fractions_left > 1 || _current == NULL, "must have scanned the whole cache");
 
-  jlong sweep_end_counter = os::elapsed_counter();
-  jlong sweep_time = sweep_end_counter - sweep_start_counter;
+  const Ticks sweep_end_counter = Ticks::now();
+  const Tickspan sweep_time = sweep_end_counter - sweep_start_counter;
   _total_time_sweeping  += sweep_time;
   _total_time_this_sweep += sweep_time;
   _peak_sweep_fraction_time = MAX2(sweep_time, _peak_sweep_fraction_time);
@@ -389,7 +390,8 @@
 
 #ifdef ASSERT
   if(PrintMethodFlushing) {
-    tty->print_cr("### sweeper:      sweep time(%d): " INT64_FORMAT, _sweep_fractions_left, (jlong)sweep_time);
+    tty->print_cr("### sweeper:      sweep time(%d): "
+      INT64_FORMAT, _sweep_fractions_left, (jlong)sweep_time.value());
   }
 #endif
 
--- a/hotspot/src/share/vm/runtime/sweeper.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/runtime/sweeper.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -25,6 +25,7 @@
 #ifndef SHARE_VM_RUNTIME_SWEEPER_HPP
 #define SHARE_VM_RUNTIME_SWEEPER_HPP
 
+#include "utilities/ticks.hpp"
 // An NmethodSweeper is an incremental cleaner for:
 //    - cleanup inline caches
 //    - reclamation of nmethods
@@ -71,10 +72,10 @@
                                                   //   3) zombie      -> marked_for_reclamation
   // Stat counters
   static int       _total_nof_methods_reclaimed;  // Accumulated nof methods flushed
-  static jlong     _total_time_sweeping;          // Accumulated time sweeping
-  static jlong     _total_time_this_sweep;        // Total time this sweep
-  static jlong     _peak_sweep_time;              // Peak time for a full sweep
-  static jlong     _peak_sweep_fraction_time;     // Peak time sweeping one fraction
+  static Tickspan  _total_time_sweeping;          // Accumulated time sweeping
+  static Tickspan  _total_time_this_sweep;        // Total time this sweep
+  static Tickspan  _peak_sweep_time;              // Peak time for a full sweep
+  static Tickspan  _peak_sweep_fraction_time;     // Peak time sweeping one fraction
 
   static int  process_nmethod(nmethod *nm);
   static void release_nmethod(nmethod* nm);
@@ -87,9 +88,9 @@
  public:
   static long traversal_count()              { return _traversals; }
   static int  total_nof_methods_reclaimed()  { return _total_nof_methods_reclaimed; }
-  static jlong total_time_sweeping()         { return _total_time_sweeping; }
-  static jlong peak_sweep_time()             { return _peak_sweep_time; }
-  static jlong peak_sweep_fraction_time()    { return _peak_sweep_fraction_time; }
+  static const Tickspan total_time_sweeping()      { return _total_time_sweeping; }
+  static const Tickspan peak_sweep_time()          { return _peak_sweep_time; }
+  static const Tickspan peak_sweep_fraction_time() { return _peak_sweep_fraction_time; }
   static void log_sweep(const char* msg, const char* format = NULL, ...);
 
 
--- a/hotspot/src/share/vm/trace/noTraceBackend.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/noTraceBackend.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -25,9 +25,7 @@
 #define SHARE_VM_TRACE_NOTRACEBACKEND_HPP
 
 #include "prims/jni.h"
-
-typedef jlong TracingTime;
-typedef jlong RelativeTracingTime;
+#include "trace/traceTime.hpp"
 
 class NoTraceBackend {
 public:
@@ -44,5 +42,3 @@
 typedef NoTraceBackend Tracing;
 
 #endif
-
-
--- a/hotspot/src/share/vm/trace/trace.xml	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/trace.xml	Wed Jul 05 19:24:14 2017 +0200
@@ -176,8 +176,8 @@
       <value type="UINT" field="gcId"  label="GC ID" relation="GC_ID" />
       <value type="GCNAME" field="name" label="Name" description="The name of the Garbage Collector" />
       <value type="GCCAUSE" field="cause" label="Cause" description="The reason for triggering this Garbage Collection" />
-      <value type="RELATIVE_TICKS" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
-      <value type="RELATIVE_TICKS" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
+      <value type="TICKSPAN" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
+      <value type="TICKSPAN" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
     </event>
 
     <event id="GCParallelOld" path="vm/gc/collector/parold_garbage_collection" label="Parallel Old Garbage Collection"
--- a/hotspot/src/share/vm/trace/traceBackend.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/traceBackend.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -47,10 +47,6 @@
     return os::elapsed_counter();
   }
 
-  static TracingTime time_adjustment(jlong time) {
-    return time;
-  }
-
   static void on_unloading_classes(void) {
   }
 };
--- a/hotspot/src/share/vm/trace/traceEvent.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/traceEvent.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -25,26 +25,23 @@
 #ifndef SHARE_VM_TRACE_TRACEEVENT_HPP
 #define SHARE_VM_TRACE_TRACEEVENT_HPP
 
+#include "utilities/macros.hpp"
+
 enum EventStartTime {
   UNTIMED,
   TIMED
 };
 
-#include "utilities/macros.hpp"
-
 #if INCLUDE_TRACE
 
 #include "trace/traceBackend.hpp"
 #include "trace/tracing.hpp"
 #include "tracefiles/traceEventIds.hpp"
 #include "tracefiles/traceTypes.hpp"
+#include "utilities/ticks.hpp"
 
 template<typename T>
 class TraceEvent : public StackObj {
- protected:
-  jlong _startTime;
-  jlong _endTime;
-
  private:
   bool _started;
 #ifdef ASSERT
@@ -54,6 +51,18 @@
   bool _ignore_check;
 #endif
 
+ protected:
+  jlong _startTime;
+  jlong _endTime;
+
+  void set_starttime(const TracingTime& time) {
+    _startTime = time;
+  }
+
+  void set_endtime(const TracingTime& time) {
+    _endTime = time;
+  }
+
  public:
   TraceEvent(EventStartTime timing=TIMED) :
     _startTime(0),
@@ -100,12 +109,12 @@
     set_commited();
   }
 
-  void set_starttime(jlong time) {
-    _startTime = time;
+  void set_starttime(const Ticks& time) {
+    _startTime = time.value();
   }
 
-  void set_endtime(jlong time) {
-    _endTime = time;
+  void set_endtime(const Ticks& time) {
+    _endTime = time.value();
   }
 
   TraceEventId id() const {
--- a/hotspot/src/share/vm/trace/traceEventClasses.xsl	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/traceEventClasses.xsl	Wed Jul 05 19:24:14 2017 +0200
@@ -40,6 +40,7 @@
 #include "tracefiles/traceTypes.hpp"
 #include "trace/traceEvent.hpp"
 #include "utilities/macros.hpp"
+#include "utilities/ticks.hpp"
 
 #if INCLUDE_TRACE
 
@@ -55,8 +56,8 @@
 class TraceEvent {
 public:
   TraceEvent() {}
-  void set_starttime(jlong time) const {}
-  void set_endtime(jlong time) const {}
+  void set_starttime(const Ticks&amp; time) {}
+  void set_endtime(const Ticks&amp; time) {}
   bool should_commit() const { return false; }
   void commit() const {}
 };
@@ -170,23 +171,23 @@
   </xsl:if>
 </xsl:template>
 
-
 <xsl:template match="value[@type='TICKS']" mode="write-setters">
 #if INCLUDE_TRACE
-  <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
+<xsl:value-of select="concat('  void set_', @field, '(const Ticks&amp; time) { _', @field, ' = time; }')"/>
 #else
-  <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
+<xsl:value-of select="concat('  void set_', @field, '(const Ticks&amp; ignore) {}')"/>
 #endif
 </xsl:template>
 
-<xsl:template match="value[@type='RELATIVE_TICKS']" mode="write-setters">
+<xsl:template match="value[@type='TICKSPAN']" mode="write-setters">
 #if INCLUDE_TRACE
-  <xsl:value-of select="concat('void set_', @field, '(jlong time) { _', @field, ' = time; }')"/>
+  <xsl:value-of select="concat('  void set_', @field, '(const Tickspan&amp; time) { _', @field, ' = time; }')"/>
 #else
-  <xsl:value-of select="concat('void set_', @field, '(jlong ignore) {}')"/>
+  <xsl:value-of select="concat('  void set_', @field, '(const Tickspan&amp; ignore) {}')"/>
 #endif
 </xsl:template>
 
+
 <xsl:template match="value" mode="write-fields">
   <xsl:variable name="type" select="@type"/>
   <xsl:variable name="wt" select="//primary_type[@symbol=$type]/@type"/>
@@ -226,7 +227,17 @@
 <xsl:template match="value" mode="write-data">
   <xsl:variable name="type" select="@type"/>
   <xsl:variable name="wt" select="//primary_type[@symbol=$type]/@writetype"/>
-  <xsl:value-of select="concat('    ts.print_val(&quot;', @label, '&quot;, _', @field, ');')"/>
+  <xsl:choose>
+    <xsl:when test="@type='TICKSPAN'">
+      <xsl:value-of select="concat('    ts.print_val(&quot;', @label, '&quot;, _', @field, '.value());')"/>
+    </xsl:when>
+    <xsl:when test="@type='TICKS'">
+      <xsl:value-of select="concat('    ts.print_val(&quot;', @label, '&quot;, _', @field, '.value());')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="concat('    ts.print_val(&quot;', @label, '&quot;, _', @field, ');')"/>
+    </xsl:otherwise>
+  </xsl:choose>
   <xsl:if test="position() != last()">
     <xsl:text>
     ts.print(", ");
--- a/hotspot/src/share/vm/trace/traceTime.hpp	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/traceTime.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -28,6 +28,5 @@
 #include "prims/jni.h"
 
 typedef jlong TracingTime;
-typedef jlong RelativeTracingTime;
 
-#endif
+#endif // SHARE_VM_TRACE_TRACETIME_HPP
--- a/hotspot/src/share/vm/trace/traceTypes.xsl	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/traceTypes.xsl	Wed Jul 05 19:24:14 2017 +0200
@@ -32,9 +32,11 @@
 #ifndef TRACEFILES_JFRTYPES_HPP
 #define TRACEFILES_JFRTYPES_HPP
 
+#include "oops/symbol.hpp"
 #include "trace/traceDataTypes.hpp"
 #include "utilities/globalDefinitions.hpp"
-#include "oops/symbol.hpp"
+#include "utilities/ticks.hpp"
+
 
 enum JVMContentType {
   _not_a_content_type = (JVM_CONTENT_TYPES_START - 1),
--- a/hotspot/src/share/vm/trace/tracetypes.xml	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/src/share/vm/trace/tracetypes.xml	Wed Jul 05 19:24:14 2017 +0200
@@ -249,13 +249,13 @@
     <primary_type symbol="NANOS" datatype="LONG" contenttype="NANOS"
                   type="s8" sizeop="sizeof(s8)"/>
 
-    <!-- 64-bit signed integer, SEMANTIC value ABSOLUTE TICKS -->
+    <!-- 64-bit signed integer, SEMANTIC value TICKS -->
     <primary_type symbol="TICKS" datatype="LONG" contenttype="TICKS"
-                  type="s8" sizeop="sizeof(s8)"/>
+                  type="Ticks" sizeop="sizeof(s8)"/>
 
-    <!-- 64-bit signed integer, SEMANTIC value RELATIVE TICKS -->
-    <primary_type symbol="RELATIVE_TICKS" datatype="LONG" contenttype="TICKS"
-                  type="s8" sizeop="sizeof(s8)"/>
+    <!-- 64-bit signed integer, SEMANTIC value TICKS duration -->
+    <primary_type symbol="TICKSPAN" datatype="LONG" contenttype="TICKS"
+                  type="Tickspan" sizeop="sizeof(s8)"/>
 
     <!-- 64-bit unsigned integer, SEMANTIC value ADDRESS (mem loc) -->
     <primary_type symbol="ADDRESS" datatype="U8" contenttype="ADDRESS"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/utilities/ticks.cpp	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/os.hpp"
+#include "utilities/ticks.inline.hpp"
+
+#ifdef ASSERT
+ const jlong Ticks::invalid_time_stamp = -2; // 0xFFFF FFFF`FFFF FFFE
+#endif
+
+void Ticks::stamp() {
+  _stamp_ticks = os::elapsed_counter();
+}
+
+const Ticks Ticks::now() {
+  Ticks t;
+  t.stamp();
+  return t;
+}
+
+Tickspan::Tickspan(const Ticks& end, const Ticks& start) {
+  assert(end.value() != Ticks::invalid_time_stamp, "end is unstamped!");
+  assert(start.value() != Ticks::invalid_time_stamp, "start is unstamped!");
+
+  assert(end >= start, "negative time!");
+
+  _span_ticks = end.value() - start.value();
+}
+
+template <typename ReturnType>
+static ReturnType time_conversion(const Tickspan& span, TicksToTimeHelper::Unit unit) {
+  assert(TicksToTimeHelper::SECONDS == unit ||
+         TicksToTimeHelper::MILLISECONDS == unit, "invalid unit!");
+
+  ReturnType frequency_per_unit = (ReturnType)os::elapsed_frequency() / (ReturnType)unit;
+
+  return (ReturnType) ((ReturnType)span.value() / frequency_per_unit);
+}
+
+double TicksToTimeHelper::seconds(const Tickspan& span) {
+  return time_conversion<double>(span, SECONDS);
+}
+
+jlong TicksToTimeHelper::milliseconds(const Tickspan& span) {
+  return time_conversion<jlong>(span, MILLISECONDS);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/utilities/ticks.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_UTILITIES_TICKS_HPP
+#define SHARE_VM_UTILITIES_TICKS_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+class Ticks;
+
+class Tickspan VALUE_OBJ_CLASS_SPEC {
+  friend class Ticks;
+  friend Tickspan operator-(const Ticks& end, const Ticks& start);
+
+ private:
+  jlong _span_ticks;
+
+  Tickspan(const Ticks& end, const Ticks& start);
+
+ public:
+  Tickspan() : _span_ticks(0) {}
+
+  Tickspan& operator+=(const Tickspan& rhs) {
+    _span_ticks += rhs._span_ticks;
+    return *this;
+  }
+
+  jlong value() const {
+    return _span_ticks;
+  }
+
+};
+
+class Ticks VALUE_OBJ_CLASS_SPEC {
+ private:
+  jlong _stamp_ticks;
+
+ public:
+  Ticks() : _stamp_ticks(0) {
+    assert((_stamp_ticks = invalid_time_stamp) == invalid_time_stamp,
+      "initial unstamped time value assignment");
+  }
+
+  Ticks& operator+=(const Tickspan& span) {
+    _stamp_ticks += span.value();
+    return *this;
+  }
+
+  Ticks& operator-=(const Tickspan& span) {
+    _stamp_ticks -= span.value();
+    return *this;
+  }
+
+  void stamp();
+
+  jlong value() const {
+    return _stamp_ticks;
+  }
+
+  static const Ticks now();
+
+#ifdef ASSERT
+  static const jlong invalid_time_stamp;
+#endif
+
+#ifndef PRODUCT
+  // only for internal use by GC VM tests
+  friend class TimePartitionPhasesIteratorTest;
+  friend class GCTimerTest;
+
+ private:
+  // implicit type conversion
+  Ticks(int ticks) : _stamp_ticks(ticks) {}
+
+#endif // !PRODUCT
+
+};
+
+class TicksToTimeHelper : public AllStatic {
+ public:
+  enum Unit {
+    SECONDS = 1,
+    MILLISECONDS = 1000
+  };
+  static double seconds(const Tickspan& span);
+  static jlong milliseconds(const Tickspan& span);
+};
+
+#endif // SHARE_VM_UTILITIES_TICKS_HPP
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/utilities/ticks.inline.hpp	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_UTILITIES_TICKS_INLINE_HPP
+#define SHARE_VM_UTILITIES_TICKS_INLINE_HPP
+
+#include "utilities/ticks.hpp"
+
+inline Tickspan operator+(Tickspan lhs, const Tickspan& rhs) {
+  lhs += rhs;
+  return lhs;
+}
+
+inline bool operator==(const Tickspan& lhs, const Tickspan& rhs) {
+  return lhs.value() == rhs.value();
+}
+
+inline bool operator!=(const Tickspan& lhs, const Tickspan& rhs) {
+  return !operator==(lhs,rhs);
+}
+
+inline bool operator<(const Tickspan& lhs, const Tickspan& rhs) {
+  return lhs.value() < rhs.value();
+}
+
+inline bool operator>(const Tickspan& lhs, const Tickspan& rhs) {
+  return operator<(rhs,lhs);
+}
+
+inline bool operator<=(const Tickspan& lhs, const Tickspan& rhs) {
+  return !operator>(lhs,rhs);
+}
+
+inline bool operator>=(const Tickspan& lhs, const Tickspan& rhs) {
+  return !operator<(lhs,rhs);
+}
+
+inline Ticks operator+(Ticks lhs, const Tickspan& span) {
+  lhs += span;
+  return lhs;
+}
+
+inline Ticks operator-(Ticks lhs, const Tickspan& span) {
+  lhs -= span;
+  return lhs;
+}
+
+inline Tickspan operator-(const Ticks& end, const Ticks& start) {
+  return Tickspan(end, start);
+}
+
+inline bool operator==(const Ticks& lhs, const Ticks& rhs) {
+  return lhs.value() == rhs.value();
+}
+
+inline bool operator!=(const Ticks& lhs, const Ticks& rhs) {
+  return !operator==(lhs,rhs);
+}
+
+inline bool operator<(const Ticks& lhs, const Ticks& rhs) {
+  return lhs.value() < rhs.value();
+}
+
+inline bool operator>(const Ticks& lhs, const Ticks& rhs) {
+  return operator<(rhs,lhs);
+}
+
+inline bool operator<=(const Ticks& lhs, const Ticks& rhs) {
+  return !operator>(lhs,rhs);
+}
+
+inline bool operator>=(const Ticks& lhs, const Ticks& rhs) {
+  return !operator<(lhs,rhs);
+}
+
+#endif // SHARE_VM_UTILITIES_TICKS_INLINE_HPP
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/ByteClassLoader.java	Wed Jul 05 19:24:14 2017 +0200
@@ -1,3 +1,12 @@
+import java.io.BufferedOutputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
 /*
  * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -23,12 +32,63 @@
  */
 
 /**
- * A minimal classloader for loading bytecodes that could not result from
- * properly compiled Java.
+ * A ByteClassLoader is used to define classes from collections of bytes, as
+ * well as loading classes in the usual way. It includes options to write the
+ * classes to files in a jar, or to read the classes from jars in a later or
+ * debugging run.
+ *
+ * If Boolean property byteclassloader.verbose is true, be chatty about jar
+ * file operations.
  *
- * @author dr2chase
  */
-public class ByteClassLoader extends ClassLoader {
+public class ByteClassLoader extends URLClassLoader {
+
+    final static boolean verbose
+            = Boolean.getBoolean("byteclassloader.verbose");
+
+    final boolean read;
+    final JarOutputStream jos;
+    final String jar_name;
+
+    /**
+     * Make a new ByteClassLoader.
+     *
+     * @param jar_name  Basename of jar file to be read/written by this classloader.
+     * @param read      If true, read classes from jar file instead of from parameter.
+     * @param write     If true, write classes to jar files for offline study/use.
+     *
+     * @throws FileNotFoundException
+     * @throws IOException
+     */
+    public ByteClassLoader(String jar_name, boolean read, boolean write)
+            throws FileNotFoundException, IOException {
+        super(read
+                ? new URL[]{new URL("file:" + jar_name + ".jar")}
+                : new URL[0]);
+        this.read = read;
+        this.jar_name = jar_name;
+        this.jos = write
+                ? new JarOutputStream(
+                new BufferedOutputStream(
+                new FileOutputStream(jar_name + ".jar"))) : null;
+        if (read && write) {
+            throw new Error("At most one of read and write may be true.");
+        }
+    }
+
+    private static void writeJarredFile(JarOutputStream jos, String file, String suffix, byte[] bytes) {
+        String fileName = file.replace(".", "/") + "." + suffix;
+        JarEntry ze = new JarEntry(fileName);
+        try {
+            ze.setSize(bytes.length);
+            jos.putNextEntry(ze);
+            jos.write(bytes);
+            jos.closeEntry();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * (pre)load class name using classData for the definition.
      *
@@ -36,9 +96,36 @@
      * @param classData
      * @return
      */
-    public Class<?> loadBytes(String name, byte[] classData) {
-         Class<?> clazz = defineClass(name, classData, 0, classData.length);
-                     resolveClass(clazz);
-         return clazz;
+    public Class<?> loadBytes(String name, byte[] classData) throws ClassNotFoundException {
+        if (jos != null) {
+            if (verbose) {
+                System.out.println("ByteClassLoader: writing " + name);
+            }
+            writeJarredFile(jos, name, "class", classData);
+        }
+
+        Class<?> clazz = null;
+        if (read) {
+            if (verbose) {
+                System.out.println("ByteClassLoader: reading " + name + " from " + jar_name);
+            }
+            clazz = loadClass(name);
+        } else {
+            clazz = defineClass(name, classData, 0, classData.length);
+            resolveClass(clazz);
+        }
+        return clazz;
+    }
+
+    public void close() {
+        if (jos != null) {
+            try {
+                if (verbose) {
+                    System.out.println("ByteClassLoader: closing " + jar_name);
+                }
+                jos.close();
+            } catch (IOException ex) {
+            }
+        }
     }
 }
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/C.java	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-/**
- * Test class -- implements I, which provides default for m, but this class
- * declares it abstract which (should) hide the interface default, and throw
- * an abstract method error if it is called (calling it requires bytecode hacking
- * or inconsistent compilation).
- */
-public abstract class C implements I {
-       public abstract int m();
-}
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/I.java	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-public interface I {
-    default public int m() { return 1; }
-}
--- a/hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java	Wed Jul 05 19:24:14 2017 +0200
@@ -21,50 +21,127 @@
  * questions.
  *
  */
-
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
 import jdk.internal.org.objectweb.asm.ClassWriter;
 import jdk.internal.org.objectweb.asm.Handle;
 import jdk.internal.org.objectweb.asm.MethodVisitor;
 import jdk.internal.org.objectweb.asm.Opcodes;
+import p.Dok;
 
 /**
- * @test
- * @bug 8025260
- * @summary Ensure that AbstractMethodError is thrown, not NullPointerException, through MethodHandles::jump_from_method_handle code path
+ * @test @bug 8025260 8016839
+ * @summary Ensure that AbstractMethodError and IllegalAccessError are thrown appropriately, not NullPointerException
+ *
+ * @compile -XDignore.symbol.file TestAMEnotNPE.java ByteClassLoader.java p/C.java p/Dok.java p/E.java p/F.java p/I.java p/Tdirect.java p/Treflect.java
  *
- * @compile -XDignore.symbol.file ByteClassLoader.java I.java C.java TestAMEnotNPE.java
  * @run main/othervm TestAMEnotNPE
+ * @run main/othervm -Xint TestAMEnotNPE
+ * @run main/othervm -Xcomp TestAMEnotNPE
  */
-
 public class TestAMEnotNPE implements Opcodes {
 
+    static boolean writeJarFiles = false;
+    static boolean readJarFiles = false;
+
     /**
-     * The bytes for D, a NOT abstract class extending abstract class C
-     * without supplying an implementation for abstract method m.
-     * There is a default method in the interface I, but it should lose to
-     * the abstract class.
+     * Optional command line parameter (any case-insensitive prefix of)
+     * "writejarfiles" or "readjarfiles".
+     *
+     * "Writejarfiles" creates a jar file for each different set of tested classes.
+     * "Readjarfiles" causes the classloader to use the copies of the classes
+     * found in the corresponding jar files.
+     *
+     * Jarfilenames look something like pD_ext_pF (p.D extends p.F)
+     * and qD_m_pp_imp_pI (q.D with package-private m implements p.I)
+     *
+     */
+    public static void main(String args[]) throws Throwable {
+        ArrayList<Throwable> lt = new ArrayList<Throwable>();
+
+        if (args.length > 0) {
+            String a0 = args[0].toLowerCase();
+            if (a0.length() > 0) {
+                writeJarFiles = ("writejarfiles").startsWith(a0);
+                readJarFiles = ("readjarfiles").startsWith(a0);
+            }
+            if (!(writeJarFiles || readJarFiles)) {
+                throw new Error("Command line parameter (if any) should be prefix of writeJarFiles or readJarFiles");
+            }
+        }
+
+        try {
+            System.out.println("TRYING p.D.m PRIVATE interface-invoked as p.I.m, p.D extends p.F, p.F.m FINAL");
+            tryAndCheckThrown(lt, bytesForDprivateSubWhat("p/F"),
+                    "p.D extends p.F (p.F implements p.I, FINAL public m), private m",
+                    IllegalAccessError.class, "pD_ext_pF");
+            // We'll take either a VerifyError (pre 2013-11-30)
+            // or an IllegalAccessError (post 2013-11-22)
+        } catch (VerifyError ve) {
+            System.out.println("Saw expected VerifyError " + ve);
+        }
+        System.out.println();
 
-     class D extends C {
-        D() { super(); }
-        // does not define m
-     }
+        System.out.println("TRYING p.D.m PRIVATE interface-invoked as p.I.m, p.D extends p.E");
+        tryAndCheckThrown(lt, bytesForDprivateSubWhat("p/E"),
+                "p.D extends p.E (p.E implements p.I, public m), private m",
+                IllegalAccessError.class, "pD_ext_pE");
+
+        System.out.println("TRYING p.D.m ABSTRACT interface-invoked as p.I.m");
+        tryAndCheckThrown(lt, bytesForD(),
+                "D extends abstract C, no m",
+                AbstractMethodError.class, "pD_ext_pC");
+
+        System.out.println("TRYING q.D.m PACKAGE interface-invoked as p.I.m");
+        tryAndCheckThrown(lt, "q.D", bytesForDsomeAccess("q/D", 0),
+                "q.D implements p.I, protected m", IllegalAccessError.class,
+                "qD_m_pp_imp_pI");
+
+        // Note jar file name is used in the plural-arg case.
+        System.out.println("TRYING p.D.m PRIVATE interface-invoked as p.I.m");
+        tryAndCheckThrown(lt, bytesForDsomeAccess("p/D", ACC_PRIVATE),
+                "p.D implements p.I, private m",
+                IllegalAccessError.class, "pD_m_pri_imp_pI");
 
+        // Plural-arg test.
+        System.out.println("TRYING p.D.m PRIVATE MANY ARG interface-invoked as p.I.m");
+        tryAndCheckThrownMany(lt, bytesForDsomeAccess("p/D", ACC_PRIVATE),
+                "p.D implements p.I, private m", IllegalAccessError.class);
+
+        if (lt.size() > 0) {
+            System.out.flush();
+            Thread.sleep(250); // This de-interleaves output and error in Netbeans, sigh.
+            for (Throwable th : lt)
+              System.err.println(th);
+            throw new Error("Test failed, there were " + lt.size() + " failures listed above");
+        } else {
+            System.out.println("ALL PASS, HOORAY!");
+        }
+    }
+
+    /**
+     * The bytes for D, a NOT abstract class extending abstract class C without
+     * supplying an implementation for abstract method m. There is a default
+     * method in the interface I, but it should lose to the abstract class.
+     *
      * @return
      * @throws Exception
      */
     public static byte[] bytesForD() throws Exception {
 
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES
+                | ClassWriter.COMPUTE_MAXS);
         MethodVisitor mv;
 
-        cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "D", null, "C", null);
+        cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "p/D", null, "p/C", null);
 
         {
             mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
             mv.visitCode();
             mv.visitVarInsn(ALOAD, 0);
-            mv.visitMethodInsn(INVOKESPECIAL, "C", "<init>", "()V");
+            mv.visitMethodInsn(INVOKESPECIAL, "p/C", "<init>", "()V");
             mv.visitInsn(RETURN);
             mv.visitMaxs(0, 0);
             mv.visitEnd();
@@ -74,70 +151,346 @@
         return cw.toByteArray();
     }
 
+    /**
+     * The bytes for D, implements I, does not extend C, declares m()I with
+     * access method_acc.
+     *
+     * @param d_name Name of class defined
+     * @param method_acc Accessibility of that class's method m.
+     * @return
+     * @throws Exception
+     */
+    public static byte[] bytesForDsomeAccess(String d_name, int method_acc) throws Exception {
+        return bytesForSomeDsubSomethingSomeAccess(d_name, "java/lang/Object", method_acc);
+    }
+
+    /**
+     * The bytes for D implements I, extends some class, declares m()I as
+     * private.
+     *
+     * Invokeinterface of I.m applied to this D should throw IllegalAccessError
+     *
+     * @param sub_what The name of the class that D will extend.
+     * @return
+     * @throws Exception
+     */
+    public static byte[] bytesForDprivateSubWhat(String sub_what) throws Exception {
+        return bytesForSomeDsubSomethingSomeAccess("p/D", sub_what, ACC_PRIVATE);
+    }
 
     /**
-     * The bytecodes for an invokeExact of a particular methodHandle, I.m, invoked on a D
+     * Returns the bytes for a class with name d_name (presumably "D" in some
+     * package), extending some class with name sub_what, implementing p.I,
+     * and defining two methods m() and m(11args) with access method_acc.
+     *
+     * @param d_name      Name of class that is defined
+     * @param sub_what    Name of class that it extends
+     * @param method_acc  Accessibility of method(s) m in defined class.
+     * @return
+     * @throws Exception
+     */
+    public static byte[] bytesForSomeDsubSomethingSomeAccess
+            (String d_name, String sub_what, int method_acc)
+            throws Exception {
+
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES
+                | ClassWriter.COMPUTE_MAXS);
+        MethodVisitor mv;
+        String[] interfaces = {"p/I"};
 
-        class T {
-           T() { super(); } // boring constructor
-           int test() {
-              MethodHandle mh = `I.m():int`;
-              D d = new D();
-              return mh.invokeExact(d); // Should explode here, AbstractMethodError
-           }
+        cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, d_name, null, sub_what, interfaces);
+        {
+            mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+            mv.visitCode();
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKESPECIAL, sub_what, "<init>", "()V");
+            mv.visitInsn(RETURN);
+            mv.visitMaxs(0, 0);
+            mv.visitEnd();
+        }
+        // int m() {return 3;}
+        {
+            mv = cw.visitMethod(method_acc, "m", "()I", null, null);
+            mv.visitCode();
+            mv.visitLdcInsn(new Integer(3));
+            mv.visitInsn(IRETURN);
+            mv.visitMaxs(0, 0);
+            mv.visitEnd();
         }
+        // int m(11args) {return 3;}
+        {
+            mv = cw.visitMethod(method_acc, "m", "(BCSIJ"
+                    + "Ljava/lang/Object;"
+                    + "Ljava/lang/Object;"
+                    + "Ljava/lang/Object;"
+                    + "Ljava/lang/Object;"
+                    + "Ljava/lang/Object;"
+                    + "Ljava/lang/Object;"
+                    + ")I", null, null);
+            mv.visitCode();
+            mv.visitLdcInsn(new Integer(3));
+            mv.visitInsn(IRETURN);
+            mv.visitMaxs(0, 0);
+            mv.visitEnd();
+        }
+        cw.visitEnd();
+        return cw.toByteArray();
+    }
 
+    /**
+     * The bytecodes for a class p/T defining a methods test() and test(11args)
+     * that contain an invokeExact of a particular methodHandle, I.m.
+     *
+     * Test will be passed values that may imperfectly implement I,
+     * and thus may in turn throw exceptions.
+     *
      * @return
      * @throws Exception
      */
     public static byte[] bytesForT() throws Exception {
 
-        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES|ClassWriter.COMPUTE_MAXS);
+        ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES
+                | ClassWriter.COMPUTE_MAXS);
         MethodVisitor mv;
 
-        cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "T", null, "java/lang/Object", null);
+        cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "p/T", null, "java/lang/Object", null);
         {
             mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
             mv.visitCode();
             mv.visitVarInsn(ALOAD, 0);
             mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V");
             mv.visitInsn(RETURN);
-            mv.visitMaxs(0,0);
+            mv.visitMaxs(0, 0);
+            mv.visitEnd();
+        }
+        // static int test(I)
+        {
+            mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "test", "(Lp/I;)I", null, null);
+            mv.visitCode();
+            mv.visitLdcInsn(new Handle(Opcodes.H_INVOKEINTERFACE, "p/I", "m", "()I"));
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle",
+                    "invokeExact", "(Lp/I;)I");
+            mv.visitInsn(IRETURN);
+            mv.visitMaxs(0, 0);
             mv.visitEnd();
         }
+        // static int test(I,11args)
         {
-            mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "test", "()I", null, null);
+            mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "test", "(Lp/I;BCSIJLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)I", null, null);
             mv.visitCode();
-            mv.visitLdcInsn(new Handle(Opcodes.H_INVOKEINTERFACE, "I", "m", "()I"));
-            mv.visitTypeInsn(NEW, "D");
-            mv.visitInsn(DUP);
-            mv.visitMethodInsn(INVOKESPECIAL, "D", "<init>", "()V");
-            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle", "invokeExact", "(LI;)I");
+            mv.visitLdcInsn(new Handle(Opcodes.H_INVOKEINTERFACE, "p/I", "m", "(BCSIJLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)I"));
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitVarInsn(ILOAD, 1);
+            mv.visitVarInsn(ILOAD, 2);
+            mv.visitVarInsn(ILOAD, 3);
+            mv.visitVarInsn(ILOAD, 4);
+            mv.visitVarInsn(LLOAD, 5);
+            mv.visitVarInsn(ALOAD, 7);
+            mv.visitVarInsn(ALOAD, 8);
+            mv.visitVarInsn(ALOAD, 9);
+            mv.visitVarInsn(ALOAD, 10);
+            mv.visitVarInsn(ALOAD, 11);
+            mv.visitVarInsn(ALOAD, 12);
+            mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/invoke/MethodHandle",
+                    "invokeExact", "(Lp/I;BCSIJLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)I");
             mv.visitInsn(IRETURN);
-            mv.visitMaxs(0,0);
+            mv.visitMaxs(0, 0);
             mv.visitEnd();
         }
         cw.visitEnd();
         return cw.toByteArray();
     }
 
-    public static void main(String args[] ) throws Throwable {
-        ByteClassLoader bcl = new ByteClassLoader();
-        Class<?> d = bcl.loadBytes("D", bytesForD());
-        Class<?> t = bcl.loadBytes("T", bytesForT());
+    private static void tryAndCheckThrown(
+            List<Throwable> lt, byte[] dBytes, String what, Class<?> expected, String jar_name)
+            throws Throwable {
+        tryAndCheckThrown(lt, "p.D", dBytes, what, expected, jar_name);
+    }
+
+    private static void tryAndCheckThrown(List<Throwable> lt, String d_name, byte[] dBytes, String what, Class<?> expected, String jar_name)
+            throws Throwable {
+
+        System.out.println("Methodhandle invokeExact I.m() for instance of " + what);
+        ByteClassLoader bcl1 = new ByteClassLoader(jar_name, readJarFiles, writeJarFiles);
         try {
-          Object result = t.getMethod("test").invoke(null);
-          System.out.println("Expected AbstractMethodError wrapped in InvocationTargetException, saw no exception");
-          throw new Error("Missing expected exception");
+            Class<?> d1 = bcl1.loadBytes(d_name, dBytes);
+            Class<?> t1 = bcl1.loadBytes("p.T", bytesForT());
+            invokeTest(t1, d1, expected, lt);
+        } finally {
+            // Not necessary for others -- all class files are written in this call.
+            // (unless the VM crashes first).
+            bcl1.close();
+        }
+
+        System.out.println("Reflection invoke I.m() for instance of " + what);
+        ByteClassLoader bcl3 = new ByteClassLoader(jar_name, readJarFiles, false);
+        Class<?> d3 = bcl3.loadBytes(d_name, dBytes);
+        Class<?> t3 = bcl3.loadClass("p.Treflect");
+        invokeTest(t3, d3, expected, lt);
+
+        System.out.println("Bytecode invokeInterface I.m() for instance of " + what);
+        ByteClassLoader bcl2 = new ByteClassLoader(jar_name, readJarFiles, false);
+        Class<?> d2 = bcl2.loadBytes(d_name, dBytes);
+        Class<?> t2 = bcl2.loadClass("p.Tdirect");
+        badGoodBadGood(t2, d2, expected, lt);
+    }
+
+    private static void invokeTest(Class<?> t, Class<?> d, Class<?> expected, List<Throwable> lt)
+            throws Throwable {
+        try {
+            Method m = t.getMethod("test", p.I.class);
+            Object o = d.newInstance();
+            Object result = m.invoke(null, o);
+            if (expected != null) {
+                System.out.println("FAIL, Expected " + expected.getName()
+                        + " wrapped in InvocationTargetException, but nothing was thrown");
+                lt.add(new Error("Exception " + expected.getName() + " was not thrown"));
+            } else {
+                System.out.println("PASS, saw expected return.");
+            }
         } catch (InvocationTargetException e) {
             Throwable th = e.getCause();
-            if (th instanceof AbstractMethodError) {
-                th.printStackTrace(System.out);
-                System.out.println("PASS, saw expected exception (AbstractMethodError, wrapped in InvocationTargetException).");
+            th.printStackTrace(System.out);
+            if (expected != null) {
+                if (expected.isInstance(th)) {
+                    System.out.println("PASS, saw expected exception (" + expected.getName() + ").");
+                } else {
+                    System.out.println("FAIL, Expected " + expected.getName()
+                            + " wrapped in InvocationTargetException, saw " + th);
+                    lt.add(th);
+                }
             } else {
-                System.out.println("Expected AbstractMethodError wrapped in InvocationTargetException, saw " + th);
-                throw th;
+                System.out.println("FAIL, expected no exception, saw " + th);
+                lt.add(th);
             }
         }
+        System.out.println();
+    }
+
+    /* Many-arg versions of above */
+    private static void tryAndCheckThrownMany(List<Throwable> lt, byte[] dBytes, String what, Class<?> expected)
+            throws Throwable {
+
+        System.out.println("Methodhandle invokeExact I.m(11params) for instance of " + what);
+        ByteClassLoader bcl1 = new ByteClassLoader("p.D", readJarFiles, false);
+        try {
+            Class<?> d1 = bcl1.loadBytes("p.D", dBytes);
+            Class<?> t1 = bcl1.loadBytes("p.T", bytesForT());
+            invokeTestMany(t1, d1, expected, lt);
+        } finally {
+            bcl1.close(); // Not necessary for others -- all class files are written in this call.
+        }
+
+        {
+            System.out.println("Bytecode invokeInterface I.m(11params) for instance of " + what);
+            ByteClassLoader bcl2 = new ByteClassLoader("pD_m_pri_imp_pI", readJarFiles, false);
+            Class<?> d2 = bcl2.loadBytes("p.D", dBytes);
+            Class<?> t2 = bcl2.loadClass("p.Tdirect");
+            badGoodBadGoodMany(t2, d2, expected, lt);
+
+        }
+        {
+            System.out.println("Reflection invokeInterface I.m(11params) for instance of " + what);
+            ByteClassLoader bcl2 = new ByteClassLoader("pD_m_pri_imp_pI", readJarFiles, false);
+            Class<?> d2 = bcl2.loadBytes("p.D", dBytes);
+            Class<?> t2 = bcl2.loadClass("p.Treflect");
+            invokeTestMany(t2, d2, expected, lt);
+        }
+    }
+
+    private static void invokeTestMany(Class<?> t, Class<?> d, Class<?> expected, List<Throwable> lt)
+            throws Throwable {
+        try {
+            Method m = t.getMethod("test", p.I.class,
+                    Byte.TYPE, Character.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE,
+                    Object.class, Object.class, Object.class,
+                    Object.class, Object.class, Object.class);
+            Object o = d.newInstance();
+            Byte b = 1;
+            Character c = 2;
+            Short s = 3;
+            Integer i = 4;
+            Long j = 5L;
+            Object o1 = b;
+            Object o2 = c;
+            Object o3 = s;
+            Object o4 = i;
+            Object o5 = j;
+            Object o6 = "6";
+
+            Object result = m.invoke(null, o, b, c, s, i, j,
+                    o1, o2, o3, o4, o5, o6);
+            if (expected != null) {
+                System.out.println("FAIL, Expected " + expected.getName()
+                        + " wrapped in InvocationTargetException, but nothing was thrown");
+                lt.add(new Error("Exception " + expected.getName()
+                        + " was not thrown"));
+            } else {
+                System.out.println("PASS, saw expected return.");
+            }
+        } catch (InvocationTargetException e) {
+            Throwable th = e.getCause();
+            th.printStackTrace(System.out);
+            if (expected != null) {
+                if (expected.isInstance(th)) {
+                    System.out.println("PASS, saw expected exception ("
+                            + expected.getName() + ").");
+                } else {
+                    System.out.println("FAIL, Expected " + expected.getName()
+                            + " wrapped in InvocationTargetException, saw " + th);
+                    lt.add(th);
+                }
+            } else {
+                System.out.println("FAIL, expected no exception, saw " + th);
+                lt.add(th);
+            }
+        }
+        System.out.println();
+    }
+
+    /**
+     * This tests a peculiar idiom for tickling the bug on older VMs that lack
+     * methodhandles.  The bug (if not fixed) acts in the following way:
+     *
+     *  When a broken receiver is passed to the first execution of an invokeinterface
+     * bytecode, the illegal access is detected before the effects of resolution are
+     * cached for later use, and so repeated calls with a broken receiver will always
+     * throw the correct error.
+     *
+     * If, however, a good receiver is passed to the invokeinterface, the effects of
+     * resolution will be successfully cached.  A subsequent execution with a broken
+     * receiver will reuse the cached information, skip the detailed resolution work,
+     * and instead encounter a null pointer.  By convention, that is the encoding for a
+     * missing abstract method, and an AbstractMethodError is thrown -- not the expected
+     * IllegalAccessError.
+     *
+     * @param t2 Test invocation class
+     * @param d2 Test receiver class
+     * @param expected expected exception type
+     * @param lt list of unexpected throwables seen
+     */
+    private static void badGoodBadGood(Class<?> t2, Class<?> d2, Class<?> expected, List<Throwable> lt)
+            throws Throwable {
+        System.out.println("  Error input 1st time");
+        invokeTest(t2, d2, expected, lt);
+        System.out.println("  Good input (instance of Dok)");
+        invokeTest(t2, Dok.class, null, lt);
+        System.out.println("  Error input 2nd time");
+        invokeTest(t2, d2, expected, lt);
+        System.out.println("  Good input (instance of Dok)");
+        invokeTest(t2, Dok.class, null, lt);
+    }
+
+    private static void badGoodBadGoodMany(Class<?> t2, Class<?> d2, Class<?> expected, List<Throwable> lt)
+            throws Throwable {
+        System.out.println("  Error input 1st time");
+        invokeTestMany(t2, d2, expected, lt);
+        System.out.println("  Good input (instance of Dok)");
+        invokeTestMany(t2, Dok.class, null, lt);
+        System.out.println("  Error input 2nd time");
+        invokeTestMany(t2, d2, expected, lt);
+        System.out.println("  Good input (instance of Dok)");
+        invokeTestMany(t2, Dok.class, null, lt);
     }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/C.java	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test class -- implements I, which provides default for m, but this class
+ * declares it abstract which (should) hide the interface default, and throw
+ * an abstract method error if called.
+ *
+ */
+public abstract class C implements p.I {
+       public abstract int m();
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Dok.java	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package p;
+
+/**
+ * Test class -- implements I, extends E, both define m, so all should be well.
+ */
+public class Dok extends p.E {
+
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/E.java	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test class -- implements I, which provides default for m, but this class
+ * redeclares it so that all its non-overriding descendants should call its
+ * method instead (with no error, assuming no descendant monkey business, which
+ * of course is NOT usually the case in this test).
+ *
+ */
+public abstract class E implements p.I {
+       public int m() {
+           return 2;
+       }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/F.java	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test class -- implements I, which provides default for m, but this class
+ * redeclares it so that all its non-overriding descendants should call its
+ * method instead (with no error, assuming no descendant monkey business, which
+ * of course is NOT usually the case in this test).
+ *
+ * Note that m is final -- one form of monkey business is attempting to redefine
+ * m.
+ *
+ */
+public abstract class F implements p.I {
+       final public int m() {
+           return 2;
+       }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/I.java	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Test interface I, provides default implementations for m() and m(11args).
+ */
+
+public interface I {
+    default public int m() { return 1; }
+    default public int m(byte b, char c, short s, int i, long l,
+           Object o1, Object o2, Object o3, Object o4, Object o5, Object o6) {
+        return 2;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Tdirect.java	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package p;
+
+/**
+ * Invokes I.m directly using invokeInterface bytecodes.
+ */
+public class Tdirect {
+     public static int test(p.I i) {
+         int accum = 0;
+         for (int j = 0; j < 100000; j++) {
+             accum += i.m();
+         }
+        return accum;
+    }
+
+     public static int test(p.I ii, byte b, char c, short s, int i, long l,
+             Object o1, Object o2, Object o3, Object o4, Object o5, Object o6) {
+         int accum = 0;
+         for (int j = 0; j < 100000; j++) {
+           accum += ii.m(b,c,s,i,l,o1,o2,o3,o4,o5,o6);
+         }
+         return accum;
+     }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/jsr292/methodHandleExceptions/p/Treflect.java	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+package p;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Invokes I.m using reflection.
+ */
+public class Treflect {
+
+    public static int test(p.I ii) throws Throwable {
+        int accum = 0;
+        Method m = p.I.class.getMethod("m");
+        try {
+            for (int j = 0; j < 100000; j++) {
+                Object o = m.invoke(ii);
+                accum += ((Integer) o).intValue();
+            }
+        } catch (InvocationTargetException ite) {
+            throw ite.getCause();
+        }
+        return accum;
+    }
+
+    public static int test(p.I ii, byte b, char c, short s, int i, long l,
+            Object o1, Object o2, Object o3, Object o4, Object o5, Object o6)
+            throws Throwable {
+        Method m = p.I.class.getMethod("m", Byte.TYPE, Character.TYPE,
+                Short.TYPE, Integer.TYPE, Long.TYPE,
+                Object.class, Object.class, Object.class,
+                Object.class, Object.class, Object.class);
+        int accum = 0;
+        try {
+            for (int j = 0; j < 100000; j++) {
+                Object o = m.invoke(ii, b, c, s, i, l, o1, o2, o3, o4, o5, o6);
+                accum += ((Integer) o).intValue();
+            }
+        } catch (InvocationTargetException ite) {
+            throw ite.getCause();
+        }
+        return accum;
+    }
+}
--- a/hotspot/test/runtime/6626217/Test6626217.sh	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/6626217/Test6626217.sh	Wed Jul 05 19:24:14 2017 +0200
@@ -21,7 +21,8 @@
 #  questions.
 # 
 
- 
+
+# @ignore 8028733
 # @test @(#)Test6626217.sh
 # @bug 6626217
 # @summary Loader-constraint table allows arrays instead of only the base-classes
--- a/hotspot/test/runtime/6929067/Test6929067.sh	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/6929067/Test6929067.sh	Wed Jul 05 19:24:14 2017 +0200
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 ##
+## @ignore 8028740
 ## @test Test6929067.sh
 ## @bug 6929067
 ## @bug 8021296
--- a/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java	Wed Jul 05 19:24:14 2017 +0200
@@ -22,6 +22,7 @@
  */
 
 /*
+ * @ignore 8026154
  * @test
  * @bug 8005933
  * @summary Test that -Xshare:auto uses CDS when explicitly specified with -server.
--- a/hotspot/test/runtime/InitialThreadOverflow/testme.sh	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/InitialThreadOverflow/testme.sh	Wed Jul 05 19:24:14 2017 +0200
@@ -21,6 +21,7 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 
+# @ignore 8029139
 # @test testme.sh
 # @bug 8009062
 # @summary Poor performance of JNI AttachCurrentThread after fix for 7017193
--- a/hotspot/test/runtime/LoadClass/LoadClassNegative.java	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/LoadClass/LoadClassNegative.java	Wed Jul 05 19:24:14 2017 +0200
@@ -22,6 +22,7 @@
  */
 
 /*
+ * @ignore 8028095
  * @test
  * @key regression
  * @bug 8020675
--- a/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java	Wed Jul 05 19:24:14 2017 +0200
@@ -22,6 +22,7 @@
  */
 
 /*
+ * @ignore 8023735
  * @test
  * @bug 7051189 8023393
  * @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
--- a/hotspot/test/runtime/jsig/Test8017498.sh	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/jsig/Test8017498.sh	Wed Jul 05 19:24:14 2017 +0200
@@ -24,6 +24,7 @@
 #
 
 ##
+## @ignore 8028806
 ## @test Test8017498.sh
 ## @bug 8017498
 ## @bug 8020791
--- a/hotspot/test/runtime/memory/ReadFromNoaccessArea.java	Tue Dec 03 12:37:30 2013 -0800
+++ b/hotspot/test/runtime/memory/ReadFromNoaccessArea.java	Wed Jul 05 19:24:14 2017 +0200
@@ -22,6 +22,7 @@
  */
 
 /*
+ * @ignore 8028398
  * @test
  * @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION
  * @library /testlibrary /testlibrary/whitebox
--- a/make/Defs-internal.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,383 +0,0 @@
-#
-# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-#
-# Common variables used by all the Java makefiles.  This file should
-# not contain rules.
-#
-
-# The build times report is turned off by setting REPORT_BUILD_TIMES to nothing.
-# This is necessary for the target clobber/clean which will erase the
-# directories where the buildtimes are stored.
-REPORT_BUILD_TIMES=1
-# Store the build times in this directory.
-BUILDTIMESDIR=$(ABS_OUTPUTDIR)/tmp/buildtimes
-
-# Record starting time for build of a sub repository.
-define RecordStartTime
-$(MKDIR) -p $(BUILDTIMESDIR)
-$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
-$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
-endef
-
-# Indicate that we started to build a sub repository and record starting time. 
-define MakeStart
-$(call RecordStartTime,$1)
-$(PRINTF) "\n\n%s\n%s\n##### %-60.60s #####\n%s\n\n" \
-"########################################################################" \
-"########################################################################" \
-"Entering $1 for target(s) $2" \
-"########################################################################"
-endef
-
-# Record ending time and calculate the difference and store it in a
-# easy to read format. Handles builds that cross midnight. Expects
-# that a build will never take 24 hours or more. 
-define RecordEndTime
-$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
-$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
-$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
-  $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
-             M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
-  > $(BUILDTIMESDIR)/build_time_diff_$1
-endef
-
-# Indicate that we are done.
-# Record ending time and print out the total time it took to build.
-define MakeFinish 
-$(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,$1),) 
-$(PRINTF) "%s\n##### %-60.60s #####\n%s\n##### %-60.60s #####\n%s\n\n" \
-"########################################################################" \
-"Leaving $1 for target(s) $2" \
-"########################################################################" \
-$(if $(REPORT_BUILD_TIMES),"Build time `$(CAT) $(BUILDTIMESDIR)/build_time_diff_$1` for target(s) $2","") \
-"########################################################################" 
-endef
-
-# Find all build_time_* files and print their contents in a list sorted
-# on the name of the sub repository.
-define ReportBuildTimes
-$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
-$1 \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
-"`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
-"`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
-endef
-
-ifdef OPENJDK
-  ifneq ($(OPENJDK),true)
-    x:=$(error "OPENJDK (if defined) can only be set to true")
-  endif
-endif
-
-# Define absolute paths to TOPDIRs
-ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)")
-ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)")
-ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)")
-ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)")
-ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
-ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
-ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)")
-ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
-ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
-ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
-
-# Macro to return true or false if a file exists and is readable
-define MkExists
-$(shell if [ -r $1 ]; then $(ECHO) true; else $(ECHO) false; fi)
-endef
-
-HOTSPOT_SRC_AVAILABLE := $(call MkExists,$(HOTSPOT_TOPDIR)/make/Makefile)
-ifndef BUILD_HOTSPOT
-  ifdef ALT_HOTSPOT_IMPORT_PATH
-    BUILD_HOTSPOT := false
-  else
-    BUILD_HOTSPOT := $(HOTSPOT_SRC_AVAILABLE)
-  endif
-endif
-
-LANGTOOLS_SRC_AVAILABLE := $(call MkExists,$(LANGTOOLS_TOPDIR)/make/Makefile)
-ifndef BUILD_LANGTOOLS
-  ifdef ALT_LANGTOOLS_DIST
-    BUILD_LANGTOOLS := false
-  else
-    BUILD_LANGTOOLS := $(LANGTOOLS_SRC_AVAILABLE)
-  endif
-endif
-
-CORBA_SRC_AVAILABLE := $(call MkExists,$(CORBA_TOPDIR)/make/Makefile)
-ifndef BUILD_CORBA
-  ifdef ALT_CORBA_DIST
-    BUILD_CORBA := false
-  else
-    BUILD_CORBA := $(CORBA_SRC_AVAILABLE)
-  endif
-endif
-
-JAXP_SRC_AVAILABLE := $(call MkExists,$(JAXP_TOPDIR)/make/Makefile)
-ifndef BUILD_JAXP
-  ifdef ALT_JAXP_DIST
-    BUILD_JAXP := false
-  else
-    BUILD_JAXP := $(JAXP_SRC_AVAILABLE)
-  endif
-endif
-
-JAXWS_SRC_AVAILABLE := $(call MkExists,$(JAXWS_TOPDIR)/make/Makefile)
-ifndef BUILD_JAXWS
-  ifdef ALT_JAXWS_DIST
-    BUILD_JAXWS := false
-  else
-    BUILD_JAXWS := $(JAXWS_SRC_AVAILABLE)
-  endif
-endif
-
-JDK_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/make/Makefile)
-ifndef BUILD_JDK
-  BUILD_JDK := $(JDK_SRC_AVAILABLE)
-endif
-ifeq ($(JDK_SRC_AVAILABLE),true)
-  JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed)
-  ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false)
-    OPENJDK = true
-  endif
-endif
-
-NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile)
-ifndef BUILD_NASHORN
-  ifdef ALT_NASHORN_DIST
-    BUILD_NASHORN := false
-  else
-    BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE)
-  endif
-endif
-
-DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
-ifndef BUILD_DEPLOY
-  BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
-endif
-
-INSTALL_SRC_AVAILABLE := $(call MkExists,$(INSTALL_TOPDIR)/make/Makefile)
-ifndef BUILD_INSTALL
-  ifdef DEV_ONLY
-    BUILD_INSTALL := false
-  else
-    BUILD_INSTALL := $(INSTALL_SRC_AVAILABLE)
-  endif
-endif
-
-SPONSORS_SRC_AVAILABLE := $(call MkExists,$(SPONSORS_TOPDIR)/make/Makefile)
-ifndef BUILD_SPONSORS
-  ifdef DEV_ONLY
-    BUILD_SPONSORS := false
-  else
-    BUILD_SPONSORS := $(SPONSORS_SRC_AVAILABLE)
-  endif
-endif
-
-
-# Do we build the source bundles?
-BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
-ifeq ($(SKIP_BUNDLES_BUILD), true)
-  BUNDLE_RULES_AVAILABLE := false
-else 
-  BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
-endif
-
-# Current things we do NOT build for OPENJDK
-ifdef OPENJDK
-  BUILD_DEPLOY = false
-  BUILD_INSTALL = false
-  BUILD_SPONSORS = false
-  BUNDLE_RULES_AVAILABLE := false
-  # These could be over-ridden on the command line or in environment
-  ifndef SKIP_FASTDEBUG_BUILD
-    SKIP_FASTDEBUG_BUILD = true
-  endif
-  ifndef SKIP_DEBUG_BUILD
-    SKIP_DEBUG_BUILD = true
-  endif
-  ifndef SKIP_COMPARE_IMAGES
-    SKIP_COMPARE_IMAGES = true
-  endif
-else
-  
-  # Various non-OPENJDK reasons to NOT build the deploy repository
-  ifeq ($(ARCH), ia64)
-    BUILD_DEPLOY=false
-  endif
-  ifeq ($(ARCH), sparcv9)
-    BUILD_DEPLOY=false
-  endif
-  ifeq ($(ARCH), amd64)
-    ifeq ($(PLATFORM), solaris)
-      BUILD_DEPLOY=false
-    endif
-  endif
-
-endif
-ifndef SKIP_PRODUCT_BUILD
-  SKIP_PRODUCT_BUILD = false
-endif
-
-# Many reasons why we would want to skip the comparison to previous jdk
-ifndef SKIP_COMPARE_IMAGES
-  ifeq ($(BUILD_JDK), false)
-    SKIP_COMPARE_IMAGES = true
-  endif
-  ifeq ($(BUILD_DEPLOY), false)
-    SKIP_COMPARE_IMAGES = true
-  endif
-  ifeq ($(BUILD_INSTALL), false)
-    SKIP_COMPARE_IMAGES = true
-  endif
-  ifdef DEV_ONLY
-    SKIP_COMPARE_IMAGES = true
-  endif
-endif
-
-# Select defaults if these are not set to true or false
-ifndef SKIP_DEBUG_BUILD
-  SKIP_DEBUG_BUILD=true
-endif
-ifndef SKIP_FASTDEBUG_BUILD
-  SKIP_FASTDEBUG_BUILD=true
-endif
-
-# Select javadoc setting GENERATE_DOCS
-ifndef NO_DOCS
-  # Default value (we want javadoc run)
-  GENERATE_DOCS=true
-  # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
-  ifndef OPENJDK
-    ifdef JDK_UPDATE_VERSION
-      GENERATE_DOCS=false
-    endif
-  endif
-  # If langtools, corba, jaxp, and jaxws are not being built, 
-  #   a full jdk javadoc is not possible
-  ifneq ($(BUILD_LANGTOOLS), true)
-    GENERATE_DOCS=false
-  endif
-  ifneq ($(BUILD_CORBA), true)
-    GENERATE_DOCS=false
-  endif
-  ifneq ($(BUILD_JAXP), true)
-    GENERATE_DOCS=false
-  endif
-  ifneq ($(BUILD_JAXWS), true)
-    GENERATE_DOCS=false
-  endif
-  ifeq ($(GENERATE_DOCS),false)
-    NO_DOCS=true
-  endif
-else
-  GENERATE_DOCS=false
-endif
-
-# Output directory for hotspot build
-HOTSPOT_DIR = $(ABS_OUTPUTDIR)/hotspot
-
-# If we are building components
-ifndef ALT_LANGTOOLS_DIST
-  LANGTOOLS_OUTPUTDIR = $(ABS_OUTPUTDIR)/langtools
-  ABS_LANGTOOLS_DIST = $(LANGTOOLS_OUTPUTDIR)/dist
-endif
-ifndef ALT_CORBA_DIST
-  CORBA_OUTPUTDIR = $(ABS_OUTPUTDIR)/corba
-  ABS_CORBA_DIST = $(CORBA_OUTPUTDIR)/dist
-endif
-ifndef ALT_JAXP_DIST
-  JAXP_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxp
-  ABS_JAXP_DIST = $(JAXP_OUTPUTDIR)/dist
-endif
-ifndef ALT_JAXWS_DIST
-  JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws
-  ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
-endif
-ifndef ALT_NASHORN_DIST
-  NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn
-  ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist
-endif
-
-# Common make arguments (supplied to all component builds)
-COMMON_BUILD_ARGUMENTS = \
-    JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
-    JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \
-    EXTERNALSANITYCONTROL=true \
-    SOURCE_LANGUAGE_VERSION=$(SOURCE_LANGUAGE_VERSION) \
-    TARGET_CLASS_VERSION=$(TARGET_CLASS_VERSION) \
-    MILESTONE=$(MILESTONE) \
-    BUILD_NUMBER=$(BUILD_NUMBER) \
-    JDK_BUILD_NUMBER=$(JDK_BUILD_NUMBER) \
-    FULL_VERSION=$(FULL_VERSION) \
-    PREVIOUS_JDK_VERSION=$(PREVIOUS_JDK_VERSION) \
-    JDK_VERSION=$(JDK_VERSION) \
-    JDK_MKTG_VERSION=$(JDK_MKTG_VERSION) \
-    JDK_MAJOR_VERSION=$(JDK_MAJOR_VERSION) \
-    JDK_MINOR_VERSION=$(JDK_MINOR_VERSION) \
-    JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \
-    PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
-    PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
-    PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
-
-ifdef OPENJDK
-  COMMON_BUILD_ARGUMENTS += OPENJDK=$(OPENJDK)
-endif
-
-ifdef ARCH_DATA_MODEL
-  COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)
-endif
-
-ifeq ($(DEBUG_NAME), debug)
-  COMMON_BUILD_ARGUMENTS += VARIANT=DBG DEBUG_CLASSFILES=true
-endif
-
-ifeq ($(DEBUG_NAME), fastdebug)
-  COMMON_BUILD_ARGUMENTS += VARIANT=DBG FASTDEBUG=true DEBUG_CLASSFILES=true
-endif
-
-ifdef COOKED_JDK_UPDATE_VERSION
-  COMMON_BUILD_ARGUMENTS += COOKED_JDK_UPDATE_VERSION=$(COOKED_JDK_UPDATE_VERSION)
-endif
-
-ifdef COOKED_BUILD_NUMBER
-  COMMON_BUILD_ARGUMENTS += COOKED_BUILD_NUMBER=$(COOKED_BUILD_NUMBER)
-endif
-
-ifdef ANT_HOME
-  COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)"
-endif
-
-# When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES,
-# then these can be set here:
-#ifdef FULL_DEBUG_SYMBOLS
-#  COMMON_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
-#endif
-#
-#ifdef ZIP_DEBUGINFO_FILES
-#  COMMON_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
-#endif
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/HotspotWrapper.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,52 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Include the legacy hotspot-spec.gmk (which in turns includes spec.gmk)
+BASE_SPEC:=$(SPEC)
+include $(dir $(SPEC))hotspot-spec.gmk
+include MakeBase.gmk
+
+# Inclusion of this pseudo-target will cause make to execute this file
+# serially, regardless of -j. Recursively called makefiles will not be
+# affected, however. This is required for correct dependency management.
+.NOTPARALLEL:
+
+default: all
+
+# Get all files except .hg in the hotspot directory.
+HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
+
+# The old build creates hotspot output dir before calling hotspot and
+# 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))
+	$(TOUCH) $@
+
+hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
+
+all: hotspot
+
+.PHONY: default all hotspot
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/Javadoc.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,1210 @@
+# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+include $(SPEC)
+include MakeBase.gmk
+
+.SUFFIXES: # Delete the default suffixes
+.SUFFIXES: .java
+
+#
+# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
+#
+
+DOCSDIR=$(OUTPUT_ROOT)/docs
+TEMPDIR=$(OUTPUT_ROOT)/docstemp
+
+JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
+JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
+
+JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
+
+JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
+
+HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
+
+BUILD_NUMBER=$(JDK_BUILD_NUMBER)
+
+JAVADOC_CMD = $(JAVA) \
+    -Xmx1024m \
+    -Djava.awt.headless=true \
+    $(NEW_JAVADOC) \
+    -bootclasspath $(JDK_OUTPUTDIR)/classes
+
+# Copyright year for beginning of Java and some of the apis
+# (Needed when creating the javadocs)
+FIRST_COPYRIGHT_YEAR = 1993
+DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
+MIRROR_FIRST_COPYRIGHT_YEAR = 2004
+DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
+TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
+JDI_FIRST_COPYRIGHT_YEAR = 1999
+JAAS_FIRST_COPYRIGHT_YEAR = 1998
+JGSS_FIRST_COPYRIGHT_YEAR = 2000
+SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
+HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
+MGMT_FIRST_COPYRIGHT_YEAR = 2003
+ATTACH_FIRST_COPYRIGHT_YEAR = 2005
+JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
+SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
+TRACING_FIRST_COPYRIGHT_YEAR = 2008
+TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
+JNLP_FIRST_COPYRIGHT_YEAR = 1998
+PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
+
+# Oracle name
+FULL_COMPANY_NAME = Oracle and/or its affiliates
+
+# Copyright address
+COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
+
+# The trademark symbol
+TRADEMARK = &trade;
+
+# Common copyright lines used
+# The word "Copyright" might optionally be a link to the file cpyr.html.
+# The first year of copyright may vary or not be available.
+# The address to the company might be optional.
+COMMA:= ,
+EMPTY:=
+SPACE:=$(EMPTY) $(EMPTY)
+COPYRIGHT_SYMBOL = &\#x00a9;
+# Macro to construct the copyright line
+# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
+define CopyrightLine # optionalurl optionalfirstyear optionaladdress
+$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
+$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
+$(FULL_COMPANY_NAME). $3 All rights reserved.
+endef
+
+# Url to root of documents
+DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
+
+# Url to copyright html file
+COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
+# This isn't added in old build yet.
+#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
+COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
+
+# Url to bug filing site
+BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
+
+# Common line for how to submit a bug or rfe
+BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
+
+# Url to devdocs page
+# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
+DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
+DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
+DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
+DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
+
+# Common Java trademark line
+JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
+$(FULL_COMPANY_NAME) in the US and other countries.
+
+#################################################################
+# Macros:
+
+
+# List of all possible directories for javadoc to look for sources
+# NOTE: Quotes are required around sourcepath argument only on Windows.
+# Otherwise, you get "No packages or classes specified." due
+# to $(PATH_SEP) being interpreted as an end of
+# command (newline or shell ; character)
+ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
+    $(JDK_IMPSRC) \
+    $(JDK_GENSRC) \
+    $(JDK_OUTPUTDIR)/gendocsrc_rmic \
+    $(JDK_TOPDIR)/src/solaris/classes \
+    $(JDK_TOPDIR)/src/windows/classes \
+    $(JDK_SHARE_SRC)/doc/stub
+
+# List of directories that actually exist
+ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
+
+# List with classpath separator between them
+EMPTY:=
+SPACE:= $(EMPTY) $(EMPTY)
+RELEASEDOCS_SOURCEPATH = \
+    $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
+
+define prep-target
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+endef
+
+# Prep for javadoc creation, assumes $@ is an index.html file
+define prep-javadoc
+	@if [ -f "$@" -a "$?" != "" ] ; then \
+	  $(ECHO) "# Dependencies have changed: $?"; \
+	fi
+	$(RM) -r $(@D)
+	$(MKDIR) -p $(@D)
+endef
+
+# A cache of the directories in ALL_SOURCE_DIRS
+DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
+
+# Given a list of packages, return a list of files or dirs to be dependent on
+# (Currently only returning a list of directories)
+define PackageDependencies # packages
+  $(shell \
+      if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
+        for p in $1 ; do \
+          pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
+          $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
+        done; \
+      fi \
+  )
+endef
+
+# Given a list of packages, add packages that exist to $@, print summary
+define PackageFilter # packages
+	@if [ "$1" != "" ] ; then \
+	  for p in $1 ; do \
+	    pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
+	    found="false"; \
+	    for cp in $(ALL_SOURCE_DIRS) ; do \
+	      if [ -d $${cp}/$${pd} ] ; then \
+	        $(ECHO) "$${p}" >> $@; \
+	        found="true"; \
+	        break; \
+	      fi; \
+	    done; \
+	    if [ "$${found}" = "false" ] ; then \
+	      $(ECHO) "WARNING: Package not found: $${p}"; \
+	    fi; \
+	  done; \
+	fi
+endef
+
+# Print out a summary of the javadoc command about to be run
+define JavadocSummary # optionsfile packagesfile
+	@$(ECHO) "# Summary for $@"; \
+	$(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@#   @' $1; \
+	$(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@#   @' $2
+endef
+
+#
+# Temporary directory for javadoc creation
+#
+DOCSTMPDIR = $(TEMPDIR)/doctmp
+
+#
+# Different api directories created from root directory
+#
+COREAPI_DOCSDIR = $(DOCSDIR)/api
+JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
+JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
+PLATFORM_DOCSDIR = $(DOCSDIR)/platform
+
+# The non-core api javadocs need to be able to access the root of the core
+# api directory, so for jdk/api or jre/api to get to the core api/
+# directory we would use this:
+JDKJRE2COREAPI = ../../api
+
+# Common bottom argument
+define CommonBottom # year
+<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
+endef
+
+# Common trademark bottom argument (Not sure why this is used sometimes)
+define CommonTrademarkBottom # year
+<font size="-1">\
+$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
+$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
+</font>
+endef
+
+# Common echo of option
+define OptionOnly # opt
+	$(PRINTF) "%s\n" "$1"
+endef
+define OptionPair # opt arg
+	$(PRINTF) "%s '%s'\n" "$1" '$2'
+endef
+define OptionTrip # opt arg arg
+	$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
+endef
+
+# Core api bottom argument (with special sauce)
+COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
+<br>For further API reference and developer documentation, \
+see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
+That documentation contains more detailed, developer-targeted descriptions, \
+with conceptual overviews, definitions of terms, workarounds, \
+and working code examples.<br>\
+$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
+</font>
+
+# Common javadoc options used by all
+COMMON_JAVADOCFLAGS = \
+    -XDignore.symbol.file=true \
+    -quiet \
+    -use \
+    -keywords \
+    -Xdoclint:none \
+    -Xprofilespath $(JDK_TOPDIR)/make/profile-rtjar-includes.txt \
+    $(ADDITIONAL_JAVADOCFLAGS)
+
+ifdef OPENJDK
+  ADDITIONAL_JAVADOCFLAGS = \
+      -Xdocrootparent $(DOCS_BASE_URL)
+else
+  ADDITIONAL_JAVADOCFLAGS =
+endif
+
+# Draft used for non-fcs documents
+DRAFT_HEADER =
+ifneq ($(MILESTONE), fcs)
+  DRAFT_HEADER = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
+  DRAFT_BOTTOM = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
+  DRAFT_WINTITLE = $(BUILD_NUMBER)
+  # Early access top text (not used in FCS releases)
+  COREAPI_TOP_EARLYACCESS = \
+<div style="background-color: \#EEEEEE"> \
+<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
+margin-left: 6px; margin-right: 6px; text-align: justify; \
+font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
+font-weight: normal;"> \
+Please note that the specifications and other information \
+contained herein are not final and are subject to change. \
+The information is being made available to you solely for purpose of \
+evaluation. \
+</div> </div>
+
+endif
+
+#################################################################
+
+#
+# CORE_PKGS environment variable has been moved to the following file
+#
+include CORE_PKGS.gmk
+
+#
+# Load environment variables for API package names that are not part of
+# the Java SE platform
+#
+include NON_CORE_PKGS.gmk
+
+#################################################################
+
+#
+# Default target is same as docs target, create core api and all others it can
+#
+
+all: docs
+docs: coredocs otherdocs
+
+#################################################################
+# Production Targets -- USE THESE TARGETS WHEN:
+# a) You're generating docs outside of release engineering's
+#    standard control build.
+# b) The docs will be pushed to the web and/or included in
+#    the downloaded doc bundle.
+#
+# See: Notes.html#releaseTargets
+# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
+#
+
+sanitycheckcoredocs:
+	@$(ECHO) ""
+	@$(ECHO) "Building core api docs with these values:"
+	@$(ECHO) "    BUILD_NUMBER = $(BUILD_NUMBER)"
+	@$(ECHO) "    MILESTONE = $(MILESTONE)"
+	@$(ECHO) ""
+        ifeq ($(BUILD_NUMBER), b00)
+	  @$(ECHO) "ERROR: Build number must be defined"
+	  @$(ECHO) "MILESTONE is set to $(MILESTONE)"
+	  @$(ECHO) ""
+	  exit 1
+        endif
+
+#############################################################
+#
+# coredocs
+#
+COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
+$(JDK_MINOR_VERSION)<br>API Specification
+COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
+COREAPI_HEADER = \
+<strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong>
+
+# Java language specification cite
+TAG_JLS = jls:a:See <cite> \
+The Java&trade; Language Specification</cite>:
+
+# Overview file for core apis
+COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
+
+# The index.html, options, and packages files
+COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
+COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
+COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
+
+coredocs: $(COREAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
+
+# Run javadoc if the index file is out of date or missing
+$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
+	$(prep-javadoc)
+	$(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ISO-8859-1) ; \
+	  $(call OptionPair,-tag,beaninfo:X) ; \
+	  $(call OptionPair,-tag,revised:X) ; \
+	  $(call OptionPair,-tag,since.unbundled:X) ; \
+	  $(call OptionPair,-tag,spec:X) ; \
+	  $(call OptionPair,-tag,specdefault:X) ; \
+	  $(call OptionPair,-tag,Note:X) ; \
+	  $(call OptionPair,-tag,ToDo:X) ; \
+	  $(call OptionPair,-tag,apiNote:a:API Note:) ; \
+	  $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
+	  $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
+	  $(call OptionPair,-tag,param) ; \
+	  $(call OptionPair,-tag,return) ; \
+	  $(call OptionPair,-tag,throws) ; \
+	  $(call OptionPair,-tag,since) ; \
+	  $(call OptionPair,-tag,version) ; \
+	  $(call OptionPair,-tag,serialData) ; \
+	  $(call OptionPair,-tag,factory) ; \
+	  $(call OptionPair,-tag,see) ; \
+	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
+	  $(call OptionOnly,-splitIndex) ; \
+	  $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
+	  $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
+	  $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	) >> $@
+        ifdef COREAPI_TOP_EARLYACCESS
+	  @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
+        endif
+
+# Create a file with the package names in it
+$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(CORE_PKGS))
+
+#############################################################
+#
+# docletapidocs
+#
+
+ALL_OTHER_TARGETS += docletapidocs
+
+DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
+DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+DOCLETAPI_DOCTITLE := Doclet API
+DOCLETAPI_WINDOWTITLE := Doclet API
+DOCLETAPI_HEADER := <strong>Doclet API</strong>
+DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
+DOCLETAPI_GROUPNAME := Packages
+DOCLETAPI_REGEXP := com.sun.javadoc
+# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
+DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
+DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
+
+docletapidocs: $(DOCLETAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(DOCLETAPI_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-breakiterator) ; \
+	  $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
+	  $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(DOCLETAPI_PKGS))
+
+#############################################################
+#
+# tagletapidocs
+#
+
+ALL_OTHER_TARGETS += tagletapidocs
+TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
+TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
+# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
+
+# Temporary directory (special generation rules)
+TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
+
+# The index.html, options, and packages files
+TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
+TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
+TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
+
+tagletapidocs: $(TAGLETAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(RM) -r $(TAGLETAPI_TEMPDIR)
+	$(MKDIR) -p $(TAGLETAPI_TEMPDIR)
+	$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
+	    @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
+	cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
+	cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
+	$(RM) -r $(TAGLETAPI_TEMPDIR)
+
+# Create file with javadoc options in it
+$(TAGLETAPI_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nonavbar) ; \
+	  $(call OptionOnly,-noindex) ; \
+	  $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
+	$(prep-target)
+	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
+
+#############################################################
+#
+# domapidocs
+#
+
+ALL_OTHER_TARGETS += domapidocs
+
+DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
+DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+DOMAPI_DOCTITLE := Common DOM API
+DOMAPI_WINDOWTITLE := Common DOM API
+DOMAPI_HEADER := <strong>Common DOM API</strong>
+DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
+DOMAPI_GROUPNAME := Packages
+DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
+# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
+DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
+DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
+
+domapidocs: $(DOMAPI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(DOMAPI_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-splitIndex) ; \
+	  $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
+	  $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(DOMAPI_PKGS))
+
+#############################################################
+#
+# jpdadocs
+#
+
+ALL_OTHER_TARGETS += jpdadocs
+
+jpdadocs: jdidocs jdwpdocs jvmtidocs
+
+#############################################################
+#
+# jdidocs
+#
+
+ALL_OTHER_TARGETS += jdidocs
+
+JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
+JDI2COREAPI := ../../$(JDKJRE2COREAPI)
+JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
+JDI_WINDOWTITLE := Java Debug Interface
+JDI_HEADER := <strong>Java Debug Interface</strong>
+JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
+JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
+# JDI_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
+JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
+JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
+
+jdidocs: $(JDI_INDEX_FILE)
+
+# Set relative location to core api document root
+$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
+	  $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(JDI_PKGS))
+
+#############################################################
+#
+# jdwpdocs
+#
+
+ALL_OTHER_TARGETS += jdwpdocs
+
+JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
+
+jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
+$(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(CP) $< $@
+
+#############################################################
+#
+# jvmtidocs
+#
+
+ALL_OTHER_TARGETS += jvmtidocs
+
+JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
+JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
+
+jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
+$(JVMTI_DOCDIR)/jvmti.html:
+	@$(prep-javadoc)
+	@if [ -f $(JVMTI_HTML) ] ; then \
+	  $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
+	  $(CP) $(JVMTI_HTML) $@; \
+	else \
+	  $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
+	fi
+
+#############################################################
+#
+# jaasdocs
+#
+
+ALL_OTHER_TARGETS += jaasdocs
+
+JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
+JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
+JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
+JAAS_WINDOWTITLE := Java Authentication and Authorization Service
+JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
+JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
+# JAAS_PKGS is located in NON_CORE_PKGS.gmk
+JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
+
+# The index.html, options, and packages files
+JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
+JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
+JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
+
+jaasdocs: $(JAAS_INDEX_FILE)
+
+# Set relative location to core api document root
+$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
+	  $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(JAAS_PKGS))
+
+#############################################################
+#
+# jgssdocs
+#
+
+ALL_OTHER_TARGETS += jgssdocs
+
+JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
+JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
+JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
+JGSS_WINDOWTITLE := Java GSS-API Utilities
+JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
+JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
+JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
+# JGSS_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
+JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
+JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
+
+jgssdocs: $(JGSS_INDEX_FILE)
+
+# Set relative location to core api document root
+$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nodeprecatedlist) ; \
+	  $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
+	  $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(JGSS_PKGS))
+
+#############################################################
+#
+# smartcardiodocs
+#
+
+ALL_OTHER_TARGETS += smartcardiodocs
+
+SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
+SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
+SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
+SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
+SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
+SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
+# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
+SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
+SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
+
+smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
+
+# Set relative location to core api document root
+$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(SMARTCARDIO_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nodeprecatedlist) ; \
+	  $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
+	  $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
+	  $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(SMARTCARDIO_PKGS))
+
+#############################################################
+#
+# httpserverdocs
+#
+
+ALL_OTHER_TARGETS += httpserverdocs
+
+HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
+HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
+HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
+HTTPSERVER_WINDOWTITLE := Java HTTP Server
+HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
+HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
+# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
+
+HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
+HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
+HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
+
+httpserverdocs: $(HTTPSERVER_INDEX_HTML)
+
+# Set relative location to core api document root
+$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(HTTPSERVER_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nodeprecatedlist) ; \
+	  $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
+	  $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
+	  $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(HTTPSERVER_PKGS))
+
+#############################################################
+#
+# mgmtdocs
+#
+
+ALL_OTHER_TARGETS += mgmtdocs
+
+MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
+MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
+JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
+JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
+MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
+MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
+MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
+MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
+MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
+# MGMT_PKGS is located in NON_CORE_PKGS.gmk
+
+# The index.html, options, and packages files
+MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
+MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
+MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
+
+mgmtdocs: $(MGMT_INDEX_FILE)
+
+# Set relative location to core api document root
+$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	@if [ -f $(JVM_MIB_SRC) ] ; then \
+	  $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
+	  $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
+	else \
+	  $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
+	fi
+	$(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nodeprecatedlist) ; \
+	  $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
+	  $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(MGMT_PKGS))
+
+#############################################################
+#
+# attachdocs
+#
+
+ALL_OTHER_TARGETS += attachdocs
+
+ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
+ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
+ATTACH_DOCTITLE := Attach API
+ATTACH_WINDOWTITLE := Attach API
+ATTACH_HEADER := <strong>Attach API</strong>
+ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
+# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
+
+ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
+ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
+ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
+
+attachdocs: $(ATTACH_INDEX_HTML)
+
+# Set relative location to core api document root
+$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(ATTACH_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nodeprecatedlist) ; \
+	  $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(ATTACH_PKGS))
+
+#############################################################
+#
+# jconsoledocs
+#
+
+ALL_OTHER_TARGETS += jconsoledocs
+
+JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
+JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
+JCONSOLE_DOCTITLE := JConsole API
+JCONSOLE_WINDOWTITLE := JConsole API
+JCONSOLE_HEADER := <strong>JConsole API</strong>
+JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
+# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
+
+JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
+JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
+JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
+
+jconsoledocs: $(JCONSOLE_INDEX_HTML)
+
+# Set relative location to core api document root
+$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(JCONSOLE_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nodeprecatedlist) ; \
+	  $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(JCONSOLE_PKGS))
+
+#############################################################
+#
+# treeapidocs
+#
+
+ALL_OTHER_TARGETS += treeapidocs
+
+TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
+TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
+TREEAPI_DOCTITLE := Compiler Tree API
+TREEAPI_WINDOWTITLE := Compiler Tree API
+TREEAPI_HEADER := <strong>Compiler Tree API</strong>
+TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
+TREEAPI_GROUPNAME := Packages
+TREEAPI_REGEXP := com.sun.source.*
+# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
+TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
+TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
+
+treeapidocs: $(TREEAPI_INDEX_HTML)
+
+# Set relative location to core api document root
+$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(TREEAPI_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
+	  $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
+	  $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(TREEAPI_PKGS))
+
+#############################################################
+#
+# sctpdocs
+#
+
+ALL_OTHER_TARGETS += sctpdocs
+
+SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
+SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
+SCTPAPI_DOCTITLE := SCTP API
+SCTPAPI_WINDOWTITLE := SCTP API
+SCTPAPI_HEADER := <strong>SCTP API</strong>
+SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
+# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
+
+SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
+SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
+SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
+
+sctpdocs: $(SCTPAPI_INDEX_HTML)
+
+# Set relative location to core api document root
+$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
+
+# Run javadoc if the index file is out of date or missing
+$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
+	$(prep-javadoc)
+	$(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
+	$(JAVADOC_CMD) -d $(@D) \
+	    @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
+
+# Create file with javadoc options in it
+$(SCTPAPI_OPTIONS_FILE):
+	$(prep-target)
+	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
+	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
+	  $(call OptionPair,-encoding,ascii) ; \
+	  $(call OptionOnly,-nodeprecatedlist) ; \
+	  $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
+	  $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
+	  $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
+	  $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
+	  $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
+	) >> $@
+
+# Create a file with the package names in it
+$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
+	$(prep-target)
+	$(call PackageFilter,$(SCTPAPI_PKGS))
+
+#############################################################
+#
+# Get a cache of all the directories
+
+$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
+	$(prep-target)
+	@for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
+	  $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
+	  $(FIND) $${cp} -type f >> $@; \
+	done
+
+#############################################################
+#release version of core packages ########
+
+# The rel-coredocs and rel-docs targets were added by Eric Armstrong. rel-coredocs
+# assumes the kind of large, 32-bit machine used in the javapubs group's docs-release
+# process. It specifies memory settings accordingly to maximize performance.
+#
+# The performance settings, like the sanity check, are most important for the core
+# docs--the platform APIs. Running javadoc on those APIs takes a significant amount
+# of time and memory. Setting the initial heap size as large as possible is important
+# to prevent thrashing as the heap grows. Setting the maximum as large as necessary
+# is also important to keep the job from failing.
+#
+#    -J-Xmx512 sets a maximum of 512, which became necessary in 6.0
+#    -J-Xms256 sets starting size to 256 (default is 8)
+#
+# rel-coredocs also includes a sanity check to help ensure that BUILD_NUMBER and
+# MILESTONE are specified properly when docs are built outside of the normal release
+# engineering process, with the intention of releasing them on the web or in a downloaded
+# docs bundle. (When invoked in release engineering's control build, the values are always
+# set properly. But when the targets are run by themselves, they default to b00 and
+# "internal"--which silently sabotage the result of a build that can take many hours
+# to complete.
+
+# Maximize performance and ensure that build number & milestone are set.
+
+rel-coredocs: sanitycheckcoredocs
+	$(MAKE) coredocs
+
+rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
+#
+# end of production targets
+
+otherdocs: $(ALL_OTHER_TARGETS)
+
+clean:
+	$(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
+
+#############################################################
+# DEBUG TARGET
+# List the values defined in the makefile hierarchy, to make sure everything
+# is set properly, and to help identify values we can use instead of making new ones.
+# (Most of them come from common/shared/Defs.gmk)
+#
+# Notes:
+# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
+# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
+#
+
+#############################################################
+.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
+    sanitycheckcoredocs $(ALL_OTHER_TARGETS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/Jprt.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,248 @@
+#
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This file is included by the root NewerMakefile and contains targets
+# and utilities needed by JPRT.
+
+# Utilities used in this Makefile. Most of this makefile executes without
+# the context of a spec file from configure.
+CAT=cat
+CMP=cmp
+CP=cp
+ECHO=echo
+MKDIR=mkdir
+PRINTF=printf
+PWD=pwd
+# Insure we have a path that looks like it came from pwd
+# (This is mostly for Windows sake and drive letters)
+define UnixPath # path
+$(shell (cd "$1" && $(PWD)))
+endef
+
+BUILD_DIR_ROOT:=$(root_dir)/build
+
+ifdef OPENJDK
+  OPEN_BUILD=true
+else
+  OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
+      $(wildcard $(root_dir)/jdk/make/closed), \
+      $(wildcard $(root_dir)/jdk/test/closed), \
+      $(wildcard $(root_dir)/hotspot/src/closed), \
+      $(wildcard $(root_dir)/hotspot/make/closed), \
+      $(wildcard $(root_dir)/hotspot/test/closed)), \
+      false,true)
+endif
+
+HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
+
+###########################################################################
+# To help in adoption of the new configure&&make build process, a bridge
+# build will use the old settings to run configure and do the build.
+
+# Build with the configure bridge. After running configure, restart make
+# to parse the new spec file.
+BRIDGE_TARGETS := all
+# Add bootcycle-images target if legacy variable is set.
+ifeq ($(SKIP_BOOT_CYCLE),false)
+  BRIDGE_TARGETS += bootcycle-images
+endif
+bridgeBuild: bridge2configure
+	@cd $(root_dir) && $(MAKE) -f Makefile $(BRIDGE_TARGETS)
+
+# Bridge from old Makefile ALT settings to configure options
+bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
+	bash ./configure $(strip $(shell $(CAT) $<))
+
+# Create a file with configure options created from old Makefile mechanisms.
+$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
+	$(RM) $@
+	$(CP) $< $@
+
+# Use this file to only change when obvious things have changed
+$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
+	$(RM) $@.tmp
+	$(MKDIR) -p $(BUILD_DIR_ROOT)
+	@$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
+        ifdef ARCH_DATA_MODEL
+	  @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
+        endif
+        ifeq ($(ARCH_DATA_MODEL),32)
+	  @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
+        endif
+        ifdef ALT_PARALLEL_COMPILE_JOBS
+	  @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
+        endif
+        ifdef ALT_BOOTDIR
+	  @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
+        endif
+        ifdef ALT_CUPS_HEADERS_PATH
+	  @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
+        endif
+        ifdef ALT_FREETYPE_HEADERS_PATH
+	  @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
+        endif
+        ifdef ENABLE_SJAVAC
+	  @$(ECHO) " --enable-sjavac" >> $@.tmp
+        endif
+        ifeq ($(HOTSPOT_AVAILABLE),false)
+          ifdef ALT_JDK_IMPORT_PATH
+	    @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
+          endif
+        endif
+        ifeq ($(OPEN_BUILD),true)
+	  @$(ECHO) " --enable-openjdk-only " >> $@.tmp
+        else
+#         Todo: move to closed?
+          ifdef ALT_MOZILLA_HEADERS_PATH
+	    @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
+          endif
+          ifdef ALT_JUNIT_DIR
+	    @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
+          endif
+          ifdef ANT_HOME
+	    @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
+          endif
+          ifdef ALT_JAVAFX_ZIP_DIR
+	    @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
+          endif
+          ifdef ALT_JMC_ZIP_DIR
+	    @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
+          endif
+          ifdef ALT_WIXDIR
+	    @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
+          endif
+          ifdef ALT_INSTALL_LZMA_PATH
+	    @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
+          endif
+          ifdef ALT_INSTALL_UPX_PATH
+	    @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
+          endif
+          ifdef ALT_INSTALL_UPX_FILENAME
+	    @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
+          endif
+          ifdef ALT_CCSS_SIGNING_DIR
+	    @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
+          endif
+          ifdef ALT_SLASH_JAVA
+	    @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
+          endif
+          ifdef ALT_SPARKLE_FRAMEWORK_DIR
+	    @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
+          endif
+        endif
+	@if [ -f $@ ] ; then \
+	  if ! $(CMP) $@ $@.tmp > /dev/null ; then \
+	    $(CP) $@.tmp $@ ; \
+	  fi ; \
+	else \
+	  $(CP) $@.tmp $@ ; \
+	fi
+	$(RM) $@.tmp
+
+PHONY_LIST += bridge2configure bridgeBuild
+
+###########################################################################
+# JPRT targets
+
+ifndef JPRT_ARCHIVE_BUNDLE
+  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
+endif
+ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
+  JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
+endif
+
+# These targets execute in a SPEC free context, before calling bridgeBuild
+# to generate the SPEC.
+jprt_build_product: DEBUG_LEVEL=release
+jprt_build_product: BUILD_DIRNAME=*-release
+jprt_build_product: jprt_build_generic
+
+jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
+jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
+jprt_build_fastdebug: jprt_build_generic
+
+jprt_build_debug: DEBUG_LEVEL=slowdebug
+jprt_build_debug: BUILD_DIRNAME=*-debug
+jprt_build_debug: jprt_build_generic
+
+jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
+jprt_build_generic: bridgeBuild
+
+# This target must be called in the context of a SPEC file
+jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
+	@$(call CheckIfMakeAtEnd)
+
+# This target must be called in the context of a SPEC file
+$(JPRT_ARCHIVE_BUNDLE): bundles
+	$(MKDIR) -p $(@D)
+	$(RM) $@
+	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
+
+SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
+SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
+SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
+SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
+
+# Bundle up the images
+bundles: all bundles-only
+bundles-only: start-make
+	@$(call TargetEnter)
+	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
+	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
+	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
+	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
+	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
+	fi
+	@$(call TargetExit)
+
+# Copy images to one unified location regardless of platform etc.
+final-images: all final-images-only
+final-images-only: start-make
+	@$(call TargetEnter)
+	$(RM) -r $(BUILD_OUTPUT)/final-images
+	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
+	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
+	$(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
+	$(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
+        ifeq ($(OPENJDK_TARGET_OS),macosx)
+	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
+	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
+	  $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
+	  $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
+        endif
+	@$(call TargetExit)
+
+
+# Keep track of phony targets
+PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
+    jprt_build_generic bundles jprt_bundle \
+    final-images final-images-only
+
+###########################################################################
+# Phony targets
+.PHONY: $(PHONY_LIST)
+
+# Force target
+FRC:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/Main.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,245 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
+
+# Now load the spec
+include $(SPEC)
+
+# Load the vital tools for all the makefiles.
+include $(SRC_ROOT)/make/common/MakeBase.gmk
+
+# Include the corresponding custom file, if present.
+-include $(CUSTOM_MAKE_DIR)/Main.gmk
+
+### Clean up from previous run
+
+# Remove any build.log from a previous run, if they exist
+ifneq (,$(BUILD_LOG))
+  ifneq (,$(BUILD_LOG_PREVIOUS))
+    # Rotate old log
+    $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+    $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
+  else
+    $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
+  endif
+  $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
+endif
+# Remove any javac server logs and port files. This
+# prevents a new make run to reuse the previous servers.
+ifneq (,$(SJAVAC_SERVER_DIR))
+  $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
+endif
+
+# Reset the build timers.
+$(eval $(call ResetAllTimers))
+
+# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
+# hence this workaround.
+MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
+
+### Main targets
+
+default: jdk
+	@$(call CheckIfMakeAtEnd)
+
+all: images docs
+	@$(call CheckIfMakeAtEnd)
+
+# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
+# is up to date after changes to configure
+$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
+	@$(ECHO) ERROR: $(SPEC) is not up to date
+	@$(ECHO) Please rerun configure!
+	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
+
+start-make: $(SPEC)
+	@$(call AtMakeStart)
+
+langtools: langtools-only
+langtools-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(LANGTOOLS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
+	@$(call TargetExit)
+
+corba: langtools corba-only
+corba-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(CORBA_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
+	@$(call TargetExit)
+
+jaxp: langtools jaxp-only
+jaxp-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JAXP_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
+	@$(call TargetExit)
+
+jaxws: langtools jaxp jaxws-only
+jaxws-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JAXWS_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
+	@$(call TargetExit)
+
+ifeq ($(BUILD_HOTSPOT),true)
+  hotspot: hotspot-only
+  hotspot-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
+	@$(call TargetExit)
+endif
+
+jdk: langtools hotspot corba jaxp jaxws jdk-only
+jdk-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
+	@$(call TargetExit)
+
+nashorn: jdk nashorn-only
+nashorn-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(NASHORN_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
+	@$(call TargetExit)
+
+demos: jdk demos-only
+demos-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
+	@$(call TargetExit)
+
+# Note: This double-colon rule is intentional, to support
+# custom make file integration.
+images:: source-tips demos nashorn images-only
+images-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
+	@$(call TargetExit)
+
+overlay-images: source-tips demos overlay-images-only
+overlay-images-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
+	@$(call TargetExit)
+
+profiles: profiles-oscheck source-tips jdk hotspot profiles-only
+profiles-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
+	@$(call TargetExit)
+
+profiles-oscheck:
+        ifneq ($(OPENJDK_TARGET_OS), linux)
+	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
+        endif
+
+install: images install-only
+install-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
+	@$(call TargetExit)
+
+docs: jdk docs-only
+docs-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(SRC_ROOT)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
+	@$(call TargetExit)
+
+sign-jars: jdk sign-jars-only
+sign-jars-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(JDK_TOPDIR)/make && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
+	@$(call TargetExit)
+
+bootcycle-images: images bootcycle-images-only
+bootcycle-images-only: start-make
+	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
+	@($(CD) $(SRC_ROOT) && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
+
+test: images test-only
+test-only: start-make
+	@$(call TargetEnter)
+	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
+	@$(call TargetExit)
+
+# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
+# used to track the exact sources used to build that image.
+source-tips: $(OUTPUT_ROOT)/source_tips
+$(OUTPUT_ROOT)/source_tips: FRC
+	@$(MKDIR) -p $(@D)
+	@$(RM) $@
+	@$(call GetSourceTips)
+
+
+# Remove everything, except the output from configure.
+clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
+	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
+	@$(ECHO) Cleaned all build artifacts.
+
+# Remove everything, including configure configuration.
+# If the output directory was created by configure and now becomes empty, remove it as well.
+# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
+dist-clean: clean
+	@($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
+	@$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
+	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
+	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
+	  else \
+	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
+	  fi \
+	)
+	@$(ECHO) Cleaned everything, you will have to re-run configure.
+
+clean-langtools:
+	$(call CleanComponent,langtools)
+clean-corba:
+	$(call CleanComponent,corba)
+clean-jaxp:
+	$(call CleanComponent,jaxp)
+clean-jaxws:
+	$(call CleanComponent,jaxws)
+clean-hotspot:
+	$(call CleanComponent,hotspot)
+clean-jdk:
+	$(call CleanComponent,jdk)
+clean-nashorn:
+	$(call CleanComponent,nashorn)
+clean-images:
+	$(call CleanComponent,images)
+clean-overlay-images:
+	$(call CleanComponent,overlay-images)
+clean-bootcycle-build:
+	$(call CleanComponent,bootcycle-build)
+clean-docs:
+	$(call CleanComponent,docs)
+	$(call CleanComponent,docstemp)
+clean-test:
+	$(call CleanComponent,testoutput)
+
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
+.PHONY: default all clean dist-clean bootcycle-images start-make
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
+.PHONY: profiles profiles-only profiles-oscheck
+
+FRC: # Force target
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/MakeHelpers.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,306 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################
+#
+# This file contains helper functions for the top-level Makefile that does
+# not depend on the spec.gmk file having been read. (The purpose of this
+# file is ju to avoid cluttering the top-level Makefile.)
+#
+################################################################
+
+ifndef _MAKEHELPERS_GMK
+_MAKEHELPERS_GMK := 1
+
+##############################
+# Stuff to run at include time
+##############################
+
+# Find out which variables were passed explicitely on the make command line. These
+# will be passed on to sub-makes, overriding spec.gmk settings.
+MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var)))
+
+list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
+list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
+
+# Store the build times in this directory.
+BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
+
+# Global targets are possible to run either with or without a SPEC. The prototypical
+# global target is "help".
+global_targets=help jprt% bridgeBuild
+
+##############################
+# Functions
+##############################
+
+define CheckEnvironment
+        # Find all environment or command line variables that begin with ALT.
+	$(if $(list_alt_overrides),
+	  @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n"
+	  @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n"
+	  @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n\n"
+	)
+endef
+
+### Functions for timers
+
+# Record starting time for build of a sub repository.
+define RecordStartTime
+	$(MKDIR) -p $(BUILDTIMESDIR)
+	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
+	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
+endef
+
+# Record ending time and calculate the difference and store it in a
+# easy to read format. Handles builds that cross midnight. Expects
+# that a build will never take 24 hours or more.
+define RecordEndTime
+	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
+	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
+	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
+	    $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
+	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
+	    > $(BUILDTIMESDIR)/build_time_diff_$1
+endef
+
+# Find all build_time_* files and print their contents in a list sorted
+# on the name of the sub repository.
+define ReportBuildTimes
+	$(BUILD_LOG_WRAPPER) $(PRINTF) -- "----- Build times -------\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
+	    "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
+	    "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
+	    "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
+	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
+endef
+
+define ResetAllTimers
+  $$(shell $(MKDIR) -p $(BUILDTIMESDIR) && $(RM) $(BUILDTIMESDIR)/build_time_*)
+endef
+
+define StartGlobalTimer
+	$(call RecordStartTime,TOTAL)
+endef
+
+define StopGlobalTimer
+	$(call RecordEndTime,TOTAL)
+endef
+
+### Functions for managing makefile structure (start/end of makefile and individual targets)
+
+# Do not indent this function, this will add whitespace at the start which the caller won't handle
+define GetRealTarget
+$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
+endef
+
+# Do not indent this function, this will add whitespace at the start which the caller won't handle
+define LastGoal
+$(strip $(lastword $(call GetRealTarget)))
+endef
+
+# Check if the current target is the final target, as specified by
+# the user on the command line. If so, call AtRootMakeEnd.
+define CheckIfMakeAtEnd
+        # Check if the current target is the last goal
+	$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
+        # If the target is 'foo-only', check if our goal was stated as 'foo'
+	$(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
+endef
+
+# Hook to be called when starting to execute a top-level target
+define TargetEnter
+	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
+	$(call RecordStartTime,$(patsubst %-only,%,$@))
+endef
+
+# Hook to be called when finish executing a top-level target
+define TargetExit
+	$(call RecordEndTime,$(patsubst %-only,%,$@))
+	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
+	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
+	$(call CheckIfMakeAtEnd)
+endef
+
+# Hook to be called as the very first thing when running a normal build
+define AtMakeStart
+	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
+	$(call CheckEnvironment)
+	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
+	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
+	$(call StartGlobalTimer)
+endef
+
+# Hook to be called as the very last thing for targets that are "top level" targets
+define AtMakeEnd
+	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && echo Stopping sjavac server && $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
+	$(call StopGlobalTimer)
+	$(call ReportBuildTimes)
+	@$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
+	$(call CheckEnvironment)
+endef
+
+### Functions for parsing and setting up make options from command-line
+
+define FatalError
+  # If the user specificed a "global" target (e.g. 'help'), do not exit but continue running
+  $$(if $$(filter-out $(global_targets),$$(call GetRealTarget)),$$(error Cannot continue))
+endef
+
+define ParseLogLevel
+  ifeq ($$(origin VERBOSE),undefined)
+    # Setup logging according to LOG (but only if VERBOSE is not given)
+
+    # If the "nofile" argument is given, act on it and strip it away
+    ifneq ($$(findstring nofile,$$(LOG)),)
+      # Reset the build log wrapper, regardless of other values
+      override BUILD_LOG_WRAPPER=
+      # COMMA is defined in spec.gmk, but that is not included yet
+      COMMA=,
+      # First try to remove ",nofile" if it exists
+      LOG_STRIPPED1=$$(subst $$(COMMA)nofile,,$$(LOG))
+      # Otherwise just remove "nofile"
+      LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1))
+      # We might have ended up with a leading comma. Remove it
+      LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2)))
+      LOG_LEVEL:=$$(LOG_STRIPPED3)
+    else
+      LOG_LEVEL:=$$(LOG)
+    endif
+
+    ifeq ($$(LOG_LEVEL),)
+      # Set LOG to "warn" as default if not set (and no VERBOSE given)
+      override LOG_LEVEL=warn
+    endif
+    ifeq ($$(LOG_LEVEL),warn)
+      VERBOSE=-s
+    else ifeq ($$(LOG_LEVEL),info)
+      VERBOSE=-s
+    else ifeq ($$(LOG_LEVEL),debug)
+      VERBOSE=
+    else ifeq ($$(LOG_LEVEL),trace)
+      VERBOSE=
+    else
+      $$(info Error: LOG must be one of: warn, info, debug or trace.)
+      $$(eval $$(call FatalError))
+    endif
+  else
+    # Provide resonable interpretations of LOG_LEVEL if VERBOSE is given.
+    ifeq ($(VERBOSE),)
+      LOG_LEVEL:=debug
+    else
+      LOG_LEVEL:=warn
+    endif
+    ifneq ($$(LOG),)
+      # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves,
+      # but complain if this is the top-level make call.
+      ifeq ($$(MAKELEVEL),0)
+        $$(info Cannot use LOG=$$(LOG) and VERBOSE=$$(VERBOSE) at the same time. Choose one.)
+        $$(eval $$(call FatalError))
+      endif
+    endif
+  endif
+endef
+
+define ParseConfAndSpec
+  ifneq ($$(filter-out $(global_targets),$$(call GetRealTarget)),)
+    # If we only have global targets, no need to bother with SPEC or CONF
+    ifneq ($$(origin SPEC),undefined)
+      # We have been given a SPEC, check that it works out properly
+      ifeq ($$(wildcard $$(SPEC)),)
+        $$(info Cannot locate spec.gmk, given by SPEC=$$(SPEC))
+        $$(eval $$(call FatalError))
+      endif
+      ifneq ($$(origin CONF),undefined)
+        # We also have a CONF argument. This is OK only if this is a repeated call by ourselves,
+        # but complain if this is the top-level make call.
+        ifeq ($$(MAKELEVEL),0)
+          $$(info Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
+          $$(eval $$(call FatalError))
+        endif
+      endif
+      # ... OK, we're satisfied, we'll use this SPEC later on
+    else
+      # Find all spec.gmk files in the build output directory
+      output_dir=$$(root_dir)/build
+      all_spec_files=$$(wildcard $$(output_dir)/*/spec.gmk)
+      ifeq ($$(all_spec_files),)
+        $$(info No configurations found for $$(root_dir)! Please run configure to create a configuration.)
+        $$(eval $$(call FatalError))
+      endif
+      # Extract the configuration names from the path
+      all_confs=$$(patsubst %/spec.gmk,%,$$(patsubst $$(output_dir)/%,%,$$(all_spec_files)))
+
+      ifneq ($$(origin CONF),undefined)
+        # User have given a CONF= argument.
+        ifeq ($$(CONF),)
+          # If given CONF=, match all configurations
+          matching_confs=$$(strip $$(all_confs))
+        else
+          # Otherwise select those that contain the given CONF string
+          matching_confs=$$(strip $$(foreach var,$$(all_confs),$$(if $$(findstring $$(CONF),$$(var)),$$(var))))
+        endif
+        ifeq ($$(matching_confs),)
+          $$(info No configurations found matching CONF=$$(CONF))
+          $$(info Available configurations:)
+          $$(foreach var,$$(all_confs),$$(info * $$(var)))
+          $$(eval $$(call FatalError))
+        else
+          ifeq ($$(words $$(matching_confs)),1)
+            $$(info Building '$$(matching_confs)' (matching CONF=$$(CONF)))
+          else
+            $$(info Building target '$(call GetRealTarget)' in the following configurations (matching CONF=$$(CONF)):)
+            $$(foreach var,$$(matching_confs),$$(info * $$(var)))
+          endif
+        endif
+
+        # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
+        SPEC=$$(addsuffix /spec.gmk,$$(addprefix $$(output_dir)/,$$(matching_confs)))
+      else
+        # No CONF or SPEC given, check the available configurations
+        ifneq ($$(words $$(all_spec_files)),1)
+          $$(info No CONF given, but more than one configuration found in $$(output_dir).)
+          $$(info Available configurations:)
+          $$(foreach var,$$(all_confs),$$(info * $$(var)))
+          $$(info Please retry building with CONF=<config pattern> (or SPEC=<specfile>))
+          $$(eval $$(call FatalError))
+        endif
+
+        # We found exactly one configuration, use it
+        SPEC=$$(strip $$(all_spec_files))
+      endif
+    endif
+  endif
+endef
+
+### Convenience functions from Main.gmk
+
+# Cleans the component given as $1
+define CleanComponent
+	@$(PRINTF) "Cleaning $1 build artifacts ..."
+	@($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
+	@$(PRINTF) " done\n"
+endef
+
+endif # _MAKEHELPERS_GMK
--- a/make/README.pre-components	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-README-pre-components:
----------------------
-Current pre-components are langtools, jaxws, jaxp, and corba.
-
-Pre-components can use ant to build but must have a make/Makefile for
-building (a GNU make Makefile).
-All ant knowledge is being isolated in the workspaces that use it.
-
-Also for various reasons it is nice to have a Makefile wrapper over the
-running of ant, but in general having to do
-anything with shell commands is much easier to do in a Makefile
-than in an ant script.
-
-The make/makefile rules are:
-
- Variables:
-  ALT_BOOTDIR           The jdk home to use to build, if provided
-  ALT_LANGTOOLS_DIST    The dist area from a langtools build to use, if provided
-  ALT_OUTPUTDIR         Parent dir of build and dist directories, if provided
-  VARIANT               If DBG, debug build, if OPT, optimized build
-  TARGET_CLASS_VERSION  The classfile version number (currently 7)
-  ANT_HOME              Home of ant to use, if provided
-  QUIET                 If defined, be quiet
-  VERBOSE               If defined, be verbose
-  JDK_VERSION           Version being built
-  FULL_VERSION          Full version string for this jdk build
-  MILESTONE             fcs, beta, internal or empty
-  BUILD_NUMBER          Number of the jdk build
-  JPRT_ARCHIVE_BUNDLE   Path to zip bundle to create for JPRT
-
- Targets:
-  all                   Build everything, including dist
-  build                 Build build area
-  clean                 Clean up
-  clobber               Same as clean (don't ask)
-  sanity                Perform any sanity checks, exit non-zero if errors
-  jprt_build_product    JPRT product build, zip results into JPRT_ARCHIVE_BUNDLE
-  jprt_build_debug      JPRT debug build, zip results into JPRT_ARCHIVE_BUNDLE
-  jprt_build_fastdebug  JPRT fastdebug build, zip results into JPRT_ARCHIVE_BUNDLE
-
-Then of course we expect a dist/lib/classes.jar, dist/lib/src.zip and dist/lib/bin.zip.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/CORE_PKGS.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,300 @@
+#
+# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# EXCLUDE_PKGS is the list of packages to exclude from the
+# Java API Specification. Do not add these to CORE_PKGS.
+# The concatenation of EXCLUDE_PKGS and CORE_PKGS
+# should make up the list of all packages under the
+# src/shared/classes directory of the JDK source tree.
+#
+EXCLUDE_PKGS = \
+    java.awt.peer \
+    java.awt.dnd.peer \
+    sun.* \
+    com.sun.* \
+    org.apache.* \
+    org.jcp.* \
+    org.w3c.dom.css \
+    org.w3c.dom.html \
+    org.w3c.dom.stylesheets \
+    org.w3c.dom.traversal \
+    org.w3c.dom.ranges \
+    org.omg.stub.javax.management.remote.rmi
+
+#
+# ACTIVE_JSR_PKGS are packages that are part of an active JSR process--
+# one that is doing its own review. These packages are not included when
+# creating diff pages for the platform's JCP process.
+#
+# (see /java/pubs/apisrc/jdk/6.0/beta/make/docs/active_jsr_pkgs)
+# Note:
+# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
+#
+ACTIVE_JSR_PKGS= \
+    java.lang.invoke \
+    java.sql \
+    javax.activation \
+    javax.annotation.* \
+    javax.jws.* \
+    javax.lang.* \
+    javax.management.* \
+    javax.script \
+    javax.sql.* \
+    javax.tools.* \
+    javax.xml.* \
+    org.w3c.* \
+    org.xml.sax
+
+#
+# CORE_PKGS is the list of packages that form the
+# Java API Specification.
+#
+### ***IMPORTANT NOTE***
+### There is also a "REGEXP" variable in the docs/makefile that
+### determines which table the packages go in on the main page.
+### Currently, there is only table ("Platform Packages") and
+### everything goes in it, so REGEXP is "*". But if that policy
+### changes, packages added will need to be reflected in that
+### list of wildcard expressions, as well.
+###
+CORE_PKGS = \
+    java.applet \
+    java.awt \
+    java.awt.color \
+    java.awt.datatransfer \
+    java.awt.dnd \
+    java.awt.event \
+    java.awt.font \
+    java.awt.geom \
+    java.awt.im \
+    java.awt.im.spi \
+    java.awt.image \
+    java.awt.image.renderable \
+    java.awt.print \
+    java.beans \
+    java.beans.beancontext \
+    java.io \
+    java.lang \
+    java.lang.annotation \
+    java.lang.instrument \
+    java.lang.invoke \
+    java.lang.management \
+    java.lang.ref \
+    java.lang.reflect \
+    java.math \
+    java.net \
+    java.nio \
+    java.nio.channels \
+    java.nio.channels.spi \
+    java.nio.charset \
+    java.nio.charset.spi \
+    java.nio.file \
+    java.nio.file.attribute \
+    java.nio.file.spi \
+    java.rmi \
+    java.rmi.activation \
+    java.rmi.dgc \
+    java.rmi.registry \
+    java.rmi.server \
+    java.security \
+    java.security.acl \
+    java.security.cert \
+    java.security.interfaces \
+    java.security.spec \
+    java.sql \
+    java.text \
+    java.text.spi \
+    java.time \
+    java.time.chrono \
+    java.time.format \
+    java.time.temporal \
+    java.time.zone \
+    java.util \
+    java.util.concurrent \
+    java.util.concurrent.atomic \
+    java.util.concurrent.locks \
+    java.util.function \
+    java.util.jar \
+    java.util.logging \
+    java.util.prefs \
+    java.util.regex \
+    java.util.spi \
+    java.util.stream \
+    java.util.zip \
+    javax.accessibility \
+    javax.activation \
+    javax.activity \
+    javax.annotation \
+    javax.annotation.processing \
+    javax.crypto \
+    javax.crypto.interfaces \
+    javax.crypto.spec \
+    javax.imageio \
+    javax.imageio.event \
+    javax.imageio.metadata \
+    javax.imageio.plugins.jpeg \
+    javax.imageio.plugins.bmp \
+    javax.imageio.spi \
+    javax.imageio.stream \
+    javax.jws \
+    javax.jws.soap \
+    javax.lang.model \
+    javax.lang.model.element \
+    javax.lang.model.type \
+    javax.lang.model.util \
+    javax.management \
+    javax.management.loading \
+    javax.management.monitor \
+    javax.management.relation \
+    javax.management.openmbean \
+    javax.management.timer \
+    javax.management.modelmbean \
+    javax.management.remote \
+    javax.management.remote.rmi \
+    javax.naming \
+    javax.naming.directory \
+    javax.naming.event \
+    javax.naming.ldap \
+    javax.naming.spi \
+    javax.net \
+    javax.net.ssl \
+    javax.print \
+    javax.print.attribute \
+    javax.print.attribute.standard \
+    javax.print.event \
+    javax.rmi \
+    javax.rmi.CORBA \
+    javax.rmi.ssl \
+    javax.script \
+    javax.security.auth \
+    javax.security.auth.callback \
+    javax.security.auth.kerberos \
+    javax.security.auth.login \
+    javax.security.auth.spi \
+    javax.security.auth.x500 \
+    javax.security.cert \
+    javax.security.sasl \
+    javax.sound.sampled \
+    javax.sound.sampled.spi \
+    javax.sound.midi \
+    javax.sound.midi.spi \
+    javax.sql \
+    javax.sql.rowset \
+    javax.sql.rowset.serial \
+    javax.sql.rowset.spi \
+    javax.swing \
+    javax.swing.border \
+    javax.swing.colorchooser \
+    javax.swing.filechooser \
+    javax.swing.event \
+    javax.swing.table \
+    javax.swing.text \
+    javax.swing.text.html \
+    javax.swing.text.html.parser \
+    javax.swing.text.rtf \
+    javax.swing.tree \
+    javax.swing.undo \
+    javax.swing.plaf \
+    javax.swing.plaf.basic \
+    javax.swing.plaf.metal \
+    javax.swing.plaf.multi \
+    javax.swing.plaf.nimbus \
+    javax.swing.plaf.synth \
+    javax.tools \
+    javax.tools.annotation \
+    javax.transaction \
+    javax.transaction.xa \
+    javax.xml.parsers \
+    javax.xml.bind \
+    javax.xml.bind.annotation \
+    javax.xml.bind.annotation.adapters \
+    javax.xml.bind.attachment \
+    javax.xml.bind.helpers \
+    javax.xml.bind.util \
+    javax.xml.soap \
+    javax.xml.ws \
+    javax.xml.ws.handler \
+    javax.xml.ws.handler.soap \
+    javax.xml.ws.http \
+    javax.xml.ws.soap \
+    javax.xml.ws.spi \
+    javax.xml.ws.spi.http \
+    javax.xml.ws.wsaddressing \
+    javax.xml.transform \
+    javax.xml.transform.sax \
+    javax.xml.transform.dom \
+    javax.xml.transform.stax \
+    javax.xml.transform.stream \
+    javax.xml \
+    javax.xml.crypto \
+    javax.xml.crypto.dom \
+    javax.xml.crypto.dsig \
+    javax.xml.crypto.dsig.dom \
+    javax.xml.crypto.dsig.keyinfo \
+    javax.xml.crypto.dsig.spec \
+    javax.xml.datatype \
+    javax.xml.validation \
+    javax.xml.namespace \
+    javax.xml.xpath \
+    javax.xml.stream \
+    javax.xml.stream.events \
+    javax.xml.stream.util \
+    org.ietf.jgss \
+    org.omg.CORBA \
+    org.omg.CORBA.DynAnyPackage \
+    org.omg.CORBA.ORBPackage \
+    org.omg.CORBA.TypeCodePackage \
+    org.omg.stub.java.rmi \
+    org.omg.CORBA.portable \
+    org.omg.CORBA_2_3 \
+    org.omg.CORBA_2_3.portable \
+    org.omg.CosNaming \
+    org.omg.CosNaming.NamingContextExtPackage \
+    org.omg.CosNaming.NamingContextPackage \
+    org.omg.SendingContext \
+    org.omg.PortableServer \
+    org.omg.PortableServer.CurrentPackage \
+    org.omg.PortableServer.POAPackage \
+    org.omg.PortableServer.POAManagerPackage \
+    org.omg.PortableServer.ServantLocatorPackage \
+    org.omg.PortableServer.portable \
+    org.omg.PortableInterceptor \
+    org.omg.PortableInterceptor.ORBInitInfoPackage \
+    org.omg.Messaging \
+    org.omg.IOP \
+    org.omg.IOP.CodecFactoryPackage \
+    org.omg.IOP.CodecPackage \
+    org.omg.Dynamic \
+    org.omg.DynamicAny \
+    org.omg.DynamicAny.DynAnyPackage \
+    org.omg.DynamicAny.DynAnyFactoryPackage \
+    org.w3c.dom \
+    org.w3c.dom.events \
+    org.w3c.dom.bootstrap \
+    org.w3c.dom.ls \
+    org.w3c.dom.views \
+    org.xml.sax \
+    org.xml.sax.ext \
+    org.xml.sax.helpers
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/IdlCompilation.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,106 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+PREFIXES=-pkgPrefix CORBA org.omg \
+    -pkgPrefix CosNaming org.omg \
+    -pkgPrefix CosTransactions org.omg \
+    -pkgPrefix CosTSInteroperation org.omg \
+    -pkgPrefix DynamicAny org.omg \
+    -pkgPrefix Dynamic org.omg \
+    -pkgPrefix IOP org.omg \
+    -pkgPrefix Messaging org.omg \
+    -pkgPrefix PortableInterceptor org.omg \
+    -pkgPrefix PortableServer org.omg \
+    -pkgPrefix activation com.sun.corba.se.spi \
+    -pkgPrefix GIOP com.sun.corba.se \
+    -pkgPrefix PortableActivationIDL com.sun.corba.se \
+    -pkgPrefix messages com.sun.corba.se
+
+define add_idl_package
+  # param 1 = MYPACKAGE
+  # param 2 = src root
+  # param 3 = gensrc root
+  # param 4 = source idl to compile
+  # param 5 = target idl package
+  # param 6 = delete these files that were output from the idlj
+  # param 7 = idls that match these patterns should be compiled with -oldImplBase
+  # param 8 = the idlj command
+  # Save the generated java files to a temporary directory so
+  # that we can find them and create proper dependencies.
+  # After that, we move them to the real gensrc target dir.
+  $4_TMPDIR:=tmp___$(subst /,_,$(patsubst $2/%,%,$4))___
+  ifneq ($$(filter $7,$4),)
+    $4_OLDIMPLBASE:=-oldImplBase
+    $4_OLDIMPLBASE_MSG:=with -oldImplBase
+  endif
+  $5 : $4
+	$(MKDIR) -p $3/$$($4_TMPDIR)
+	$(RM) -rf $3/$$($4_TMPDIR)
+	$(MKDIR) -p $(dir $5)
+	$(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4)
+	$8 -td $3/$$($4_TMPDIR) \
+	    -i $2/org/omg/CORBA \
+	    -i $2/org/omg/PortableInterceptor \
+	    -i $2/org/omg/PortableServer \
+	    -D CORBA3 -corba 3.0 \
+	    -fall \
+	    $$($4_OLDIMPLBASE) \
+	    $(PREFIXES) \
+	    $4
+	$(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
+	$(CP) -r $3/$$($4_TMPDIR)/* $3
+	($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5)
+	$(RM) -rf $3/$$($4_TMPDIR)
+endef
+
+define SetupIdlCompilation
+  # param 1 is for example BUILD_IDLS
+  # param 2,3,4,5,6,7,8 are named args.
+  #   IDLJ,SRC,BIN,INCLUDES,EXCLUDES,OLDIMPLBASES,DELETES
+  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+  $(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
+
+  # Find all existing java files and existing class files.
+  $$(eval $$(call MakeDir,$$($1_BIN)))
+  $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
+  $1_BINS := $$(shell find $$($1_BIN) -name "*.java")
+  # Prepend the source/bin path to the filter expressions.
+  $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES))
+  $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES))
+  $1_BIN_INCLUDES := $$(addprefix $$($1_BIN)/,$$($1_INCLUDES))
+  $1_BIN_EXCLUDES := $$(addprefix $$($1_BIN)/,$$($1_EXCLUDES))
+  $1_OLDIMPLBASES := $$(addprefix $$($1_SRC)/,$$($1_OLDIMPLBASES))
+  # Now remove unwanted java/class files.
+  $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
+  $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
+  $1_BINS := $$(filter $$($1_BIN_INCLUDES),$$($1_BINS))
+  $1_BINS := $$(filter-out $$($1_BIN_EXCLUDES),$$($1_BINS))
+  $1 := $$(sort $$(patsubst $$($1_SRC)/%.idl,$$($1_BIN)/%.idl.d,$$($1_SRCS)))
+  # Now create the dependencies for each idl target.
+  $$(foreach p,$$($1),$$(eval $$(call add_idl_package,$1,$$($1_SRC),$$($1_BIN),$$(patsubst $$($1_BIN)/%.idl.d,$$($1_SRC)/%.idl,$$p),$$p,$$($1_DELETES),$$($1_OLDIMPLBASES),$$($1_IDLJ))))
+endef
+
+.SUFFIXES: .java .class .package
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/JavaCompilation.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,592 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This makefile is much simpler now that it can use the smart javac wrapper
+# for dependency tracking between java packages and incremental compiles.
+# It could be even more simple if we added support for incremental jar updates
+# directly from the smart javac wrapper.
+
+# Cleaning/copying properties here is not a good solution. The properties
+# should be cleaned/copied by a annotation processor in sjavac.
+
+# When you read this source. Remember that $(sort ...) has the side effect
+# of removing duplicates. It is actually this side effect that is
+# desired whenever sort is used below!
+
+ifeq (,$(_MAKEBASE_GMK))
+  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
+endif
+
+FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
+
+define SetupJavaCompiler
+  # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
+  # This is the name of the compiler setup.
+  # param 2-9 are named args.
+  #   JVM:=The jvm used to run the javac/javah command
+  #   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
+  #   FLAGS:=Flags to be supplied to javac
+  #   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
+  #   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
+  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
+
+  # The port file contains the tcp/ip on which the server listens
+  # and the cookie necessary to talk to the server.
+  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
+  # You can use a different JVM to run the background javac server.
+  ifeq ($$($1_SERVER_JVM),)
+    # It defaults to the same JVM that is used to start the javac command.
+    $1_SERVER_JVM:=$$($1_JVM)
+  endif
+endef
+
+define SetupArchive
+  # param 1 is for example ARCHIVE_MYPACKAGE
+  # param 2 are the dependecies
+  # param 3,4,5,6,7,8,9 are named args.
+  #   SRCS:=List of directories in where to find files to add to archive
+  #   SUFFIXES:=File suffixes to include in jar
+  #   INCLUDES:=List of directories/packages in SRCS that should be included
+  #   EXCLUDES:=List of directories/packages in SRCS that should be excluded
+  #   EXCLUDE_FILES:=List of files in SRCS that should be excluded
+  #   EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
+  #   JAR:=Jar file to create
+  #   MANIFEST:=Optional manifest file template.
+  #   JARMAIN:=Optional main class to add to manifest
+  #   JARINDEX:=true means generate the index in the jar file.
+  #   SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
+  #       added to the archive.
+  #   EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
+  #   CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
+
+  # NOTE: $2 is dependencies, not a named argument!
+  $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+  $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
+  $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
+
+  $1_JARMAIN:=$(strip $$($1_JARMAIN))
+  $1_JARNAME:=$$(notdir $$($1_JAR))
+  $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
+  $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
+  $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
+  $1_BIN:=$$(dir $$($1_JAR))
+
+  ifeq (,$$($1_SUFFIXES))
+    # No suffix was set, default to classes.
+    $1_SUFFIXES:=.class
+  endif
+  # Convert suffixes to a find expression
+  $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
+  # On windows, a lot of includes/excludes risk making the command line too long, so
+  # writing the grep patterns to files.
+  ifneq (,$$($1_INCLUDES))
+    $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
+        $$(addprefix $$(src)/,$$($1_INCLUDES)))
+    # If there are a lot of include patterns, output to file to shorten command lines
+    ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
+      $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
+    else
+      $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
+          $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
+          >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
+      $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
+    endif
+  endif
+  ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
+    $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
+        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
+    # If there are a lot of include patterns, output to file to shorten command lines
+    ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
+      $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
+    else
+      $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
+          $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
+          >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
+      $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
+    endif
+  endif
+
+  # Check if this jar needs to have its index generated.
+  ifneq (,$$($1_JARINDEX))
+    $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
+  else
+    $1_JARINDEX = true
+  endif
+  # When this macro is run in the same makefile as the java compilation, dependencies are
+  # transfered in make variables. When the macro is run in a different makefile than the
+  # java compilation, the dependencies need to be found in the filesystem.
+  ifneq (,$2)
+    $1_DEPS:=$2
+  else
+    $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
+        $$(call CacheFind,$$($1_SRCS)))
+    ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
+      $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
+    endif
+    ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
+      $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
+    endif
+    # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
+    # lines, but not here for use in make dependencies.
+    $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
+    ifeq (,$$($1_SKIP_METAINF))
+      $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
+    endif
+  endif
+
+  # Utility macros, to make the shell script receipt somewhat easier to decipher.
+
+  # The capture contents macro finds all files (matching the patterns, typically
+  # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
+  $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+      (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
+          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
+      $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
+      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+  # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
+  ifeq (,$$($1_SKIP_METAINF))
+    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
+  endif
+  # The capture deletes macro finds all deleted files and concatenates them. The resulting file
+  # tells us what to remove from the jar-file.
+  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
+  # The update contents macro updates the jar file with the previously capture contents.
+  # xargs is used to trim the whitespace from the contents file, to see if it is empty.
+  $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+      (cd $$(src) && \
+       if [ -n "`$(CAT) _the.$$($1_JARNAME)_contents | $(XARGS)`" ]; then \
+         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
+         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
+       fi) $$(NEWLINE))
+  # The s-variants of the above macros are used when the jar is created from scratch.
+  $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+      (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
+          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
+      $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
+      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+
+  ifeq (,$$($1_SKIP_METAINF))
+    $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
+        ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
+        $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+  endif
+  $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
+      (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
+
+  # Use a slightly shorter name for logging, but with enough path to identify this jar.
+  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
+
+  ifneq (,$$($1_CHECK_COMPRESS_JAR))
+    $1_JAR_CREATE_OPTIONS := c0fm
+    $1_JAR_UPDATE_OPTIONS := u0f
+    ifeq ($(COMPRESS_JARS), true)
+      $1_JAR_CREATE_OPTIONS := cfm
+      $1_JAR_UPDATE_OPTIONS := uf
+    endif
+  else
+    $1_JAR_CREATE_OPTIONS := cfm
+    $1_JAR_UPDATE_OPTIONS := uf
+  endif
+
+  # Here is the rule that creates/updates the jar file.
+  $$($1_JAR) : $$($1_DEPS)
+	$(MKDIR) -p $$($1_BIN)
+	$$($1_GREP_INCLUDE_OUTPUT)
+	$$($1_GREP_EXCLUDE_OUTPUT)
+	$$(if $$($1_MANIFEST), \
+	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
+	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
+	, \
+	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
+	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
+	$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
+	$$(if $$(wildcard $$@), \
+	  $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
+	  $$($1_CAPTURE_CONTENTS) \
+	  $$($1_CAPTURE_METAINF) \
+	  $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
+	  $$($1_CAPTURE_DELETES) \
+	  $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
+	  if [ -s $$($1_DELETESS_FILE) ]; then \
+	    $(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
+	    $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
+	  fi $$(NEWLINE) \
+	  $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
+	  $$($1_JARINDEX) && true \
+	, \
+	  $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
+	  $$($1_SCAPTURE_CONTENTS) \
+	  $$($1_SCAPTURE_METAINF) \
+	  $$($1_SUPDATE_CONTENTS) \
+	  $$($1_JARINDEX) && true )
+
+endef
+
+define SetupZipArchive
+  # param 1 is for example ZIP_MYSOURCE
+  # param 2,3,4,5,6,7,8,9 are named args.
+  #   SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
+  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+  $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
+
+  # To avoid running find over too large sets of files, which causes make to crash
+  # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
+  # of directories to run find in, if available.
+  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
+    $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
+        $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
+  else
+    $1_FIND_LIST := $$($1_SRC)
+  endif
+
+  # Find all files in the source tree.
+  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
+
+  # Filter on suffixes if set
+  ifneq ($$($1_SUFFIXES),)
+    $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
+  endif
+
+  ifneq ($$($1_INCLUDES),)
+    ifneq ($$($1_SUFFIXES),)
+      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
+          $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
+    else
+      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
+    endif
+  endif
+  ifneq ($$($1_INCLUDE_FILES),)
+    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
+  endif
+  ifneq ($$($1_EXCLUDES),)
+    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
+    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
+  endif
+
+  # Use a slightly shorter name for logging, but with enough path to identify this zip.
+  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
+
+  # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
+  # I.e. the zip -i and -x options should match the filtering done in the makefile.
+  # Explicitly excluded files can be given with absolute path. The patsubst solution
+  # isn't perfect but the likelyhood of an absolute path to match something in a src
+  # dir is very small.
+  # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
+  # and only fail if it's not.
+  $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
+	$(MKDIR) -p $$(@D)
+	$(ECHO) Updating $$($1_NAME)
+	$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
+	$(TOUCH) $$@
+endef
+
+define add_file_to_copy
+  # param 1 = BUILD_MYPACKAGE
+  # parma 2 = The source file to copy.
+  $2_TARGET:=$2
+  # Remove the source prefix.
+  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
+  # Now we can setup the depency that will trigger the copying.
+  $$($1_BIN)$$($2_TARGET) : $2
+	$(MKDIR) -p $$(@D)
+	$(CP) $$< $$@
+	$(CHMOD) -f ug+w $$@
+
+  # And do not forget this target
+  $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
+endef
+
+
+# This macro is used only for properties files that are to be
+# copied over to the classes directory in cleaned form:
+# Previously this was inconsistently done in different repositories.
+# This is the new clean standard. Though it is to be superseded by
+# a standard annotation processor from with sjavac.
+define add_file_to_copy_and_clean
+  # param 1 = BUILD_MYPACKAGE
+  # parma 2 = The source file to copy and clean.
+  $2_TARGET:=$2
+  # Remove the source prefix.
+  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
+  # Now we can setup the depency that will trigger the copying.
+  $$($1_BIN)$$($2_TARGET) : $2
+	$(MKDIR) -p $$(@D)
+	$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
+	    | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
+	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
+	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
+	        -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
+	        -e 's/\\=/=/' | LANG=C $(SORT) > $$@
+	$(CHMOD) -f ug+w $$@
+
+  # And do not forget this target
+  $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
+endef
+
+define remove_string
+  $2 := $$(subst $1,,$$($2))
+endef
+
+define replace_space_with_pathsep
+  $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
+endef
+
+define SetupJavaCompilation
+  # param 1 is for example BUILD_MYPACKAGE
+  # param 2,3,4,5,6,7,8 are named args.
+  #   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
+  #   JVM:=path to ..bin/java
+  #   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
+  #   SRC:=one or more directories to search for sources
+  #   BIN:=store classes here
+  #   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
+  #   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
+  #   COPY:=.prp means copy all prp files to the corresponding package in BIN.
+  #   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
+  #   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
+  #   SRCZIP:=Create a src.zip based on the found sources and copied files.
+  #   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
+  #   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
+  #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
+  #   JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
+  #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
+  #   HEADERS:=path to directory where all generated c-headers are written.
+  #   DEPENDS:=Extra dependecy
+  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
+
+  # Extract the info from the java compiler setup.
+  $1_JVM := $$($$($1_SETUP)_JVM)
+  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
+  $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
+  ifeq ($$($1_JAVAC),)
+    $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
+  endif
+  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
+  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
+
+  # Handle addons and overrides.
+  $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
+  # Make sure the dirs exist.
+  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
+  $$(eval $$(call MakeDir,$$($1_BIN)))
+  # Find all files in the source trees.
+  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
+  # Extract the java files.
+  ifneq ($$($1_EXCLUDE_FILES),)
+    $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
+  endif
+  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
+  ifneq ($$($1_INCLUDE_FILES),)
+    $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
+    $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
+  endif
+
+  # Now we have a list of all java files to compile: $$($1_SRCS)
+
+  # Create the corresponding smart javac wrapper command line.
+  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
+      $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
+      $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
+      $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
+      -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
+
+  # Prepend the source/bin path to the filter expressions.
+  ifneq ($$($1_INCLUDES),)
+    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
+    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
+  endif
+  ifneq ($$($1_EXCLUDES),)
+    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
+  endif
+
+  # Find all files to be copied from source to bin.
+  ifneq (,$$($1_COPY))
+    # Search for all files to be copied.
+    $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
+    # Copy these explicitly
+    $1_ALL_COPIES += $$($1_COPY_FILES)
+    # Copy must also respect filters.
+    ifneq (,$$($1_INCLUDES))
+      $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
+    endif
+    ifneq (,$$($1_EXCLUDES))
+      $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
+    endif
+    ifneq (,$$($1_EXCLUDE_FILES))
+      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
+    endif
+    # All files below META-INF are always copied.
+    $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
+    ifneq (,$$($1_ALL_COPIES))
+      # Yep, there are files to be copied!
+      $1_ALL_COPY_TARGETS:=
+          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
+      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
+    endif
+  endif
+
+  # Find all property files to be copied and cleaned from source to bin.
+  ifneq (,$$($1_CLEAN))
+    # Search for all files to be copied.
+    $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
+    # Copy and clean must also respect filters.
+    ifneq (,$$($1_INCLUDES))
+      $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
+    endif
+    ifneq (,$$($1_EXCLUDES))
+      $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
+    endif
+    ifneq (,$$($1_EXCLUDE_FILES))
+      $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
+    endif
+    ifneq (,$$($1_ALL_CLEANS))
+      # Yep, there are files to be copied and cleaned!
+      $1_ALL_COPY_CLEAN_TARGETS:=
+          $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
+      # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
+    endif
+  endif
+
+  # Prep the source paths.
+  ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
+    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
+  else
+    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
+  endif
+
+  # Create a sed expression to remove the source roots and to replace / with .
+  # and remove .java at the end.
+  $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
+
+  ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
+    ifneq (,$$($1_HEADERS))
+      $1_HEADERS_ARG := -h $$($1_HEADERS)
+    endif
+
+    # Using sjavac to compile.
+    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
+
+    # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
+    # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
+    # and javac is simply replaced with sjavac.
+    $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
+
+    # Set the $1_REMOTE to spawn a background javac server.
+    $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
+
+    $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
+	$(MKDIR) -p $$(@D)
+	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
+	$(ECHO) Compiling $1
+	($$($1_JVM) $$($1_SJAVAC) \
+	    $$($1_REMOTE) \
+	    -j $(JOBS) \
+	    --permit-unidentified-artifacts \
+	    --permit-sources-without-package \
+	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
+	    --log=$(LOG_LEVEL) \
+	    $$($1_SJAVAC_ARGS) \
+	    $$($1_FLAGS) \
+	    $$($1_HEADERS_ARG) \
+	    -d $$($1_BIN) && \
+	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
+  else
+    # Using plain javac to batch compile everything.
+    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
+
+    # When building in batch, put headers in a temp dir to filter out those that actually
+    # changed before copying them to the real header dir.
+    ifneq (,$$($1_HEADERS))
+      $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
+
+      $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
+		$(MKDIR) -p $$(@D)
+		for f in `ls $$($1_HEADERS).tmp`; do \
+		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
+		    $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
+		  fi; \
+		done
+		$(RM) -r $$($1_HEADERS).tmp
+		$(TOUCH) $$@
+
+      $1 += $$($1_HEADERS)/_the.$1_headers
+    endif
+
+    # When not using sjavac, pass along all sources to javac using an @file.
+    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
+	$(MKDIR) -p $$(@D)
+	$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
+	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
+	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
+	($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
+	    -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
+	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
+	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
+
+  endif
+
+  # Check if a jar file was specified, then setup the rules for the jar.
+  ifneq (,$$($1_JAR))
+    # If no suffixes was explicitly set for this jar file.
+    # Use class and the cleaned/copied properties file suffixes as the default
+    # for the types of files to be put into the jar.
+    ifeq (,$$($1_SUFFIXES))
+      $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
+    endif
+
+    $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
+        SRCS:=$$($1_BIN), \
+        SUFFIXES:=$$($1_SUFFIXES), \
+        EXCLUDE:=$$($1_EXCLUDES), \
+        INCLUDES:=$$($1_INCLUDES), \
+        EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
+        JAR:=$$($1_JAR), \
+        JARMAIN:=$$($1_JARMAIN), \
+        MANIFEST:=$$($1_MANIFEST), \
+        EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
+        JARINDEX:=$$($1_JARINDEX), \
+        HEADERS:=$$($1_HEADERS), \
+        SETUP:=$$($1_SETUP)))
+  endif
+
+  # Check if a srczip was specified, then setup the rules for the srczip.
+  ifneq (,$$($1_SRCZIP))
+    $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
+        SRC:=$$($1_SRC), \
+        ZIP:=$$($1_SRCZIP), \
+        INCLUDES:=$$($1_INCLUDES), \
+        EXCLUDES:=$$($1_EXCLUDES), \
+        EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
+  endif
+
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/MakeBase.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,449 @@
+#
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################
+#
+# Check that GNU make and cygwin are recent enough.
+# Setup common utility functions.
+#
+################################################################
+
+ifndef _MAKEBASE_GMK
+_MAKEBASE_GMK := 1
+
+# If the variable that you want to send to stdout for piping into a file or otherwise,
+# is potentially long, for example the a list of file paths, eg a list of all package directories.
+# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
+# calls as well as use compression on recurrent file paths segments, to get around the potential
+# command line length problem that exists in cygwin and other shells.
+compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-pre-compress.incl))
+compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-post-compress.incl))
+compress_paths=$(compress_pre)\
+$(subst $(SRC_ROOT),X97,\
+$(subst $(OUTPUT_ROOT),X98,\
+$(subst X,X00,\
+$(subst $(SPACE),\n,$(strip $1)))))\
+$(compress_post)
+
+decompress_paths=$(SED) -f $(SRC_ROOT)/make/common/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
+    -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
+    -e 's|X00|X|g' | tr '\n' '$2'
+
+define ListPathsSafely_If
+	$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
+endef
+
+define ListPathsSafely_Printf
+	$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
+	    -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
+endef
+
+# Receipt example:
+#   rm -f thepaths
+#   $(call ListPathsSafely,THEPATHS,\n, >> thepaths)
+# The \n argument means translate spaces into \n
+# if instead , , (a space) is supplied, then spaces remain spaces.
+define ListPathsSafely
+	$(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!))
+	$(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3'
+	$(call ListPathsSafely_If,$1,$2,1,250)
+	$(call ListPathsSafely_If,$1,$2,251,500)
+	$(call ListPathsSafely_If,$1,$2,501,750)
+	$(call ListPathsSafely_If,$1,$2,751,1000)
+
+	$(call ListPathsSafely_If,$1,$2,1001,1250)
+	$(call ListPathsSafely_If,$1,$2,1251,1500)
+	$(call ListPathsSafely_If,$1,$2,1501,1750)
+	$(call ListPathsSafely_If,$1,$2,1751,2000)
+
+	$(call ListPathsSafely_If,$1,$2,2001,2250)
+	$(call ListPathsSafely_If,$1,$2,2251,2500)
+	$(call ListPathsSafely_If,$1,$2,2501,2750)
+	$(call ListPathsSafely_If,$1,$2,2751,3000)
+
+	$(call ListPathsSafely_If,$1,$2,3001,3250)
+	$(call ListPathsSafely_If,$1,$2,3251,3500)
+	$(call ListPathsSafely_If,$1,$2,3501,3750)
+	$(call ListPathsSafely_If,$1,$2,3751,4000)
+
+	$(call ListPathsSafely_If,$1,$2,4001,4250)
+	$(call ListPathsSafely_If,$1,$2,4251,4500)
+	$(call ListPathsSafely_If,$1,$2,4501,4750)
+	$(call ListPathsSafely_If,$1,$2,4751,5000)
+
+	$(call ListPathsSafely_If,$1,$2,5001,5250)
+	$(call ListPathsSafely_If,$1,$2,5251,5500)
+	$(call ListPathsSafely_If,$1,$2,5501,5750)
+	$(call ListPathsSafely_If,$1,$2,5751,6000)
+
+	$(call ListPathsSafely_If,$1,$2,6001,6250)
+	$(call ListPathsSafely_If,$1,$2,6251,6500)
+	$(call ListPathsSafely_If,$1,$2,6501,6750)
+	$(call ListPathsSafely_If,$1,$2,6751,7000)
+
+	$(call ListPathsSafely_If,$1,$2,7001,7250)
+	$(call ListPathsSafely_If,$1,$2,7251,7500)
+	$(call ListPathsSafely_If,$1,$2,7501,7750)
+	$(call ListPathsSafely_If,$1,$2,7751,8000)
+
+	$(call ListPathsSafely_If,$1,$2,8001,8250)
+	$(call ListPathsSafely_If,$1,$2,8251,8500)
+	$(call ListPathsSafely_If,$1,$2,8501,8750)
+	$(call ListPathsSafely_If,$1,$2,8751,9000)
+
+	$(call ListPathsSafely_If,$1,$2,9001,9250)
+	$(call ListPathsSafely_If,$1,$2,9251,9500)
+	$(call ListPathsSafely_If,$1,$2,9501,9750)
+	$(call ListPathsSafely_If,$1,$2,9751,10000)
+
+	$(call ListPathsSafely_If,$1,$2,10001,10250)
+	$(call ListPathsSafely_If,$1,$2,10251,10500)
+	$(call ListPathsSafely_If,$1,$2,10501,10750)
+	$(call ListPathsSafely_If,$1,$2,10751,11000)
+
+	$(call ListPathsSafely_If,$1,$2,11001,11250)
+	$(call ListPathsSafely_If,$1,$2,11251,11500)
+	$(call ListPathsSafely_If,$1,$2,11501,11750)
+	$(call ListPathsSafely_If,$1,$2,11751,12000)
+
+	$(call ListPathsSafely_If,$1,$2,12001,12250)
+	$(call ListPathsSafely_If,$1,$2,12251,12500)
+	$(call ListPathsSafely_If,$1,$2,12501,12750)
+	$(call ListPathsSafely_If,$1,$2,12751,13000)
+
+	$(call ListPathsSafely_If,$1,$2,13001,13250)
+	$(call ListPathsSafely_If,$1,$2,13251,13500)
+	$(call ListPathsSafely_If,$1,$2,13501,13750)
+	$(call ListPathsSafely_If,$1,$2,13751,14000)
+
+	$(call ListPathsSafely_If,$1,$2,14001,14250)
+	$(call ListPathsSafely_If,$1,$2,14251,14500)
+	$(call ListPathsSafely_If,$1,$2,14501,14750)
+	$(call ListPathsSafely_If,$1,$2,14751,15000)
+
+	$(call ListPathsSafely_If,$1,$2,15001,15250)
+	$(call ListPathsSafely_If,$1,$2,15251,15500)
+	$(call ListPathsSafely_If,$1,$2,15501,15750)
+	$(call ListPathsSafely_If,$1,$2,15751,16000)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,1)
+	$(call ListPathsSafely_Printf,$1,$2,$3,251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,1001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,1251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,1501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,1751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,2001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,2251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,2501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,2751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,3001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,3251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,3501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,3751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,4001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,4251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,4501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,4751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,5001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,5251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,5501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,5751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,6001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,6251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,6501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,6751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,7001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,7251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,7501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,7751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,8001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,8251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,8501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,8751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,9001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,9251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,9501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,9751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,10001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,10251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,10501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,10751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,11001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,11251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,11501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,11751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,12001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,12251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,12501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,12751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,13001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,13251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,13501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,13751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,14001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,14251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,14501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,14751)
+
+	$(call ListPathsSafely_Printf,$1,$2,$3,15001)
+	$(call ListPathsSafely_Printf,$1,$2,$3,15251)
+	$(call ListPathsSafely_Printf,$1,$2,$3,15501)
+	$(call ListPathsSafely_Printf,$1,$2,$3,15751)
+endef
+
+define ListPathsSafelyNow_IfPrintf
+  ifneq (,$$(word $4,$$($1)))
+    $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1))))
+    $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3)
+  endif
+endef
+
+# And an non-receipt version:
+define ListPathsSafelyNow
+  ifneq (,$$(word 10001,$$($1)))
+    $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
+  endif
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000)
+
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750)
+  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000)
+
+endef
+
+# The source tips can come from the Mercurial repository, or in the files
+# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
+# directory as the original $(HGDIR) directory.
+# These should not be := assignments, only used from the root Makefile.
+HG_VERSION = $(shell $(HG) version 2> /dev/null)
+HG_DIRECTORY=.hg
+HGTIP_FILENAME=.hgtip
+HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
+REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
+    $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
+        $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
+        2> /dev/null)))))
+
+# Emit the repo:tip pairs to $@
+define GetSourceTips
+	$(CD) $(SRC_ROOT) ; \
+	for i in $(REPO_LIST) IGNORE ; do \
+	  if [ "$${i}" = "IGNORE" ] ; then \
+	    continue; \
+	  elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
+	    $(PRINTF) " %s:%s" \
+	        "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
+	  elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
+	    $(PRINTF) " %s:%s" \
+	        "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
+	  fi; \
+	done >> $@
+	$(PRINTF) "\n" >> $@
+endef
+
+# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
+define CreateHgTip
+	$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
+	$(ECHO) $1/$(HGTIP_FILENAME)
+endef
+
+define SetupLogging
+  ifeq ($$(LOG_LEVEL),trace)
+    # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
+    # For each target executed, will print
+    # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
+    # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
+    # (and causing a crash on Cygwin).
+    # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
+    # Only use time if it's GNU time which supports format and output file.
+    WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
+    SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
+  endif
+  # Never remove warning messages; this is just for completeness
+  LOG_WARN=
+  ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
+    LOG_INFO=
+  else
+    LOG_INFO=> /dev/null
+  endif
+  ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
+    LOG_DEBUG=
+  else
+    LOG_DEBUG=> /dev/null
+  endif
+  ifneq ($$(findstring $$(LOG_LEVEL),trace),)
+    LOG_TRACE=
+  else
+    LOG_TRACE=> /dev/null
+  endif
+endef
+
+# Make sure logging is setup for everyone that includes MakeBase.gmk.
+$(eval $(call SetupLogging))
+
+# This is to be called by all SetupFoo macros
+define LogSetupMacroEntry
+  $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
+  $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
+endef
+
+# Make directory without forking mkdir if not needed
+define MakeDir
+  ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
+    $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
+  endif
+endef
+
+ifeq ($(OPENJDK_TARGET_OS),solaris)
+  # On Solaris, if the target is a symlink and exists, cp won't overwrite.
+  # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
+  # name of the target file differs from the source file, rename after copy.
+  define install-file
+	$(MKDIR) -p $(@D)
+	$(RM) '$@'
+	$(CP) -f -r -P '$<' '$(@D)'
+	if [ "$(@F)" != "$(<F)" ]; then $(MV) '$(@D)/$(<F)' '$@'; fi
+  endef
+else ifeq ($(OPENJDK_TARGET_OS),macosx)
+  # On mac, extended attributes sometimes creep into the source files, which may later
+  # cause the creation of ._* files which confuses testing. Clear these with xattr if
+  # set. Some files get their write permissions removed after being copied to the
+  # output dir. When these are copied again to images, xattr would fail. By only clearing
+  # attributes when they are present, failing on this is avoided.
+  define install-file
+	$(MKDIR) -p $(@D)
+	$(CP) -fRP '$<' '$@'
+	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
+  endef
+else
+  define install-file
+	$(MKDIR) -p $(@D)
+	$(CP) -fP '$<' '$@'
+  endef
+endif
+
+# Convenience functions for working around make's limitations with $(filter ).
+containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
+not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
+
+################################################################################
+# In Cygwin, finds are very costly, both because of expensive forks and because
+# of bad file system caching. Find is used extensively in $(shell) commands to
+# find source files. This makes rerunning make with no or few changes rather
+# expensive. To speed this up, these two macros are used to cache the results
+# of simple find commands for reuse.
+#
+# Runs a find and stores both the directories where it was run and the results.
+# This macro can be called multiple times to add to the cache. Only finds files
+# with no filters.
+#
+# Needs to be called with $(eval )
+#
+# Param 1 - Dir to find in
+ifeq ($(OPENJDK_BUILD_OS),windows)
+  define FillCacheFind
+    FIND_CACHE_DIR += $1
+    FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
+  endef
+else
+  define FillCacheFind
+  endef
+endif
+
+# Mimics find by looking in the cache if all of the directories have been cached.
+# Otherwise reverts to shell find. This is safe to call on all platforms, even if
+# cache is deactivated.
+#
+# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
+# Param 1 - Dirs to find in
+define CacheFind
+  $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \
+    $(shell $(FIND) $1 -type f -o -type l), \
+    $(filter $(addsuffix %,$1),$(FIND_CACHE)))
+endef
+
+################################################################################
+
+endif # _MAKEBASE_GMK
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/NON_CORE_PKGS.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#
+# This file contains the package names of all the "non-core"
+# API published in the Java 2 SDK documentation. "Non-core" means
+# it includes all published API outside of the JDK API specification.
+#
+# These environment variables are used by javadoc in
+# make/docs/Makefile and are referenced by the localization
+# team when determining which APIs to extract javadoc
+# comments from.
+
+DOMAPI_PKGS = com.sun.java.browser.dom \
+    org.w3c.dom \
+    org.w3c.dom.bootstrap \
+    org.w3c.dom.ls \
+    org.w3c.dom.ranges \
+    org.w3c.dom.traversal \
+    org.w3c.dom.html \
+    org.w3c.dom.stylesheets \
+    org.w3c.dom.css \
+    org.w3c.dom.events \
+    org.w3c.dom.views
+
+JDI_PKGS = com.sun.jdi \
+    com.sun.jdi.event \
+    com.sun.jdi.request \
+    com.sun.jdi.connect \
+    com.sun.jdi.connect.spi
+
+MGMT_PKGS = com.sun.management
+
+JAAS_PKGS = com.sun.security.auth \
+    com.sun.security.auth.callback \
+    com.sun.security.auth.login \
+    com.sun.security.auth.module
+
+JGSS_PKGS = com.sun.security.jgss
+
+OLD_JSSE_PKGS = com.sun.net.ssl
+
+HTTPSERVER_PKGS = com.sun.net.httpserver \
+    com.sun.net.httpserver.spi
+
+NIO_PKGS = com.sun.nio.file
+
+DOCLETAPI_PKGS = com.sun.javadoc
+
+TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
+
+TAGLETAPI_PKGS = com.sun.tools.doclets
+
+ATTACH_PKGS = com.sun.tools.attach \
+    com.sun.tools.attach.spi
+
+JCONSOLE_PKGS = com.sun.tools.jconsole
+
+TREEAPI_PKGS = com.sun.source.doctree \
+    com.sun.source.tree \
+    com.sun.source.util \
+    jdk
+
+SMARTCARDIO_PKGS = javax.smartcardio
+
+SCTPAPI_PKGS = com.sun.nio.sctp
+
+ifeq ($(PLATFORM), macosx)
+  APPLE_EXT_PKGS = com.apple.concurrent \
+      com.apple.eawt \
+      com.apple.eawt.event \
+      com.apple.eio
+endif
+
+JDK_PKGS = jdk
+
+# non-core packages in rt.jar
+NON_CORE_PKGS = $(DOMAPI_PKGS) \
+    $(MGMT_PKGS) \
+    $(JAAS_PKGS) \
+    $(JGSS_PKGS) \
+    $(NIO_PKGS) \
+    $(OLD_JSSE_PKGS) \
+    $(HTTPSERVER_PKGS) \
+    $(SMARTCARDIO_PKGS) \
+    $(SCTPAPI_PKGS) \
+    $(APPLE_EXT_PKGS) \
+    $(JDK_PKGS)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/NativeCompilation.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,594 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# When you read this source. Remember that $(sort ...) has the side effect
+# of removing duplicates. It is actually this side effect that is
+# desired whenever sort is used below!
+
+ifeq (,$(_MAKEBASE_GMK))
+  $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
+endif
+
+ifeq ($(COMPILER_TYPE),CC)
+  COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
+  LINKING_MSG=echo $(LOG_INFO) "Linking $1"
+  LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
+  ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
+else
+  COMPILING_MSG=
+  LINKING_MSG=
+  LINKING_EXE_MSG=
+  ARCHIVING_MSG=
+endif
+
+define add_native_source
+  # param 1 = BUILD_MYPACKAGE
+  # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
+  # param 3 = the bin dir that stores all .o (.obj) and .d files.
+  # param 4 = the c flags to the compiler
+  # param 5 = the c compiler
+  # param 6 = the c++ flags to the compiler
+  # param 7 = the c++ compiler
+  # param 8 = the flags to the assembler
+
+  ifneq (,$$(filter %.c,$2))
+    # Compile as a C file
+    $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
+    $1_$2_COMP=$5
+    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
+  else ifneq (,$$(filter %.m,$2))
+    # Compile as a objective-c file
+    $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
+    $1_$2_COMP=$5
+    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
+  else ifneq (,$$(filter %.s,$2))
+    # Compile as assembler file
+    $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
+    $1_$2_COMP=$(AS)
+    $1_$2_DEP_FLAG:=
+  else
+    # Compile as a C++ file
+    $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
+    $1_$2_COMP=$7
+    $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
+  endif
+  # Generate the .o (.obj) file name and place it in the bin dir.
+  $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $2)))))
+  # Only continue if this object file hasn't been processed already. This lets the first found
+  # source file override any other with the same name.
+  ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR)))
+    $1_OBJS_SO_FAR+=$$($1_$2_OBJ)
+    ifeq (,$$(filter %.s,$2))
+      # And this is the dependency file for this obj file.
+      $1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ))
+      # Include previously generated dependency information. (if it exists)
+      -include $$($1_$2_DEP)
+
+      ifeq ($(COMPILER_TYPE),CL)
+        $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
+            -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
+      endif
+    endif
+
+    $$($1_$2_OBJ) : $2
+        ifeq ($(COMPILER_TYPE),CC)
+	  $$(call COMPILING_MSG,$2,$$($1_TARGET))
+          # The Sun studio compiler doesn't output the full path to the object file in the
+          # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
+          ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
+	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
+	    $(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
+          else
+	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
+          endif
+        endif
+        # The Visual Studio compiler lacks a feature for generating make dependencies, but by
+        # setting -showIncludes, all included files are printed. These are filtered out and
+        # parsed into make dependences.
+        ifeq ($(COMPILER_TYPE),CL)
+	  ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
+	      $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
+	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
+	      && exit `cat $$($1_$2_DEP).exitvalue`
+	  $(RM) $$($1_$2_DEP).exitvalue
+	  ($(ECHO) $$@: \\ \
+	  && $(SED) -e '/^Note: including file:/!d' \
+	      -e 's|Note: including file: *||' \
+	      -e 's|\\|/|g' \
+	      -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
+	      -e '/$(subst /,\/,$(TOPDIR))/!d' \
+	      -e 's|$$$$| \\|g' \
+	      $$($1_$2_DEP).raw) > $$($1_$2_DEP)
+        endif
+  endif
+endef
+
+define SetupNativeCompilation
+  # param 1 is for example BUILD_MYPACKAGE
+  # param 2,3,4,5,6,7,8 are named args.
+  #   SRC one or more directory roots to scan for C/C++ files.
+  #   LANG C or C++
+  #   CFLAGS the compiler flags to be used, used both for C and C++.
+  #   CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS.
+  #   LDFLAGS the linker flags to be used, used both for C and C++.
+  #   LDFLAGS_SUFFIX the linker flags to be added last on the commandline
+  #       typically the libraries linked to.
+  #   ARFLAGS the archiver flags to be used
+  #   OBJECT_DIR the directory where we store the object files
+  #   LIBRARY the resulting library file
+  #   PROGRAM the resulting exec file
+  #   INCLUDES only pick source from these directories
+  #   EXCLUDES do not pick source from these directories
+  #   INCLUDE_FILES only compile exactly these files!
+  #   EXCLUDE_FILES with these names
+  #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
+  #   RC_FLAGS flags for RC.
+  #   MAPFILE mapfile
+  #   REORDER reorder file
+  #   DEBUG_SYMBOLS add debug symbols (if configured on)
+  #   CC the compiler to use, default is $(CC)
+  #   LDEXE the linker to use for linking executables, default is $(LDEXE)
+  #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
+  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
+  $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
+
+  ifneq (,$$($1_BIN))
+    $$(error BIN has been replaced with OBJECT_DIR)
+  endif
+
+  ifneq (,$$($1_LIB))
+    $$(error LIB has been replaced with LIBRARY)
+  endif
+
+  ifneq (,$$($1_EXE))
+    $$(error EXE has been replaced with PROGRAM)
+  endif
+
+  ifneq (,$$($1_LIBRARY))
+    ifeq (,$$($1_OUTPUT_DIR))
+      $$(error LIBRARY requires OUTPUT_DIR)
+    endif
+
+    ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
+      $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
+    endif
+
+    ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
+      $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
+    endif
+
+    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
+      $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
+    endif
+
+    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$(SHARED_LIBRARY_SUFFIX)
+    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
+
+  endif
+
+  ifneq (,$$($1_STATIC_LIBRARY))
+    ifeq (,$$($1_OUTPUT_DIR))
+      $$(error STATIC_LIBRARY requires OUTPUT_DIR)
+    endif
+
+    ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
+      $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
+    endif
+
+    ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
+      $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
+    endif
+
+    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
+      $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
+    endif
+
+    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$(STATIC_LIBRARY_SUFFIX)
+    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
+  endif
+
+  ifneq (,$$($1_PROGRAM))
+    ifeq (,$$($1_OUTPUT_DIR))
+      $$(error PROGRAM requires OUTPUT_DIR)
+    endif
+
+    ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
+      $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
+    endif
+
+    ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
+      $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
+    endif
+
+    $1_BASENAME:=$$($1_PROGRAM)$(EXE_SUFFIX)
+    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
+
+  endif
+
+  ifeq (,$$($1_TARGET))
+    $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
+  endif
+
+  ifeq (,$$($1_LANG))
+    $$(error You have to specify LANG for native compilation $1)
+  endif
+  ifeq (C,$$($1_LANG))
+    ifeq ($$($1_LDEXE),)
+      $1_LDEXE:=$(LDEXE)
+    endif
+    $1_LD:=$(LD)
+  else
+    ifeq (C++,$$($1_LANG))
+      $1_LD:=$(LDCXX)
+      $1_LDEXE:=$(LDEXECXX)
+    else
+      $$(error Unknown native language $$($1_LANG) for $1)
+    endif
+  endif
+
+  ifeq ($$($1_CC),)
+    $1_CC:=$(CC)
+  endif
+
+  # Make sure the dirs exist.
+  $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
+  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
+
+  # Find all files in the source trees. Sort to remove duplicates.
+  $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
+  # Extract the C/C++ files.
+  $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
+  $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
+  ifneq ($$($1_EXCLUDE_FILES),)
+    $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
+  endif
+  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.s %.c %.cpp %.m,$$($1_ALL_SRCS)))
+  ifneq (,$$(strip $$($1_INCLUDE_FILES)))
+    $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
+  endif
+  ifeq (,$$($1_SRCS))
+    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
+  endif
+  # There can be only a single bin dir root, no need to foreach over the roots.
+  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
+  # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
+  # and we have a list of all existing object files: $$($1_BINS)
+
+  # Prepend the source/bin path to the filter expressions. Then do the filtering.
+  ifneq ($$($1_INCLUDES),)
+    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
+    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
+  endif
+  ifneq ($$($1_EXCLUDES),)
+    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
+    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
+  endif
+
+  # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
+  # a reproducable order on the input files to the linker).
+  $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))))
+  # Are there too many object files on disk? Perhaps because some source file was removed?
+  $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
+  # Clean out the superfluous object files.
+  ifneq ($$($1_SUPERFLUOUS_OBJS),)
+    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
+  endif
+
+  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
+  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
+  ifneq ($(DEBUG_LEVEL),release)
+    # Pickup extra debug dependent variables for CFLAGS
+    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
+    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
+    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
+  else
+    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
+    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
+    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
+  endif
+
+  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
+  $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
+  ifneq ($(DEBUG_LEVEL),release)
+    # Pickup extra debug dependent variables for CXXFLAGS
+    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
+    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
+    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
+  else
+    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
+    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
+    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
+  endif
+
+  ifneq (,$$($1_DEBUG_SYMBOLS))
+    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+      ifdef OPENJDK
+        # Always add debug symbols
+        $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+        $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+      else
+        # Programs don't get the debug symbols added in the old build. It's not clear if
+        # this is intentional.
+        ifeq ($$($1_PROGRAM),)
+          $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+          $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
+        endif
+      endif
+    endif
+  endif
+
+  ifeq ($$($1_CXXFLAGS),)
+    $1_CXXFLAGS:=$$($1_CFLAGS)
+  endif
+  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
+    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
+  endif
+
+  ifneq (,$$($1_REORDER))
+    $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
+    $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
+  endif
+
+  ifeq (NONE, $$($1_OPTIMIZATION))
+    $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
+    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
+  else ifeq (LOW, $$($1_OPTIMIZATION))
+    $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
+    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
+  else ifeq (HIGH, $$($1_OPTIMIZATION))
+    $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
+    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
+  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
+    $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
+    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
+  else ifneq (, $$($1_OPTIMIZATION))
+    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
+  endif
+
+  # Now call add_native_source for each source file we are going to compile.
+  $$(foreach p,$$($1_SRCS), \
+      $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
+          $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
+          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
+
+  # On windows we need to create a resource file
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    ifneq (,$$($1_VERSIONINFO_RESOURCE))
+      $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
+      $$($1_RES): $$($1_VERSIONINFO_RESOURCE)
+		$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE)
+    endif
+    ifneq (,$$($1_MANIFEST))
+      $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
+      IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
+      $$($1_GEN_MANIFEST): $$($1_MANIFEST)
+		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
+    endif
+  endif
+
+  # mapfile doesnt seem to be implemented on macosx (yet??)
+  ifneq ($(OPENJDK_TARGET_OS),macosx)
+    ifneq ($(OPENJDK_TARGET_OS),windows)
+      $1_REAL_MAPFILE:=$$($1_MAPFILE)
+      ifneq (,$$($1_REORDER))
+        $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
+
+        $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
+		$$(MKDIR) -p $$(@D)
+		$$(CP) $$($1_MAPFILE) $$@.tmp
+		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
+		$$(MV) $$@.tmp $$@
+      endif
+    endif
+  endif
+
+  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
+  # for LDFLAGS and LDFLAGS_SUFFIX
+  $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
+  $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
+  ifneq (,$$($1_REAL_MAPFILE))
+    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
+  endif
+
+  $1 := $$($1_TARGET)
+  ifneq (,$$($1_LIBRARY))
+    # Generating a dynamic library.
+    $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
+    ifeq ($(OPENJDK_TARGET_OS), windows)
+      $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
+    endif
+
+    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
+
+    ifneq (,$$($1_DEBUG_SYMBOLS))
+      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+        ifeq ($(OPENJDK_TARGET_OS), windows)
+          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
+              "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
+        endif
+
+        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
+          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
+		$(CP) $$< $$@
+        endif
+
+        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
+          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
+            ifeq ($(OPENJDK_TARGET_OS), solaris)
+              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+              # empty section headers until a fixed $(OBJCOPY) is available.
+              # An empty section header has sh_addr == 0 and sh_size == 0.
+              # This problem has only been seen on Solaris X64, but we call this tool
+              # on all Solaris builds just in case.
+              #
+              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
+				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
+		$(RM) $$@
+		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
+		$(OBJCOPY) --only-keep-debug $$< $$@
+		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
+            else # not solaris
+              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
+		$(RM) $$@
+		$(OBJCOPY) --only-keep-debug $$< $$@
+		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
+            endif # Touch to not retrigger rule on rebuild
+		$(TOUCH) $$@
+          endif # !windows
+        endif # !macosx
+
+        ifeq ($(ZIP_DEBUGINFO_FILES), true)
+ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
+          $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
+
+          ifeq ($(OPENJDK_TARGET_OS), windows)
+            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
+		$(CD) $$($1_OBJECT_DIR) \
+		&& $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
+          else
+            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
+                $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
+		$(CD) $$($1_OBJECT_DIR) \
+		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
+          endif
+endif # no MacOS X support yet
+        else
+          ifeq ($(OPENJDK_TARGET_OS), windows)
+            $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
+                $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
+          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
+            $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
+          endif
+        endif
+      endif
+    endif
+
+    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE)
+	$$(call LINKING_MSG,$$($1_BASENAME))
+	$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
+	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
+	$$($1_EXTRA_LDFLAGS_SUFFIX)
+
+  endif
+
+  ifneq (,$$($1_STATIC_LIBRARY))
+    # Generating a static library, ie object file archive.
+    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES)
+	$$(call ARCHIVING_MSG,$$($1_LIBRARY))
+	$(AR) $$($1_AR_FLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
+	    $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
+  endif
+
+  ifneq (,$$($1_PROGRAM))
+    # A executable binary has been specified, setup the target for it.
+    ifneq (,$$($1_DEBUG_SYMBOLS))
+      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
+        ifeq ($(OPENJDK_TARGET_OS), windows)
+          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
+              "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
+        endif
+
+        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
+          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
+		$(CP) $$< $$@
+        endif
+
+        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
+          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
+            ifeq ($(OPENJDK_TARGET_OS), solaris)
+              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
+              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
+              # empty section headers until a fixed $(OBJCOPY) is available.
+              # An empty section header has sh_addr == 0 and sh_size == 0.
+              # This problem has only been seen on Solaris X64, but we call this tool
+              # on all Solaris builds just in case.
+              #
+              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
+              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
+              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
+				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
+		$(RM) $$@
+		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
+		$(OBJCOPY) --only-keep-debug $$< $$@
+		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
+            else # not solaris
+              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
+		$(RM) $$@
+		$(OBJCOPY) --only-keep-debug $$< $$@
+		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
+            endif
+		$(TOUCH) $$@
+          endif # !windows
+        endif # !macosx
+
+        ifeq ($(ZIP_DEBUGINFO_FILES), true)
+ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
+          $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
+
+          ifeq ($(OPENJDK_TARGET_OS), windows)
+            $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
+		$(CD) $$($1_OBJECT_DIR) \
+		&& $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
+          else
+            $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
+                $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
+		$(CD) $$($1_OBJECT_DIR) \
+		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
+          endif
+endif # no MacOS X support yet
+        else
+          ifeq ($(OPENJDK_TARGET_OS), windows)
+            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
+                $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
+          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
+            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
+          endif
+        endif
+      endif
+    endif
+
+    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
+
+    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
+	$$(call LINKING_EXE_MSG,$$($1_BASENAME))
+	$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
+	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
+	$$($1_EXTRA_LDFLAGS_SUFFIX)
+        ifneq (,$$($1_GEN_MANIFEST))
+	  $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
+        endif
+        # This only works if the openjdk_codesign identity is present on the system. Let
+        # silently fail otherwise.
+        ifneq (,$(CODESIGN))
+          ifneq (,$$($1_CODESIGN))
+	    $(CODESIGN) -s openjdk_codesign $$@
+          endif
+        endif
+  endif
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/RMICompilation.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,96 @@
+#
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+define SetupRMICompilation
+  # param 1 is a name for a variable to depend on.
+  # param 2 and up are named args.
+  #   CLASSES:=List of classes to generate stubs for
+  #   CLASSES_DIR:=Directory where to look for classes
+  #   STUB_CLASSES_DIR:=Directory in where to put stub classes
+  #   RUN_V11:=Set to run rmic with -v1.1
+  #   RUN_V12:=Set to run rmic with -v1.2
+  #   RUN_IIOP:=Set to run rmic with -iiop
+  #   RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
+  #   KEEP_GENERATED:=Set to keep generated sources around
+  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
+  $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
+  $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
+
+  $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
+
+  $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
+  $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
+  $1_STUB_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Stub.class,$$($1_CLASSES_SLASH)))
+  $1_TARGETS := $$($1_STUB_FILES)
+  $1_ARGS :=
+  ifneq (,$$($1_RUN_V11))
+    $1_SKEL_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Skel.class,$$($1_CLASSES_SLASH)))
+    $1_TARGETS += $$($1_SKEL_FILES)
+    $1_ARGS += -v1.1
+  endif
+  ifneq (,$$($1_RUN_V12))
+    $1_ARGS += -v1.2
+  endif
+
+  $1_TIE_BASE_FILES := $$(foreach f,$$($1_CLASSES_SLASH),$$(dir $$f)_$$(notdir $$f))
+  $1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
+  $1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
+
+  ifneq (,$$($1_RUN_IIOP))
+    $1_TARGETS += $$($1_TIE_FILES)
+    $1_ARGS += -iiop -emitPermissionCheck
+  endif
+  ifneq (,$$($1_RUN_IIOP_STDPKG))
+    $1_TARGETS += $$($1_TIE_STDPKG_FILES)
+    $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
+  endif
+
+  ifneq (,$$($1_KEEP_GENERATED))
+    $1_ARGS += -keepgenerated
+    $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
+  endif
+
+  $1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
+
+  $$($1_TARGETS): $$($1_DEP_FILE) $$($1_CLASS_FILES)
+
+  $$($1_DEP_FILE): $$($1_CLASS_FILES)
+	$(MKDIR) -p $$($1_STUB_CLASSES_DIR)
+	if [ "x$$($1_ARGS)" != "x" ]; then \
+	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) && \
+	  $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
+	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
+	fi;
+	if [ "x$$($1_ARGS2)" != "x" ]; then \
+	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) && \
+	  $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
+	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
+	fi;
+	$(TOUCH) $$@
+
+
+  $1 := $$($1_TARGETS) $$($1_DEP_FILE)
+
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/support/ListPathsSafely-post-compress.incl	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,1 @@
+))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/support/ListPathsSafely-pre-compress.incl	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,1 @@
+$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/support/ListPathsSafely-uncompress.sed	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,72 @@
+s|X01|com|g
+s|X02|org|g
+s|X03|sun|g
+s|X04|java|g
+s|X05|javax|g
+s|X06|sun/io|g
+s|X07|com/sun|g
+s|X08|java/io|g
+s|X09|org/omg|g
+s|X10|org/w3c|g
+s|X11|org/xml|g
+s|X12|sun/awt|g
+s|X13|sun/net|g
+s|X14|sun/nio|g
+s|X15|sun/rmi|g
+s|X16|java/awt|g
+s|X17|java/net|g
+s|X18|java/nio|g
+s|X19|java/rmi|g
+s|X20|META-INF|g
+s|X21|sun/font|g
+s|X22|sun/misc|g
+s|X23|sun/text|g
+s|X24|sun/util|g
+s|X25|java/lang|g
+s|X26|java/math|g
+s|X27|java/text|g
+s|X28|java/util|g
+s|X29|javax/jws|g
+s|X30|javax/net|g
+s|X31|javax/rmi|g
+s|X32|javax/xml|g
+s|X33|sun/corba|g
+s|X34|sun/print|g
+s|X35|sun/swing|g
+s|X36|java/beans|g
+s|X37|javax/lang|g
+s|X38|sun/applet|g
+s|X39|sun/java2d|g
+s|X40|java/applet|g
+s|X41|javax/print|g
+s|X42|javax/sound|g
+s|X43|javax/swing|g
+s|X44|javax/tools|g
+s|X45|jdk/classes|g
+s|X46|org/relaxng|g
+s|X47|sun/reflect|g
+s|X48|javax/crypto|g
+s|X49|javax/naming|g
+s|X50|jaxp/classes|g
+s|X51|sun/security|g
+s|X52|corba/classes|g
+s|X53|java/security|g
+s|X54|javax/imageio|g
+s|X55|jdk/btclasses|g
+s|X56|javax/activity|g
+s|X57|javax/security|g
+s|X58|jdk/newclasses|g
+s|X59|sun/instrument|g
+s|X60|sun/management|g
+s|X61|corba/btclasses|g
+s|X62|jdk/democlasses|g
+s|X63|javax/activation|g
+s|X64|javax/annotation|g
+s|X65|javax/management|g
+s|X66|javax/transaction|g
+s|X67|jaxws/jaf_classes|g
+s|X68|langtools/classes|g
+s|X69|META-INF/services|g
+s|X70|jdk/newdemoclasses|g
+s|X71|javax/accessibility|g
+s|X72|jaxws/jaxws_classes|g
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/common/support/unicode2x.sed	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,100 @@
+s/\\u0020/\x20/g
+s/\\u003A/\x3A/g
+s/\\u006B/\x6B/g
+s/\\u0075/\x75/g
+s/\\u00A0/\xA0/g
+s/\\u00A3/\xA3/g
+s/\\u00B0/\xB0/g
+s/\\u00B7/\xB7/g
+s/\\u00BA/\xBA/g
+s/\\u00BF/\xBF/g
+s/\\u00C0/\xC0/g
+s/\\u00C1/\xC1/g
+s/\\u00C2/\xC2/g
+s/\\u00C4/\xC4/g
+s/\\u00C5/\xC5/g
+s/\\u00C8/\xC8/g
+s/\\u00C9/\xC9/g
+s/\\u00CA/\xCA/g
+s/\\u00CD/\xCD/g
+s/\\u00CE/\xCE/g
+s/\\u00D3/\xD3/g
+s/\\u00D4/\xD4/g
+s/\\u00D6/\xD6/g
+s/\\u00DA/\xDA/g
+s/\\u00DC/\xDC/g
+s/\\u00DD/\xDD/g
+s/\\u00DF/\xDF/g
+s/\\u00E0/\xE0/g
+s/\\u00E1/\xE1/g
+s/\\u00E2/\xE2/g
+s/\\u00E3/\xE3/g
+s/\\u00E4/\xE4/g
+s/\\u00E5/\xE5/g
+s/\\u00E6/\xE6/g
+s/\\u00E7/\xE7/g
+s/\\u00E8/\xE8/g
+s/\\u00E9/\xE9/g
+s/\\u00EA/\xEA/g
+s/\\u00EB/\xEB/g
+s/\\u00EC/\xEC/g
+s/\\u00ED/\xED/g
+s/\\u00EE/\xEE/g
+s/\\u00EF/\xEF/g
+s/\\u00F1/\xF1/g
+s/\\u00F2/\xF2/g
+s/\\u00F3/\xF3/g
+s/\\u00F4/\xF4/g
+s/\\u00F5/\xF5/g
+s/\\u00F6/\xF6/g
+s/\\u00F9/\xF9/g
+s/\\u00FA/\xFA/g
+s/\\u00FC/\xFC/g
+s/\\u0020/\x20/g
+s/\\u003f/\x3f/g
+s/\\u006f/\x6f/g
+s/\\u0075/\x75/g
+s/\\u00a0/\xa0/g
+s/\\u00a3/\xa3/g
+s/\\u00b0/\xb0/g
+s/\\u00ba/\xba/g
+s/\\u00bf/\xbf/g
+s/\\u00c1/\xc1/g
+s/\\u00c4/\xc4/g
+s/\\u00c5/\xc5/g
+s/\\u00c8/\xc8/g
+s/\\u00c9/\xc9/g
+s/\\u00ca/\xca/g
+s/\\u00cd/\xcd/g
+s/\\u00d6/\xd6/g
+s/\\u00dc/\xdc/g
+s/\\u00dd/\xdd/g
+s/\\u00df/\xdf/g
+s/\\u00e0/\xe0/g
+s/\\u00e1/\xe1/g
+s/\\u00e2/\xe2/g
+s/\\u00e3/\xe3/g
+s/\\u00e4/\xe4/g
+s/\\u00e5/\xe5/g
+s/\\u00e7/\xe7/g
+s/\\u00e8/\xe8/g
+s/\\u00e9/\xe9/g
+s/\\u00ea/\xea/g
+s/\\u00eb/\xeb/g
+s/\\u00ec/\xec/g
+s/\\u00ed/\xed/g
+s/\\u00ee/\xee/g
+s/\\u00ef/\xef/g
+s/\\u00f0/\xf0/g
+s/\\u00f1/\xf1/g
+s/\\u00f2/\xf2/g
+s/\\u00f3/\xf3/g
+s/\\u00f4/\xf4/g
+s/\\u00f5/\xf5/g
+s/\\u00f6/\xf6/g
+s/\\u00f7/\xf7/g
+s/\\u00f8/\xf8/g
+s/\\u00f9/\xf9/g
+s/\\u00fa/\xfa/g
+s/\\u00fc/\xfc/g
+s/\\u00ff/\xff/g
--- a/make/corba-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# CORBA TARGETS
-################################################################
-
-CORBA_BUILD_ARGUMENTS = \
-   $(COMMON_BUILD_ARGUMENTS) \
-   ALT_OUTPUTDIR=$(CORBA_OUTPUTDIR) \
-   ALT_BOOTDIR=$(BOOTDIR) \
-   ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-   CORBA_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-corba: corba-build
-corba-build:
-	$(MKDIR) -p $(CORBA_OUTPUTDIR)
-	@$(call MakeStart,corba,all)
-	($(CD) $(CORBA_TOPDIR)/make && \
-	 $(MAKE) $(CORBA_BUILD_ARGUMENTS) all)
-	@$(call MakeFinish,corba,all)
-
-corba-clobber::
-	$(MKDIR) -p $(CORBA_OUTPUTDIR)
-	@$(call MakeStart,corba,clobber)
-	($(CD) $(CORBA_TOPDIR)/make &&  \
-	 $(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber)
-	@$(call MakeFinish,corba,clobber)
-
-.PHONY: corba corba-build corba-clobber 
-
--- a/make/deploy-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
-#
-# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# DEPLOY TARGETS
-################################################################
-
-deploy:  deploy-build
-
-DEPLOY = deploy
-
-# put the generated bundles in their own place in OUTPUTDIR
-DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR)
-
-# NO_IMAGES may be set in conjunction with DEV_ONLY
-ifdef NO_IMAGES
-  IMAGES_TARGET =
-else
-  IMAGES_TARGET = images
-endif
-
-DEPLOY_BUILD_TARGETS = sanity deploy 
-
-ifneq ($(JQS), off)
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    ifeq ($(PLATFORM), windows)
-      DEPLOY_BUILD_TARGETS += jqs-all
-    endif
-  endif
-endif
-
-ifndef DEV_ONLY
-  DEPLOY_BUILD_TARGETS += images
-else
-  DEPLOY_BUILD_TARGETS += $(IMAGES_TARGET)
-endif
-
-DEPLOY_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
-			ALT_OUTPUTDIR=$(DEPLOY_OUTPUTDIR) 
-
-ifeq ($(BUILD_LANGTOOLS), true)
-   DEPLOY_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-ifdef ALT_IMAGE_DIR
-  DEPLOY_BUILD_ARGUMENTS += ALT_IMAGE_DIR=$(ALT_IMAGE_DIR)
-endif
-
-ifdef ALT_BUNDLE_DATE
-  DEPLOY_BUILD_ARGUMENTS += ALT_BUNDLE_DATE=$(ALT_BUNDLE_DATE)
-endif
-
-ifdef ALT_JAVAWS_BOOTDIR
-  DEPLOY_BUILD_ARGUMENTS += ALT_JAVAWS_BOOTDIR=$(ALT_JAVAWS_BOOTDIR)
-endif
-
-ifdef CERT
-  DEPLOY_BUILD_ARGUMENTS += CERT=$(CERT)
-endif
-
-ifdef PKEY
-  DEPLOY_BUILD_ARGUMENTS += PKEY=$(PKEY)
-endif
-
-deploy-build:
-ifeq ($(BUILD_DEPLOY), true)
-	@$(call MakeStart,deploy,$(DEPLOY_BUILD_TARGETS))
-	($(CD) $(DEPLOY_TOPDIR)/make && \
-	  $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
-	@$(call MakeFinish,deploy,$(DEPLOY_BUILD_TARGETS))
-endif
-
-deploy-clobber::
-ifeq ($(BUILD_DEPLOY), true)
-	@$(call MakeStart,deploy,clobber)
-	($(CD) $(DEPLOY_TOPDIR)/make && \
-	  $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
-	@$(call MakeFinish,deploy,clobber)
-endif 
-
-deploy-sanity::
-ifeq ($(BUILD_DEPLOY), true)
-	($(CD) $(DEPLOY_TOPDIR)/make && \
-	$(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
-endif
-
-.PHONY: deploy deploy-build deploy-clobber deploy-sanity
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/devkit/Makefile	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,121 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+##########################################################################################
+#
+# This Makefile, together with Tools.gmk, can be used to compile a set of
+# gcc based cross compilation, portable, self contained packages, capable
+# of building OpenJDK.
+#
+# In addition to the makefiles, access to Oracle Linux installation
+# media is required. This has been tested against Oracle Enterprise Linux
+# 5.5. Set variables RPM_DIR_x86_64 and RPM_DIR_i686 respectively to point
+# to directory containing the RPMs.
+#
+# By default this Makefile will build crosstools for:
+# * i686-unknown-linux-gnu
+# * x86_64-unknown-linux-gnu
+# The x86_64 version of the compilers will work in multi arch mode and will
+# be able to compile 32bit binaries with the -m32 flag. This makes the
+# explicit cross compiler for i686 somewhat redundant and is a known issue.
+#
+# To build the full set of crosstools, use a command line looking like this:
+#
+# make tars RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
+#
+# To create a x86_64 package without the redundant i686 cross compiler, do
+# like this:
+#
+# make tars platforms=x86_64-unknown-linux-gnu RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
+
+#
+# Main makefile which iterates over all host and target platforms.
+#
+
+os := $(shell uname -o)
+cpu := x86_64
+#$(shell uname -p)
+
+#
+# This wrapper script can handle exactly these platforms
+#
+platforms := $(foreach p,x86_64 i686,$(p)-unknown-linux-gnu)
+#platforms := $(foreach p,x86_64,$(p)-unknown-linux-gnu)
+
+# Figure out what platform this is building on.
+me := $(cpu)-$(if $(findstring Linux,$(os)),unknown-linux-gnu)
+
+$(info Building on platform $(me))
+
+all compile : $(platforms)
+
+ifeq (,$(SKIP_ME))
+  $(foreach p,$(filter-out $(me),$(platforms)),$(eval $(p) : $$(me)))
+endif
+
+OUTPUT_ROOT = $(abspath ../../../build/devkit)
+RESULT = $(OUTPUT_ROOT)/result
+
+submakevars = HOST=$@ BUILD=$(me) \
+    RESULT=$(RESULT) PREFIX=$(RESULT)/$@ \
+    OUTPUT_ROOT=$(OUTPUT_ROOT)
+$(platforms) :
+	@echo 'Building compilers for $@'
+	@echo 'Targets: $(platforms)'
+	for p in $@ $(filter-out $@,$(platforms)); do \
+	  $(MAKE) -f Tools.gmk all $(submakevars) \
+	      TARGET=$$p || exit 1 ; \
+	done
+	@echo 'Building ccache program for $@'
+	$(MAKE) -f Tools.gmk ccache $(submakevars) TARGET=$@
+	@echo 'All done"'
+
+$(foreach a,i686 x86_64,$(eval $(a) : $(filter $(a)%,$(platforms))))
+
+ia32 : i686
+today := $(shell date +%Y%m%d)
+
+
+define Mktar
+  $(1)_tar = $$(RESULT)/sdk-$(1)-$$(today).tar.gz
+  $$($(1)_tar) : PLATFORM = $(1)
+  TARFILES += $$($(1)_tar)
+  $$($(1)_tar) : $(1) $$(shell find $$(RESULT)/$(1))
+endef
+
+$(foreach p,$(platforms),$(eval $(call Mktar,$(p))))
+
+tars : all $(TARFILES)
+onlytars : $(TARFILES)
+%.tar.gz :
+	@echo 'Creating compiler package $@'
+	cd $(RESULT)/$(PLATFORM) && tar -czf $@ *
+	touch $@
+
+clean :
+	rm -rf build result
+
+FORCE :
+.PHONY : $(configs) $(platforms)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/devkit/Tools.gmk	Wed Jul 05 19:24:14 2017 +0200
@@ -0,0 +1,473 @@
+#
+# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+##########################################################################################
+#
+# Workhorse makefile for creating ONE cross compiler
+# Needs either to be from BUILD -> BUILD OR have
+# BUILD -> HOST prebuilt
+#
+# NOTE: There is a bug here. We don't limit the
+# PATH when building BUILD -> BUILD, which means that
+# if you configure after you've once build the BUILD->BUILD
+# compiler THAT one will be picked up as the compiler for itself.
+# This is not so great, especially if you did a partial delete
+# of the target tree.
+#
+# Fix this...
+#
+
+$(info TARGET=$(TARGET))
+$(info HOST=$(HOST))
+$(info BUILD=$(BUILD))
+
+ARCH := $(word 1,$(subst -, ,$(TARGET)))
+
+##########################################################################################
+# Define external dependencies
+
+# Latest that could be made to work.
+gcc_ver := gcc-4.7.3
+binutils_ver := binutils-2.22
+ccache_ver := ccache-3.1.9
+mpfr_ver := mpfr-3.0.1
+gmp_ver := gmp-4.3.2
+mpc_ver := mpc-1.0.1
+
+GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.bz2
+BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.bz2
+CCACHE := http://samba.org/ftp/ccache/$(ccache_ver).tar.gz
+MPFR := http://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
+GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
+MPC := http://www.multiprecision.org/mpc/download/${mpc_ver}.tar.gz
+
+# RPMs in OEL5.5
+RPM_LIST := \
+    kernel-headers \
+    glibc-2 glibc-headers glibc-devel \
+    cups-libs cups-devel \
+    libX11 libX11-devel \
+    xorg-x11-proto-devel \
+    alsa-lib alsa-lib-devel \
+    libXext libXext-devel \
+    libXtst libXtst-devel \
+    libXrender libXrender-devel \
+    freetype freetype-devel \
+    libXt libXt-devel \
+    libSM libSM-devel \
+    libICE libICE-devel \
+    libXi libXi-devel \
+    libXdmcp libXdmcp-devel \
+    libXau libXau-devel \
+    libgcc
+
+
+ifeq ($(ARCH),x86_64)
+  RPM_DIR ?= $(RPM_DIR_x86_64)
+  RPM_ARCHS := x86_64
+  ifeq ($(BUILD),$(HOST))
+    ifeq ($(TARGET),$(HOST))
+      # When building the native compiler for x86_64, enable mixed mode.
+      RPM_ARCHS += i386 i686
+    endif
+  endif
+else
+  RPM_DIR ?= $(RPM_DIR_i686)
+  RPM_ARCHS := i386 i686
+endif
+
+# Sort to remove duplicates
+RPM_FILE_LIST := $(sort $(foreach a,$(RPM_ARCHS),$(wildcard $(patsubst %,$(RPM_DIR)/%*$a.rpm,$(RPM_LIST)))))
+
+ifeq ($(RPM_FILE_LIST),)
+  $(error Found no RPMs, RPM_DIR must point to list of directories to search for RPMs)
+endif
+
+##########################################################################################
+# Define common directories and files
+
+# Ensure we have 32-bit libs also for x64. We enable mixed-mode.
+ifeq (x86_64,$(ARCH))
+  LIBDIRS := lib64 lib
+  CFLAGS_lib := -m32
+else
+  LIBDIRS := lib
+endif
+
+# Define directories
+RESULT := $(OUTPUT_ROOT)/result
+BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET)
+PREFIX := $(RESULT)/$(HOST)
+TARGETDIR := $(PREFIX)/$(TARGET)
+SYSROOT := $(TARGETDIR)/sys-root
+DOWNLOAD := $(OUTPUT_ROOT)/download
+SRCDIR := $(OUTPUT_ROOT)/src
+
+# Marker file for unpacking rpms
+rpms := $(SYSROOT)/rpms_unpacked
+
+# Need to patch libs that are linker scripts to use non-absolute paths
+libs := $(SYSROOT)/libs_patched
+
+##########################################################################################
+# Unpack source packages
+
+# Generate downloading + unpacking of sources.
+define Download
+  $(1)_DIR = $(abspath $(SRCDIR)/$(basename $(basename $(notdir $($(1))))))
+  $(1)_CFG = $$($(1)_DIR)/configure
+  $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
+
+  $$($(1)_CFG) : $$($(1)_FILE)
+	mkdir -p $$(SRCDIR)
+	tar -C $$(SRCDIR) -x$$(if $$(findstring .gz, $$<),z,j)f $$<
+	$$(foreach p,$$(abspath $$(wildcard $$(notdir $$($(1)_DIR)).patch)), \
+	  echo PATCHING $$(p) ; \
+	  patch -d $$($(1)_DIR) -p1 -i $$(p) ; \
+	)
+	touch $$@
+
+  $$($(1)_FILE) :
+	wget -P $(DOWNLOAD) $$($(1))
+endef
+
+# Download and unpack all source packages
+$(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC,$(eval $(call Download,$(p))))
+
+##########################################################################################
+# Unpack RPMS
+
+# Note. For building linux you should install rpm2cpio.
+define unrpm
+  $(SYSROOT)/$(notdir $(1)).unpacked \
+    : $(1)
+  $$(rpms) : $(SYSROOT)/$(notdir $(1)).unpacked
+endef
+
+%.unpacked :
+	$(info Unpacking target rpms and libraries from $<)
+	@(mkdir -p $(@D); \
+	cd $(@D); \
+	rpm2cpio $< | \
+	    cpio --extract --make-directories \
+	        -f \
+	        "./usr/share/doc/*" \
+	        "./usr/share/man/*" \
+	        "./usr/X11R6/man/*" \
+	        "*/X11/locale/*" \
+	    || die ; )
+	touch $@
+
+$(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
+
+##########################################################################################
+
+# Note: MUST create a <sys-root>/usr/lib even if not really needed.
+# gcc will use a path relative to it to resolve lib64. (x86_64).
+# we're creating multi-lib compiler with 32bit libc as well, so we should
+# have it anyway, but just to make sure...
+# Patch libc.so and libpthread.so to force linking against libraries in sysroot
+# and not the ones installed on the build machine.
+$(libs) : $(rpms)
+	@echo Patching libc and pthreads
+	@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
+	  (cat $$f | sed -e 's|/usr/lib64/||g' \
+	      -e 's|/usr/lib/||g' \
+	      -e 's|/lib64/||g' \
+	      -e 's|/lib/||g' ) > $$f.tmp ; \
+	  mv $$f.tmp $$f ; \
+	done)
+	@mkdir -p $(SYSROOT)/usr/lib
+	@touch $@
+
+##########################################################################################
+
+# Define marker files for each source package to be compiled
+$(foreach t,binutils mpfr gmp mpc gcc ccache,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
+
+##########################################################################################
+
+# Default base config
+CONFIG = --target=$(TARGET) \
+    --host=$(HOST) --build=$(BUILD) \
+    --prefix=$(PREFIX)
+
+PATHEXT = $(RESULT)/$(BUILD)/bin:
+
+PATHPRE = PATH=$(PATHEXT)$(PATH)
+BUILDPAR = -j16
+
+# Default commands to when making
+MAKECMD =
+INSTALLCMD = install
+
+
+declare_tools = CC$(1)=$(2)gcc LD$(1)=$(2)ld AR$(1)=$(2)ar AS$(1)=$(2)as RANLIB$(1)=$(2)ranlib CXX$(1)=$(2)g++ OBJDUMP$(1)=$(2)objdump
+
+ifeq ($(HOST),$(BUILD))
+  ifeq ($(HOST),$(TARGET))
+    TOOLS = $(call declare_tools,_FOR_TARGET,)
+  endif
+endif
+
+TOOLS ?= $(call declare_tools,_FOR_TARGET,$(TARGET)-)
+
+##########################################################################################
+
+# Create a TARGET bfd + libiberty only.
+# Configure one or two times depending on mulitlib arch.
+# If multilib, the second should be 32-bit, and we resolve
+# CFLAG_<name> to most likely -m32.
+define mk_bfd
+  $$(info Libs for $(1))
+  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
+      : CFLAGS += $$(CFLAGS_$(1))
+  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
+      : LIBDIRS = --libdir=$(TARGETDIR)/$(1)
+
+  bfdlib += $$(TARGETDIR)/$$(binutils_ver)-$(subst /,-,$(1)).done
+  bfdmakes += $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile
+endef
+
+# Create one set of bfds etc for each multilib arch
+$(foreach l,$(LIBDIRS),$(eval $(call mk_bfd,$(l))))
+
+# Only build these two libs.
+$(bfdlib) : MAKECMD = all-libiberty all-bfd
+$(bfdlib) : INSTALLCMD = install-libiberty install-bfd
+
+# Building targets libbfd + libiberty. HOST==TARGET, i.e not
+# for a cross env.
+$(bfdmakes) : CONFIG = --target=$(TARGET) \
+    --host=$(TARGET) --build=$(BUILD) \
+    --prefix=$(TARGETDIR) \
+    --with-sysroot=$(SYSROOT) \
+    $(LIBDIRS)
+
+$(bfdmakes) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
+
+##########################################################################################
+
+$(gcc) \
+    $(binutils) \
+    $(gmp) \
+    $(mpfr) \
+    $(mpc) \
+    $(bfdmakes) \
+    $(ccache) : ENVS += $(TOOLS)
+
+# libdir to work around hateful bfd stuff installing into wrong dirs...
+# ensure we have 64 bit bfd support in the HOST library. I.e our
+# compiler on i686 will know 64 bit symbols, BUT later
+# we build just the libs again for TARGET, then with whatever the arch
+# wants.
+$(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
+
+# Makefile creation. Simply run configure in build dir.
+$(bfdmakes) \
+$(BUILDDIR)/$(binutils_ver)/Makefile \
+    : $(BINUTILS_CFG)
+	$(info Configuring $@. Log in $(@D)/log.config)
+	@mkdir -p $(@D)
+	( \
+	  cd $(@D) ; \
+	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
+	      $(BINUTILS_CFG) \
+	      $(CONFIG) \
+	      --with-sysroot=$(SYSROOT) \
+	      --disable-nls \
+	      --program-prefix=$(TARGET)- \
+	      --enable-multilib \
+	) > $(@D)/log.config 2>&1
+	@echo 'done'
+
+$(BUILDDIR)/$(mpfr_ver)/Makefile \
+    : $(MPFR_CFG)
+	$(info Configuring $@. Log in $(@D)/log.config)
+	@mkdir -p $(@D)
+	( \
+	  cd $(@D) ; \
+	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
+	      $(MPFR_CFG) \
+	      $(CONFIG) \
+	      --program-prefix=$(TARGET)- \
+	      --enable-shared=no \
+	      --with-gmp=$(PREFIX) \
+	) > $(@D)/log.config 2>&1
+	@echo 'done'
+
+$(BUILDDIR)/$(gmp_ver)/Makefile \
+    : $(GMP_CFG)
+	$(info Configuring $@. Log in $(@D)/log.config)
+	@mkdir -p $(@D)
+	( \
+	  cd $(@D) ; \
+	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
+	      $(GMP_CFG) \
+	      --host=$(HOST) --build=$(BUILD) \
+	      --prefix=$(PREFIX) \
+	      --disable-nls \
+	      --program-prefix=$(TARGET)- \
+	      --enable-shared=no \
+	      --with-mpfr=$(PREFIX) \
+	) > $(@D)/log.config 2>&1
+	@echo 'done'
+
+$(BUILDDIR)/$(mpc_ver)/Makefile \
+    : $(MPC_CFG)
+	$(info Configuring $@. Log in $(@D)/log.config)
+	@mkdir -p $(@D)
+	( \
+	  cd $(@D) ; \
+	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
+	      $(MPC_CFG) \
+	      $(CONFIG) \
+	      --program-prefix=$(TARGET)- \
+	      --enable-shared=no \
+	      --with-mpfr=$(PREFIX) \
+	      --with-gmp=$(PREFIX) \
+	) > $(@D)/log.config 2>&1
+	@echo 'done'
+
+# Only valid if glibc target -> linux
+# proper destructor handling for c++
+ifneq (,$(findstring linux,$(TARGET)))
+  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --enable-__cxa_atexit
+endif
+
+# Want:
+# c,c++
+# shared libs
+# multilib (-m32/-m64 on x64)
+# skip native language.
+# and link and assemble with the binutils we created
+# earlier, so --with-gnu*
+$(BUILDDIR)/$(gcc_ver)/Makefile \
+    : $(GCC_CFG)
+	$(info Configuring $@. Log in $(@D)/log.config)
+	mkdir -p $(@D)
+	( \
+	  cd $(@D) ; \
+	  $(PATHPRE) $(ENVS) $(GCC_CFG) $(EXTRA_CFLAGS) \
+	      $(CONFIG) \
+	      --with-sysroot=$(SYSROOT) \
+	      --enable-languages=c,c++ \
+	      --enable-shared \
+	      --enable-multilib \
+	      --disable-nls \
+	      --with-gnu-as \
+	      --with-gnu-ld \
+	      --with-mpfr=$(PREFIX) \
+	      --with-gmp=$(PREFIX) \
+	      --with-mpc=$(PREFIX) \
+	) > $(@D)/log.config 2>&1
+	@echo 'done'
+
+# need binutils for gcc
+$(gcc) : $(binutils)
+
+# as of 4.3 or so need these for doing config
+$(BUILDDIR)/$(gcc_ver)/Makefile : $(gmp) $(mpfr) $(mpc)
+$(mpfr) : $(gmp)
+$(mpc) : $(gmp) $(mpfr)
+
+##########################################################################################
+# very straightforward. just build a ccache. it is only for host.
+$(BUILDDIR)/$(ccache_ver)/Makefile \
+    : $(CCACHE_CFG)
+	$(info Configuring $@. Log in $(@D)/log.config)
+	@mkdir -p $(@D)
+	@( \
+	  cd $(@D) ; \
+	  $(PATHPRE) $(ENVS) $(CCACHE_CFG) \
+	      $(CONFIG) \
+	) > $(@D)/log.config 2>&1
+	@echo 'done'
+
+gccpatch = $(TARGETDIR)/gcc-patched
+
+##########################################################################################
+# For some reason cpp is not created as a target-compiler
+ifeq ($(HOST),$(TARGET))
+  $(gccpatch) : $(gcc) link_libs
+	@echo -n 'Creating compiler symlinks...'
+	@for f in cpp; do \
+	  if [ ! -e $(PREFIX)/bin/$(TARGET)-$$f ]; \
+	  then \
+	    cd $(PREFIX)/bin && \
+	    ln -s $$f $(TARGET)-$$f ; \
+	  fi \
+	done
+	@touch $@
+	@echo 'done'
+
+  ##########################################################################################
+  # Ugly at best. Seems that when we compile host->host compiler, that are NOT
+  # the BUILD compiler, the result will not try searching for libs in package root.
+  # "Solve" this by create links from the target libdirs to where they are.
+  link_libs:
+	@echo -n 'Creating library symlinks...'
+	@$(foreach l,$(LIBDIRS), \
+	for f in `cd $(PREFIX)/$(l) && ls`; do \
+	  if [ ! -e $(TARGETDIR)/$(l)/$$f ]; then \
+	    mkdir -p $(TARGETDIR)/$(l) && \
+	    cd $(TARGETDIR)/$(l)/ && \
+	    ln -s $(if $(findstring /,$(l)),../,)../../$(l)/$$f $$f; \
+	  fi \
+	done;)
+	@echo 'done'
+else
+  $(gccpatch) :
+	@echo 'done'
+endif
+
+##########################################################################################
+# Build in two steps.
+# make <default>
+# make install.
+# Use path to our build hosts cross tools
+# Always need to build cross tools for build host self.
+$(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
+	$(info Building $(basename $@). Log in $(<D)/log.build)
+	$(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.build 2>&1
+	@echo -n 'installing...'
+	$(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.install 2>&1
+	@touch $@
+	@echo 'done'
+
+##########################################################################################
+
+bfdlib : $(bfdlib)
+binutils : $(binutils)
+rpms : $(rpms)
+libs : $(libs)
+sysroot : rpms libs
+gcc : sysroot $(gcc) $(gccpatch)
+all : binutils gcc bfdlib
+
+# this is only built for host. so separate.
+ccache : $(ccache)
+
+.PHONY : gcc all binutils bfdlib link_libs rpms libs sysroot
--- a/make/hotspot-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# HOTSPOT TARGETS
-################################################################
-
-# All the output from a hotspot build should be re-located to the
-#    build output area.
-#
-HOTSPOT_OUTPUTDIR = $(HOTSPOT_DIR)/outputdir
-
-# HOTSPOT_EXPORT_PATH points to a dir that contains files
-# that are needed in an SDK build, in the same relative positions as
-# these files are in an SDK image.
-# The SDK java/redist/Makefile will copy files from HOTSPOT_EXPORT_PATH
-# into the SDK being built.
-# This is the export path supplied to the hotspot makefiles.
-#
-HOTSPOT_EXPORT_PATH = $(HOTSPOT_DIR)/import
-
-# Default targets
-HOTSPOT = hotspot-sanity hotspot-build
-
-hotspot:: $(HOTSPOT)
-
-# Hotspot clobber removes the output directory and exported files
-hotspot-clobber:: 
-	$(RM) -r $(HOTSPOT_OUTPUTDIR)
-	$(RM) -r $(HOTSPOT_EXPORT_PATH)
-
-hotspot-sanity::
-	@$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
-	@$(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
-	@$(ECHO) "Hotspot Settings: \n" \
-	    "     HOTSPOT_BUILD_JOBS  = $(HOTSPOT_BUILD_JOBS) \n"  \
-	    "     HOTSPOT_OUTPUTDIR   = $(HOTSPOT_OUTPUTDIR) \n"  \
-	    "     HOTSPOT_EXPORT_PATH = $(HOTSPOT_EXPORT_PATH) \n"  \
-	    "\n"  >> $(MESSAGE_FILE)
-
-#
-# Basic hotspot build and export of it's files
-#
-
-HOTSPOT_TARGET = all_product
-ifeq ($(DEBUG_NAME), debug)
-  HOTSPOT_TARGET = all_debug
-endif
-ifeq ($(DEBUG_NAME), fastdebug)
-  HOTSPOT_TARGET = all_fastdebug
-endif
-BUILD_FLAVOR=$(HOTSPOT_TARGET:all_%=%)
-
-ifeq ($(ZERO_BUILD), true)
-  ifeq ($(SHARK_BUILD), true)
-    HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
-  else
-    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
-  endif
-endif
-
-HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)
-HOTSPOT_BUILD_ARGUMENTS += ALT_OUTPUTDIR=$(HOTSPOT_OUTPUTDIR)
-HOTSPOT_BUILD_ARGUMENTS += ALT_EXPORT_PATH=$(HOTSPOT_EXPORT_PATH)
-HOTSPOT_BUILD_ARGUMENTS += BUILD_FLAVOR=$(BUILD_FLAVOR)
-
-# Why do these need to be passed in? Because of windows nmake? and MAKEFLAGS=?
-#   Or is there something wrong with hotspot/make/Makefile?
-HOTSPOT_BUILD_ARGUMENTS += ALT_SLASH_JAVA=$(SLASH_JAVA)
-HOTSPOT_BUILD_ARGUMENTS += ALT_BOOTDIR=$(BOOTDIR)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  HOTSPOT_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-# Move to COMMON_BUILD_ARGUMENTS when all repos support
-# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
-ifdef FULL_DEBUG_SYMBOLS
-  HOTSPOT_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
-endif
-
-ifdef ZIP_DEBUGINFO_FILES
-  HOTSPOT_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
-endif
-
-hotspot-build::
-	$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
-	$(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
-	@$(call MakeStart,hotspot,$(HOTSPOT_TARGET))
-	$(CD) $(HOTSPOT_TOPDIR)/make && \
-	    $(MAKE) $(HOTSPOT_BUILD_ARGUMENTS) $(HOTSPOT_TARGET)
-	@$(call MakeFinish,hotspot,$(HOTSPOT_TARGET))
-
-#####################
-# .PHONY
-#####################
-.PHONY: hotspot-build hotspot-clobber hotspot-sanity
-
--- a/make/install-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# INSTALL  TARGETS
-################################################################
-
-install:  install-build
-
-# The generated java files are generated as a set, so instead of
-# setting the INSTALL variable to that list of files, set it to
-# the .PHONY target that generates the set of files.
-INSTALL = install
-
-# put the generated patch in their own place in OUTPUTDIR
-INSTALL_OUTPUTDIR = $(ABS_OUTPUTDIR)
-
-INSTALL_DEBUG_NAME=fastdebug
-
-INSTALL_BUILD_TARGETS = sanity all
-INSTALL_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
-			ALT_OUTPUTDIR=$(INSTALL_OUTPUTDIR) \
-			ALT_RTPATCH_DIR=$(ALT_RTPATCH_DIR) \
-			ALT_BASE_IMAGE_ZIP=$(ALT_BASE_IMAGE_ZIP) \
-			ALT_BASE_IMAGE_DIR=$(ALT_BASE_IMAGE_DIR) \
-			ALT_NEW_IMAGE_DIR=$(ALT_NEW_IMAGE_DIR) \
-			ALT_BUNDLE_DATE=$(BUNDLE_DATE) \
-			INSTALL_DEBUG_NAME=$(INSTALL_DEBUG_NAME)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  INSTALL_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-install: install-build
-
-install-build:
-ifeq ($(BUILD_INSTALL), true)
-	@$(call MakeStart,install,$(INSTALL_BUILD_TARGETS))
-	($(CD) $(INSTALL_TOPDIR)/make && \
-	  $(MAKE) $(INSTALL_BUILD_TARGETS) $(INSTALL_BUILD_ARGUMENTS))
-	@$(call MakeFinish,install,$(INSTALL_BUILD_TARGETS))
-endif
-
-update-patcher:
-ifeq ($(BUILD_INSTALL), true)
-	if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \
-	  $(call MakeStart,install_update,all); \
-	  ( $(CD) $(INSTALL_TOPDIR)/make/update && \
-	    $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \
-	  $(call MakeFinish,install_update,all); \
-	fi
-endif
-
-update-patchgen:
-ifeq ($(BUILD_INSTALL), true)
-	if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \
-	  $(call MakeStart,install_update,patchgen); \
-	  ( $(CD) $(INSTALL_TOPDIR)/make/update && \
-	    $(MAKE) patchgen $(INSTALL_BUILD_ARGUMENTS) ); \
-	  $(call MakeFinish,install_update,patchgen); \
-	fi
-endif
-
-installer:
-ifeq ($(BUILD_INSTALL), true)
-	if [ -r $(INSTALL_TOPDIR)/make/installer/Makefile ]; then \
-	  $(call MakeStart,install_installer,all); \
-	  ( $(CD) $(INSTALL_TOPDIR)/make/installer && \
-	    $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \
-	  $(call MakeFinish,install_installer,all); \
-	fi
-endif
-
-combo_build:
-	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
-	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
-	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo
-	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all
-
-install-clobber:
-ifeq ($(BUILD_INSTALL), true)
-	@$(call MakeStart,install,clobber)
-	($(CD) $(INSTALL_TOPDIR)/make && \
-	  $(MAKE) clobber $(INSTALL_BUILD_ARGUMENTS))
-	@$(call MakeFinish,install,clobber)
-endif
-
-install-sanity:: 
-ifeq ($(BUILD_INSTALL), true)
-	($(CD) $(INSTALL_TOPDIR)/make && \
-	  $(MAKE) sanity $(INSTALL_BUILD_ARGUMENTS))
-endif
-
-######################################
-# Rules for making the install
-######################################
-
-.PHONY: install install-build install-clobber install-sanity \
-	update-installer update-patchgen installer
--- a/make/jaxp-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JAXP TARGETS
-################################################################
-
-JAXP_BUILD_ARGUMENTS = \
-   $(COMMON_BUILD_ARGUMENTS) \
-   ALT_OUTPUTDIR=$(JAXP_OUTPUTDIR) \
-   ALT_BOOTDIR=$(BOOTDIR) \
-   ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  JAXP_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-jaxp: jaxp-build
-jaxp-build:
-	$(MKDIR) -p $(JAXP_OUTPUTDIR)
-	@$(call MakeStart,jaxp,all)
-	($(CD) $(JAXP_TOPDIR)/make && \
-	 $(MAKE) $(JAXP_BUILD_ARGUMENTS) all)
-	@$(call MakeFinish,jaxp,all)
-
-jaxp-clobber::
-	$(MKDIR) -p $(JAXP_OUTPUTDIR)
-	@$(call MakeStart,jaxp,clobber)
-	($(CD) $(JAXP_TOPDIR)/make &&  \
-	 $(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber)
-	@$(call MakeFinish,jaxp,clobber)
-
-.PHONY: jaxp jaxp-build jaxp-clobber
-
--- a/make/jaxws-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JAXWS TARGETS
-################################################################
-
-JAXWS_BUILD_ARGUMENTS = \
-   $(COMMON_BUILD_ARGUMENTS) \
-   ALT_OUTPUTDIR=$(JAXWS_OUTPUTDIR) \
-   ALT_BOOTDIR=$(BOOTDIR) \
-   ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  JAXWS_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-jaxws: jaxws-build
-jaxws-build:
-	$(MKDIR) -p $(JAXWS_OUTPUTDIR)
-	@$(call MakeStart,jaxws,all)
-	($(CD) $(JAXWS_TOPDIR)/make && \
-	 $(MAKE) $(JAXWS_BUILD_ARGUMENTS) all)
-	@$(call MakeFinish,jaxws,all)
-
-jaxws-clobber::
-	$(MKDIR) -p $(JAXWS_OUTPUTDIR)
-	@$(call MakeStart,jaxws,clobber)
-	($(CD) $(JAXWS_TOPDIR)/make &&  \
-	 $(MAKE) $(JAXWS_BUILD_ARGUMENTS) clobber)
-	@$(call MakeFinish,jaxws,clobber)
-
-.PHONY: jaxws jaxws-build jaxws-clobber
-
--- a/make/jdk-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-#
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JDK TARGETS
-################################################################
-
-JDK_JAVA_EXE = $(OUTPUTDIR)/bin/java$(EXE_SUFFIX)
-
-# NO_IMAGES may be set in conjunction with DEV_ONLY
-IMAGES_TARGET = images
-ifdef DEV_ONLY
-  ifdef NO_IMAGES
-    IMAGES_TARGET =
-  endif
-endif
-
-# GENERATE_DOCS determines if we ask for the docs target
-DOCS_TARGET = docs
-ifeq ($(GENERATE_DOCS),false)
-  DOCS_TARGET =
-endif
-  
-JDK_BUILD_TARGETS = sanity all $(DOCS_TARGET) $(IMAGES_TARGET)
-
-JDK_CLOBBER_TARGETS = clobber
-
-JDK_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
-    ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  JDK_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-ifeq ($(BUILD_CORBA), true)
-  JDK_BUILD_ARGUMENTS += ALT_CORBA_DIST=$(ABS_CORBA_DIST)
-endif
-ifeq ($(BUILD_JAXP), true)
-  JDK_BUILD_ARGUMENTS += ALT_JAXP_DIST=$(ABS_JAXP_DIST)
-endif
-ifeq ($(BUILD_JAXWS), true)
-  JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST)
-endif
-ifeq ($(BUILD_NASHORN), true)
-  JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST)
-endif
-
-ifeq ($(BUILD_HOTSPOT), true)
-  JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
-endif
-
-JDK_BUILD_ARGUMENTS += \
-        BUILD_HOTSPOT=$(BUILD_HOTSPOT)
-
-# Move to COMMON_BUILD_ARGUMENTS when all repos support
-# FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES:
-ifdef FULL_DEBUG_SYMBOLS
-  JDK_BUILD_ARGUMENTS += FULL_DEBUG_SYMBOLS=$(FULL_DEBUG_SYMBOLS)
-endif
-
-ifdef ZIP_DEBUGINFO_FILES
-  JDK_BUILD_ARGUMENTS += ZIP_DEBUGINFO_FILES="$(ZIP_DEBUGINFO_FILES)"
-endif
-
-
-$(JDK_JAVA_EXE):: jdk-build
-
-jdk: jdk-build
-jdk-build:
-	@$(call MakeStart,jdk,$(JDK_BUILD_TARGETS))
-	( $(CD) $(JDK_TOPDIR)/make && \
-	  $(MAKE) $(JDK_BUILD_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
-	@$(call MakeFinish,jdk,$(JDK_BUILD_TARGETS))
-
-jdk-clobber::
-	@$(call MakeStart,jdk,$(JDK_CLOBBER_TARGETS))
-	( $(CD) $(JDK_TOPDIR)/make && \
-	  $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
-	@$(call MakeFinish,jdk,$(JDK_CLOBBER_TARGETS))
-
-jdk-sanity::
-	( $(CD) $(JDK_TOPDIR)/make && \
-	  $(MAKE) sanity HOTSPOT_IMPORT_CHECK=false $(JDK_BUILD_ARGUMENTS) ; )
-
-compare-images: compare-image
-compare-image:
-	@$(call MakeStart,jdk,compare-image)
-	( $(CD) $(JDK_TOPDIR)/make && \
-	  $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image )
-	@$(call MakeFinish,jdk,compare-image)
-
-compare-images-clobber: compare-image-clobber
-compare-image-clobber:
-	@$(call MakeStart,jdk,compare-image-clobber)
-	( $(CD) $(JDK_TOPDIR)/make && \
-	  $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image-clobber )
-	@$(call MakeFinish,jdk,compare-image-clobber)
-
-.PHONY: jdk jdk-build jdk-clobber jdk-sanity 
-
--- a/make/jprt.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# JPRT rule to build
-################################################################
-
-# To get all the bundles from JPRT, use:
-#   jprt submit -buildenv HAVE_JPRT_SAVE_BUNDLES=true -control "..." ...
-
-DEFAULT_BUILD_FLAVOR=product
-
-# JPRT will define these when it builds
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-bundle.zip
-JPRT_ARCHIVE_INSTALL_BUNDLE=$(ABS_OUTPUTDIR)/$(DEFAULT_BUILD_FLAVOR)-install-bundle.zip
-
-ifeq ($(PLATFORM),windows)
-  ZIPFLAGS=-q
-else
-  # store symbolic links as the link
-  ZIPFLAGS=-q -y
-endif
-
-jprt_build_product:  sanity all_product_build
-	( $(CD) $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME) && \
-	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-ifdef HAVE_JPRT_SAVE_BUNDLES
-	( $(CD) $(OUTPUTDIR)/bundles && \
-	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . )
-endif
-
-jprt_build_fastdebug: fastdebug_build
-	( $(CD) $(OUTPUTDIR)/$(REL_JDK_FASTDEBUG_IMAGE_DIR) && \
-	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-jprt_build_debug: debug_build
-	( $(CD) $(OUTPUTDIR)/$(REL_JDK_DEBUG_IMAGE_DIR) && \
-	  $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . )
-
-################################################################
-#  PHONY
-################################################################
-
-.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
-
--- a/make/jprt.properties	Tue Dec 03 12:37:30 2013 -0800
+++ b/make/jprt.properties	Wed Jul 05 19:24:14 2017 +0200
@@ -66,15 +66,17 @@
 jprt.make.rule.default.test.targets=				\
     ${jprt.my.test.target.set:TESTNAME=langtools_jtreg},        \
     ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
-    ${jprt.my.test.target.set:TESTNAME=jdk_math}
+    ${jprt.my.test.target.set:TESTNAME=jdk_math},               \
+    ${jprt.my.test.target.set:TESTNAME=jdk_util}
+    
 
 # Default vm test targets (testset=core)
-jprt.vm.core.test.targets=                                      \
-    ${jprt.vm.default.test.targets}
+jprt.vm.core.test.targets=
 
 # Core jdk test targets (testset=core)
 jprt.make.rule.core.test.targets=                               \
-    ${jprt.make.rule.default.test.targets},                     \
+    ${jprt.my.test.target.set:TESTNAME=jdk_lang},               \
+    ${jprt.my.test.target.set:TESTNAME=jdk_math},               \
     ${jprt.my.test.target.set:TESTNAME=jdk_util},               \
     ${jprt.my.test.target.set:TESTNAME=jdk_io},			\
     ${jprt.my.test.target.set:TESTNAME=jdk_net},		\
@@ -83,13 +85,22 @@
     ${jprt.my.test.target.set:TESTNAME=jdk_security2},          \
     ${jprt.my.test.target.set:TESTNAME=jdk_security3},          \
     ${jprt.my.test.target.set:TESTNAME=jdk_rmi},                \
+    ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
+    ${jprt.my.test.target.set:TESTNAME=jdk_time},               \
+    ${jprt.my.test.target.set:TESTNAME=jdk_other},              \
+    ${jprt.my.test.target.set:TESTNAME=core_tools}
+
+# Svc vm test targets (testset=svc)
+jprt.vm.svc.test.targets=
+
+# Core jdk test targets (testset=svc)
+jprt.make.rule.svc.test.targets=                                \
     ${jprt.my.test.target.set:TESTNAME=jdk_management},         \
+    ${jprt.my.test.target.set:TESTNAME=jdk_instrument},         \
     ${jprt.my.test.target.set:TESTNAME=jdk_jmx},                \
-    ${jprt.my.test.target.set:TESTNAME=jdk_text},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_tools},              \
+    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
     ${jprt.my.test.target.set:TESTNAME=jdk_jfr},                \
-    ${jprt.my.test.target.set:TESTNAME=jdk_time},               \
-    ${jprt.my.test.target.set:TESTNAME=jdk_other}
+    ${jprt.my.test.target.set:TESTNAME=svc_tools}
 
 # All vm test targets (testset=all)
 jprt.vm.all.test.targets=    					\
@@ -100,14 +111,24 @@
 # All jdk test targets (testset=all)
 jprt.make.rule.all.test.targets=    				\
     ${jprt.make.rule.core.test.targets}, 			\
+    ${jprt.make.rule.svc.test.targets},                         \
     ${jprt.my.test.target.set:TESTNAME=jdk_awt},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_beans1},             \
     ${jprt.my.test.target.set:TESTNAME=jdk_beans2},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_beans3},		\
-    ${jprt.my.test.target.set:TESTNAME=jdk_jdi},                \
     ${jprt.my.test.target.set:TESTNAME=jdk_sound},		\
     ${jprt.my.test.target.set:TESTNAME=jdk_swing}
 
+# PIT vm test targets (testset=pit)
+jprt.vm.pit.test.targets=                                       \
+   ${jprt.vm.all.test.targets}
+
+# PIT jdk test targets (testset=pit)
+jprt.make.rule.pit.test.targets=                                \
+    ${jprt.my.test.target.set:TESTNAME=langtools_jtreg},        \
+    ${jprt.make.rule.core.test.targets},                        \
+    ${jprt.make.rule.svc.test.targets}
+
 # JCK test targets in test/Makefile (no windows)
 jprt.my.jck.test.target.set=					\
     solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, 		\
--- a/make/langtools-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# LANGTOOLS TARGETS
-################################################################
-
-LANGTOOLS_BUILD_ARGUMENTS = \
-   $(COMMON_BUILD_ARGUMENTS) \
-   ALT_OUTPUTDIR=$(LANGTOOLS_OUTPUTDIR) \
-   ALT_BOOTDIR=$(BOOTDIR)
-
-langtools: langtools-build
-langtools-build:
-	$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)
-	@$(call MakeStart,langtools,all)
-	($(CD) $(LANGTOOLS_TOPDIR)/make && \
-	  $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all)
-	@$(call MakeFinish,langtools,all)
-
-langtools-clobber::
-	$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)
-	@$(call MakeStart,langtools,clobber)
-	($(CD) $(LANGTOOLS_TOPDIR)/make &&  \
-	  $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber)
-	@$(call MakeFinish,langtools,clobber)
-
-.PHONY: langtools langtools-build langtools-clobber
-
--- a/make/nashorn-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# NASHORN TARGETS
-################################################################
-
-NASHORN_BUILD_ARGUMENTS = \
-   $(COMMON_BUILD_ARGUMENTS) \
-   ALT_OUTPUTDIR=$(NASHORN_OUTPUTDIR) \
-   ALT_BOOTDIR=$(BOOTDIR) \
-   ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-   NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-# Default targets
-NASHORN = nashorn-build
-
-nashorn: nashorn-build
-nashorn-build:
-	$(MKDIR) -p $(NASHORN_OUTPUTDIR)
-	@$(call MakeStart,nashorn,all)
-	($(CD) $(NASHORN_TOPDIR)/make && \
-	 $(MAKE) $(NASHORN_BUILD_ARGUMENTS) all)
-	@$(call MakeFinish,nashorn,all)
-
-nashorn-clobber::
-	$(MKDIR) -p $(NASHORN_OUTPUTDIR)
-	@$(call MakeStart,nashorn,clobber)
-	($(CD) $(NASHORN_TOPDIR)/make &&  \
-	 $(MAKE) $(NASHORN_BUILD_ARGUMENTS) clobber)
-	@$(call MakeFinish,nashorn,clobber)
-
-.PHONY: nashorn nashorn-build nashorn-clobber 
-
--- a/make/sanity-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,336 +0,0 @@
-#
-# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# SANITY
-################################################################
-
-sanity:: pre-sanity settings insane environment
-
-ifeq ($(BUILD_HOTSPOT), true)
-  sanity:: hotspot-sanity
-endif
-
-ifeq ($(BUILD_DEPLOY), true)
-  sanity:: deploy-sanity
-endif
-
-ifeq ($(BUILD_JDK), true)
-  sanity:: jdk-sanity
-endif
-
-# Only need these sanity rules when not doing a debug build
-ifeq ($(DEBUG_NAME),)
-
-  ifeq ($(BUILD_INSTALL), true)
-    sanity:: install-sanity
-  endif
-
-  ifeq ($(BUILD_SPONSORS), true)
-    sanity:: sponsors-sanity
-  endif
-
-endif
-
-sanity:: post-sanity
-
-source-sanity : pre-sanity post-sanity
-
-$(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE):
-	@$(prep-target)
-
-purge-sanity: $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
-	-@$(RM) $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
-
-pre-sanity: purge-sanity
-
-# this should be the last rule in any target's sanity rule.
-post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-install post-sanity-deploy:
-	@if [ -r $(MESSAGE_FILE) ]; then \
-	  $(ECHO) "" ; \
-	  $(CAT) $(MESSAGE_FILE) ; \
-	fi
-	@if [ -r $(WARNING_FILE) ]; then \
-	  $(CAT) $(WARNING_FILE) ; \
-	fi
-	@if [ "x$(INSANE)" != x ]; then \
-	  $(ECHO) "INSANE mode requested. \n" \
-	    "Sanity will not force a build termination, even with errors.\n" \
-	    "" >> $(ERROR_FILE); \
-	fi
-	@if [ -r $(ERROR_FILE) ]; then \
-	  if [ "x$(INSANE)" = x ]; then \
-	    $(ECHO) "Exiting because of the above error(s). \n" \
-	      "">> $(ERROR_FILE); \
-	  fi ; \
-	  $(CAT) $(ERROR_FILE) ; \
-	  if [ "x$(INSANE)" = x ]; then \
-	    exit 1 ; \
-	  fi ; \
-	fi
-ifdef PEDANTIC
-	@if [ -r $(WARNING_FILE) ]; then \
-	  $(ECHO) "PEDANTIC mode requested. \n" \
-	    "Exiting because of the above warning(s). \n" \
-	    "" >> $(ERROR_FILE); \
-	  $(CAT) $(ERROR_FILE) ; \
-	  exit 1 ; \
-	fi
-endif
-	@if [ ! -r $(ERROR_FILE) ]; then \
-	  $(ECHO) "Sanity check passed." ; \
-	fi
-
-insane:
-ifdef INSANE
-	@$(ECHO) "WARNING: You are building in 'INSANE' mode. You \n" \
-	   "        should not use this mode, and in fact, \n" \
-	   "        it may be removed at any time. If you \n" \
-	   "        have build problems as a result of using \n" \
-	   "        INSANE mode, then you should not expect \n" \
-	   "        assistance from anyone with the problems \n" \
-	   "        or consequences you experience. \n" \
-	   "" >> $(WARNING_FILE)
-endif
-
-# Get list of environment variables set that we do not want set
-ifdef ALT_HOTSPOT_SERVER_PATH
-  DO_NOT_SET_LIST += ALT_HOTSPOT_SERVER_PATH
-endif
-ifdef ALT_HOTSPOT_CLIENT_PATH
-  DO_NOT_SET_LIST += ALT_HOTSPOT_CLIENT_PATH
-endif
-ifdef ALT_HOTSPOT_LIB_PATH
-  DO_NOT_SET_LIST += ALT_HOTSPOT_LIB_PATH
-endif
-
-# Error message for environment variable set that should not be
-%.do_not_set:
-	@$(ECHO) "ERROR: Your build environment has the variable\n" \
-	   "        $* defined. Please unset it and restart your build. \n" \
-	   "" >> $(ERROR_FILE)
-
-# Check the environment variables
-environment: $(DO_NOT_SET_LIST:%=%.do_not_set)
-ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_LANGTOOLS), true)
-	@$(ECHO) "WARNING: You are not building the LANGTOOLS sources.\n" \
-           "        Lang tools (javac) will be obtained from \n" \
-           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
-           "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(JAXP_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_JAXP), true)
-	@$(ECHO) "WARNING: You are not building the JAXP sources.\n" \
-           "        The jaxp files will be obtained from \n" \
-           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
-           "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(JAXWS_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_JAXWS), true)
-	@$(ECHO) "WARNING: You are not building the JAXWS sources.\n" \
-           "        The jaxws files will be obtained from \n" \
-           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
-           "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(CORBA_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_CORBA), true)
-	@$(ECHO) "WARNING: You are not building the CORBA sources.\n" \
-           "        The corba files will be obtained from \n" \
-           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
-           "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(HOTSPOT_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_HOTSPOT), true)
-	@$(ECHO) "WARNING: You are not building the HOTSPOT sources.\n" \
-           "        Hotspot libs will be obtained from \n" \
-           "        the location set in ALT_HOTSPOT_IMPORT_PATH. \n" \
-           "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(JDK_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_JDK), true)
-	@$(ECHO) "WARNING: You are not building the JDK sources.\n" \
-	   "        This will result in a development-only\n" \
-	   "        build of the JDK , lacking the jdk binaries.\n" \
-	   "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(NASHORN_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_NASHORN), true)
-	@$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \
-           "        The nashorn files will be obtained from \n" \
-           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
-           "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(DEPLOY_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_DEPLOY), true)
-	@$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
-	   "        This will result in a development-only\n" \
-	   "        build of the JDK, lacking the plugin and javaws binaries.\n" \
-	   "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(INSTALL_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_INSTALL), true)
-	@$(ECHO) "WARNING: You are not building the INSTALL sources.\n" \
-	   "        This will result in a development-only\n" \
-	   "        build of the JDK, lacking the installation bundles\n" \
-	   "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(SPONSORS_SRC_AVAILABLE), true)
-  ifneq ($(BUILD_SPONSORS), true)
-	@$(ECHO) "WARNING: You are not building the SPONSORS sources.\n" \
-	   "" >> $(WARNING_FILE)
-  endif
-endif
-ifeq ($(GENERATE_DOCS),false)
-	@$(ECHO) "WARNING: This build does not include generating javadoc.\n" \
-	   "" >> $(WARNING_FILE)
-endif
-ifdef NO_DEMOS
-	@$(ECHO) "WARNING: This build and any install images will not include demos.\n" \
-	   "" >> $(WARNING_FILE)
-endif
-ifdef NO_SAMPLES
-	@$(ECHO) "WARNING: This build and any install images will not include samples.\n" \
-	   "" >> $(WARNING_FILE)
-endif
-ifdef NO_IMAGES
-	@$(ECHO) "WARNING: Your build environment has the variable NO_IMAGES\n" \
-	   "        defined. This will result in a development-only\n" \
-	   "        build of the JDK, lacking the install images\n" \
-	   "        and bundles.\n" \
-	   "" >> $(WARNING_FILE)
-endif
-ifdef DEV_ONLY
-	@$(ECHO) "WARNING: Your build environment has the variable DEV_ONLY\n" \
-	   "        defined. This will result in a development-only\n" \
-	   "        build of the JDK, lacking the documentation\n" \
-	   "        build and installation bundles.\n" \
-	   "" >> $(WARNING_FILE)
-endif
-
-######################################################
-# dump out the variable settings...
-######################################################
-ifneq ($(PLATFORM), windows)
-  ifndef HOSTNAME
-    HOSTNAME := $(shell hostname)
-  endif
-endif
-settings::
-	@$(ECHO) "Build Machine Information:" >> $(MESSAGE_FILE)
-ifeq ($(PLATFORM), windows)
-	@$(ECHO) "   build machine = $(COMPUTERNAME)"  >> $(MESSAGE_FILE)
-else
-	@$(ECHO) "   build machine = $(HOSTNAME)"  >> $(MESSAGE_FILE)
-endif
-	@$(ECHO) "" >> $(MESSAGE_FILE)
-	@$(ECHO) "Build Directory Structure:" >> $(MESSAGE_FILE)
-	@$(ECHO) "   CWD = `$(PWD)`" >> $(MESSAGE_FILE)
-	@$(ECHO) "   TOPDIR = $(TOPDIR)"  >> $(MESSAGE_FILE)
-ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
-	@$(ECHO) "   LANGTOOLS_TOPDIR = $(LANGTOOLS_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXP_SRC_AVAILABLE), true)
-	@$(ECHO) "   JAXP_TOPDIR = $(JAXP_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXWS_SRC_AVAILABLE), true)
-	@$(ECHO) "   JAXWS_TOPDIR = $(JAXWS_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(CORBA_SRC_AVAILABLE), true)
-	@$(ECHO) "   CORBA_TOPDIR = $(CORBA_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(HOTSPOT_SRC_AVAILABLE), true)
-	@$(ECHO) "   HOTSPOT_TOPDIR = $(HOTSPOT_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(JDK_SRC_AVAILABLE), true)
-	@$(ECHO) "   JDK_TOPDIR = $(JDK_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(NASHORN_SRC_AVAILABLE), true)
-	@$(ECHO) "   NASHORN_TOPDIR = $(NASHORN_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(DEPLOY_SRC_AVAILABLE), true)
-	@$(ECHO) "   DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(INSTALL_SRC_AVAILABLE), true)
-	@$(ECHO) "   INSTALL_TOPDIR = $(INSTALL_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-ifeq ($(SPONSORS_SRC_AVAILABLE), true)
-	@$(ECHO) "   SPONSORS_TOPDIR = $(SPONSORS_TOPDIR)"  >> $(MESSAGE_FILE)
-endif
-	@$(ECHO) "" >> $(MESSAGE_FILE)
-ifneq ($(SKIP_COMPARE_IMAGES), true)
-	@$(ECHO) "External File/Binary Locations:" >> $(MESSAGE_FILE)
-	@$(ECHO) "   PREVIOUS_JRE_BUNDLE = $(PREVIOUS_JRE_BUNDLE) " >> $(MESSAGE_FILE)
-	@$(ECHO) "   PREVIOUS_JDK_BUNDLE = $(PREVIOUS_JDK_BUNDLE) " >> $(MESSAGE_FILE)
-	@$(ECHO) "" >> $(MESSAGE_FILE)
-endif
-	@$(ECHO) "Build Directives:" >> $(MESSAGE_FILE)
-ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_LANGTOOLS = $(BUILD_LANGTOOLS) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXP_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_JAXP = $(BUILD_JAXP) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(JAXWS_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_JAXWS = $(BUILD_JAXWS) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(CORBA_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_CORBA = $(BUILD_CORBA) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(HOTSPOT_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_HOTSPOT = $(BUILD_HOTSPOT) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(JDK_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_JDK    = $(BUILD_JDK) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(NASHORN_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(DEPLOY_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_DEPLOY  = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(INSTALL_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_INSTALL = $(BUILD_INSTALL) " >> $(MESSAGE_FILE)
-endif
-ifeq ($(SPONSORS_SRC_AVAILABLE), true)
-	@$(ECHO) "   BUILD_SPONSORS = $(BUILD_SPONSORS) " >> $(MESSAGE_FILE)
-endif
-	@$(ECHO) "   DEBUG_CLASSFILES = $(DEBUG_CLASSFILES) " >> $(MESSAGE_FILE)
-	@$(ECHO) "   DEBUG_BINARIES = $(DEBUG_BINARIES) " >> $(MESSAGE_FILE)
-	@$(ECHO) "" >> $(MESSAGE_FILE)
-
-.PHONY: sanity settings pre-sanity insane \
-	post-sanity post-sanity-hotspot post-sanity-jdk \
-	post-sanity-install post-sanity-deploy \
-	environment
--- a/make/scripts/fixpath.pl	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-#!/bin/perl
-
-#
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Crunch down the input(s) to Windows short (mangled) form.
-# Any elements not actually found in the filesystem will be dropped.
-#
-# This script needs three modes:
-#   1) DOS mode with drive letter followed by : and ; path separator
-#   2) Cygwin mode with /cygdrive/<drive letter>/ and : path separator
-#   3) MinGW/MSYS mode with /<drive letter>/ and : path separator
-
-use strict;
-use warnings;
-use Getopt::Std;
-
-sub Usage() {
-    print ("Usage:\n $0 -d | -c | -m \<PATH\>\n");
-    print ("            -d DOS style (drive letter, :, and ; path separator)\n");
-    print ("            -c Cywgin style (/cygdrive/drive/ and : path separator)\n");
-    print ("            -m MinGW style (/drive/ and : path separator)\n");
-    exit 1;
-}
-# Process command line options:
-my %opts;
-getopts('dcm', \%opts) || Usage();
-
-if (scalar(@ARGV) != 1) {Usage()};
-
-# Translate drive letters such as C:/
-#   if MSDOS, Win32::GetShortPathName() does the work (see below).
-#   if Cygwin, use the /cygdrive/c/ form.
-#   if MinGW, use the /c/ form.
-my $path0;
-my $sep2;
-if (defined ($opts{'d'})) {
-    #MSDOS
-    $path0 = '';
-    $sep2 = ';';
-} elsif (defined ($opts{'c'})) {
-    #Cygwin
-    $path0 = '/cygdrive';
-    $sep2 = ':';
-} elsif (defined ($opts{'m'})) {
-    #MinGW/MSYS
-    $path0 = '';
-    $sep2 = ':';
-} else {
-    Usage();
-}
-
-my $input = $ARGV[0];
-my $sep1;
-
-# Is the input ';' separated, or ':' separated, or a simple string?
-if (($input =~ tr/;/;/) > 0) {
-    # One or more ';' implies Windows style path.
-    $sep1 = ';';
-} elsif (($input =~ tr/:/:/) > 1) {
-    # Two or more ':' implies Cygwin or MinGW/MSYS style path.
-    $sep1 = ':';
-} else {
-    # Otherwise, this is not a path - take up to the end of string in
-    # one piece.
-    $sep1 = '/$/';
-}
-
-# Split the input on $sep1 PATH separator and process the pieces.
-my @pieces;
-for (split($sep1, $input)) {
-    my $try = $_;
-
-    if (($try =~ /^\/cygdrive\/(.)\/(.*)$/) || ($try =~ /^\/(.)\/(.*)$/)) {
-        # Special case #1: This is a Cygwin /cygrive/<drive letter/ path.
-        # Special case #2: This is a MinGW/MSYS /<drive letter/ path.
-        $try = $1.':/'.$2;
-    } elsif ($try =~ /^\/(.*)$/) {
-        # Special case #3: check for a Cygwin or MinGW/MSYS form with a
-        # leading '/' for example '/usr/bin/bash'.
-        # Look up where this is mounted and rebuild the
-        # $try string with that information
-        my $cmd = "df --portability --all --human-readable $try";
-        my $line = qx ($cmd);
-        my $status = $?; 
-        if ($status == 0) {
-            my @lines = split ('\n', $line);
-            my ($device, $junk, $mountpoint);
-            # $lines[0] is the df header.
-            # Example string for split - we want the first and last elements:
-            # C:\jprt\products\P1\MinGW\msys\1.0  200G   78G  123G  39% /usr
-            ($device, $junk, $junk, $junk, $junk, $mountpoint) = split (/\s+/, $lines[1]);
-            # Replace $mountpoint with $device/ in the original string
-            $try =~ s|$mountpoint|$device/|;
-        } else {
-            printf ("Error %d from command %s\n%s\n", $status, $cmd, $line);
-        }
-    }
-
-    my $str = Win32::GetShortPathName($try);
-    if (!defined($str)){
-        # Special case #4: If the lookup did not work, loop through
-        # adding extensions listed in PATHEXT, looking for the first
-        # match.
-        for (split(';', $ENV{'PATHEXT'})) {
-            $str = Win32::GetShortPathName($try.$_);
-            if (defined($str)) {
-                last;
-            }
-        }
-    }
-
-    if (defined($str)){
-        if (!defined($opts{'d'})) {
-            # If not MSDOS, change C: to [/cygdrive]/c/
-            if ($str =~ /^(\S):(.*)$/) {
-                my $path1 = $1;
-                my $path2 = $2;
-                $str = $path0 . '/' . $path1 . '/' . $path2;
-            }
-        }
-        push (@pieces, $str);
-    }
-}
-
-# If input was a PATH, join the pieces back together with $sep2 path
-# separator.
-my $result;
-if (scalar(@pieces > 1)) {
-    $result = join ($sep2, @pieces);
-} else {
-    $result = $pieces[0];
-}
-
-if (defined ($result)) {
-
-    # Change all '\' to '/'
-    $result =~ s/\\/\//g;
-
-    # Remove duplicate '/'
-    $result =~ s/\/\//\//g;
-
-    # Map to lower case
-    $result =~ tr/A-Z/a-z/;
-
-    print ("$result\n");
-}
--- a/make/scripts/vsvars.sh	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,619 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This file should be used to set the Visual Studio environment
-#   variables normally set by the vcvars32.bat or vcvars64.bat file or
-#   SetEnv.cmd for older SDKs.
-
-########################################################################
-# Error functions
-msg() # message
-{
-  echo "$1" 1>&2
-}
-error() # message
-{
-  msg "ERROR: $1"
-  exit 1
-}
-warning() # message
-{
-  msg "WARNING: $1"
-}
-envpath() # path
-{
-  if [ "${fixpath}" != "" -a -d "$1" ] ; then
-    ${fixpath} "$1"
-  else
-    echo "$1"
-  fi
-}
-########################################################################
-
-
-# Defaults settings
-debug="false"
-verbose="false"
-
-set -e
-
-CYGWIN="nodosfilewarning ntsec"
-export CYGWIN
-
-# pathsepIn is always ; because the input strings are coming from
-# vcvarsxx.bat.  This is true under all of MKS, Cygwin, MINGW/msys
-pathsepIn=';'
-
-OS="`uname -s`"
-case "${OS}" in
-  CYGWIN*)
-    pathflag='-c'
-    devnull=/dev/null
-    pathsepOut=':'
-  ;;
-
-  MINGW*)
-    pathflag='-m'
-    devnull=/dev/null
-    pathsepOut=':'
-  ;;
-
-  *)
-    # MKS?
-    # Continue using dosname -s
-    pathflag='-s'
-    fixpath="dosname ${pathflag}"
-    fixpath_windows="${fixpath}"
-    fixpath_path="echo"
-    devnull=NUL
-    pathsepOut=';'
-  ;;
-esac
-
-case "${OS}" in
-  CYGWIN*|MINGW*)
-    t=`dirname ${0}`
-    wd=`cd ${t} 2> ${devnull} && pwd`
-    fixpath_script="${wd}/fixpath.pl"
-    if [ ! -f "${fixpath_script}" ] ; then
-        error "Does not exist: ${fixpath_script}"
-    fi
-    fixpath="perl ${fixpath_script} ${pathflag}"
-    fixpath_windows="perl ${fixpath_script} -d"
-    fixpath_path="${fixpath_windows}"
-  ;;
-esac
-
-shellStyle="sh"
-## As far as I can tell from hg history, this has not worked
-## for a long time because PPID is unset.  When run under Cygwin
-## the script quits due to the 1 return from grep.
-##parentCsh="` ps -p ${PPID} 2> ${devnull} | grep csh `"
-##if [ "${parentCsh}" != "" ] ; then
-##  shellStyle="csh"
-##fi
-
-# Check environment first
-if [ "${PROGRAMFILES}" != "" ] ; then
-  progfiles=`envpath "${PROGRAMFILES}"`
-elif [ "${ProgramFiles}" != "" ] ; then
-  progfiles=`envpath "${ProgramFiles}"`
-elif [ "${SYSTEMDRIVE}" != "" ] ; then
-  progfiles=`envpath "${SYSTEMDRIVE}/Program Files"`
-elif [ "${SystemDrive}" != "" ] ; then
-  progfiles=`envpath "${SystemDrive}/Program Files"`
-else
-  error "No PROGRAMFILES or SYSTEMDRIVE defined in environment"
-fi
-
-# Arch data model
-if [ "${PROCESSOR_IDENTIFIER}" != "" ] ; then
-  arch=`echo "${PROCESSOR_IDENTIFIER}" | cut -d' ' -f1`
-else
-  if [ "${MACHTYPE}" != "" ] ; then
-    if [ "`echo ${MACHTYPE} | grep 64`" != "" ] ; then
-      # Assume this is X64, not IA64
-      arch="x64"
-    else
-      arch="x86"
-    fi
-  else
-   arch="`uname -m`"
-  fi
-  PROCESSOR_IDENTIFIER="${arch}"
-  export PROCESSOR_IDENTIFIER
-fi
-if [ "${arch}" = "X86" -o \
-     "${arch}" = "386" -o "${arch}" = "i386" -o \
-     "${arch}" = "486" -o "${arch}" = "i486" -o \
-     "${arch}" = "586" -o "${arch}" = "i586" -o \
-     "${arch}" = "686" -o "${arch}" = "i686" -o \
-     "${arch}" = "86" ] ; then
-  arch="x86"
-fi
-if [ "${arch}" = "X64"     -o \
-     "${arch}" = "8664"    -o "${arch}" = "i8664"   -o \
-     "${arch}" = "amd64"   -o "${arch}" = "AMD64"   -o \
-     "${arch}" = "EM64T"   -o "${arch}" = "emt64t"  -o \
-     "${arch}" = "intel64" -o "${arch}" = "Intel64" -o \
-     "${arch}" = "64" ] ; then
-  arch="x64"
-  binarch64="\\amd64"
-fi
-if [ "${arch}" = "IA64" ] ; then
-  arch="ia64"
-  binarch64="\\ia64"
-fi
-if [ "${arch}" != "x86" -a "${arch}" != "x64" -a "${arch}" != "ia64" ] ; then
- error "No PROCESSOR_IDENTIFIER or MACHTYPE environment variables and uname -m is not helping"
-fi
-if [ "${arch}" = "x86" ] ; then
-  arch_data_model=32
-  progfiles32="${progfiles}"
-  progfiles64="${progfiles}"
-else
-  arch_data_model=64
-  progfiles32="${progfiles}"
-  if [ "${PROGRAMW6432}" != "" ] ; then
-    progfiles64=`envpath "${PROGRAMW6432}"`
-  else
-    progfiles64=`envpath "C:/Program Files"`
-  fi
-fi
-
-# VS2012 (VC11)
-if [ "${VS110COMNTOOLS}" = "" ] ; then
-  VS110COMNTOOLS="${progfiles32}/Microsoft Visual Studio 11.0/Common7/Tools/"
-  export VS110COMNTOOLS
-fi
-vc11Bin32Dir=`envpath "${VS110COMNTOOLS}"`/../../VC/Bin
-vc11Bin64Dir="${vc11Bin32Dir}"
-vc11vars32Bat="vcvars32.bat"
-vc11vars64Bat="vcvars64.bat"
-
-# VS2010 (VC10)
-if [ "${VS100COMNTOOLS}" = "" ] ; then
-  VS100COMNTOOLS="${progfiles32}/Microsoft Visual Studio 10.0/Common7/Tools/"
-  export VS100COMNTOOLS
-fi
-vc10Bin32Dir=`envpath "${VS100COMNTOOLS}"`/../../VC/Bin
-vc10Bin64Dir="${vc10Bin32Dir}${binarch64}"
-vc10vars32Bat="vcvars32.bat"
-vc10vars64Bat="vcvars64.bat"
-
-# VS2008 (VC9)
-if [ "${VS90COMNTOOLS}" = "" ] ; then
-  VS90COMNTOOLS="${progfiles32}/Microsoft Visual Studio 9.0/Common7/Tools/"
-  export VS90COMNTOOLS
-fi
-vc9Bin32Dir=`envpath "${VS90COMNTOOLS}"`/../../VC/Bin
-vc9Bin64Dir="${vc9Bin32Dir}"
-vc9vars32Bat="vcvars32.bat"
-vc9vars64Bat="vcvars64.bat"
-
-# VS2005 (VC8)
-if [ "${VS80COMNTOOLS}" = "" ] ; then
-  VS80COMNTOOLS="${progfiles32}/Microsoft Visual Studio 8.0/Common7/Tools/"
-  export VS80COMNTOOLS
-fi
-vc8Bin32Dir=`envpath "${VS80COMNTOOLS}"`/../../VC/Bin
-vc8Bin64Dir="${progfiles64}/Microsoft Platform SDK"
-vc8vars32Bat="vcvars32.bat"
-vc8vars64Bat="SetEnv.cmd /X64"
-
-# VS2003 (VC7)
-if [ "${VS71COMNTOOLS}" = "" ] ; then
-  VS71COMNTOOLS="${progfiles32}/Microsoft Visual Studio .NET 2003/Common7/Tools/"
-  export VS71COMNTOOLS
-fi
-vc7Bin32Dir=`envpath "${VS71COMNTOOLS}"`/../../VC7/Bin
-vc7Bin64Dir="${progfiles64}/Microsoft Platform SDK"
-vc7vars32Bat="vcvars32.bat"
-vc7vars64Bat="SetEnv.cmd /X64"
-
-# Force user to select
-vcSelection=""
-
-# Parse options
-usage="Usage: $0 [-help] [-debug] [-v] [-c] [-s] [-p] [-v11] [-v10] [-v9] [-v8] [-v7] [-32] [-64]"
-while [ $# -gt 0 ] ; do
-  if [ "$1" = "-help" ] ; then
-    msg "${usage}"
-    msg "  -help    Print out this help message"
-    msg "  -debug   Print out extra env variables to help debug this script"
-    msg "  -v       Verbose output warns about missing directories"
-    msg "  -c       Print out csh style output"
-    msg "  -s       Print out sh style output"
-    msg "  -p       Print out properties style output"
-    msg "  -v11     Use Visual Studio 11 VS2012"
-    msg "  -v10     Use Visual Studio 10 VS2010"
-    msg "  -v9      Use Visual Studio 9 VS2008"
-    msg "  -v8      Use Visual Studio 8 VS2005"
-    msg "  -v7      Use Visual Studio 7 VS2003"
-    msg "  -32      Force 32bit"
-    msg "  -64      Force 64bit"
-    exit 0
-  elif [ "$1" = "-debug" ] ; then
-    debug="true"
-    shift
-  elif [ "$1" = "-v" ] ; then
-    verbose="true"
-    shift
-  elif [ "$1" = "-c" ] ; then
-    shellStyle="csh"
-    shift
-  elif [ "$1" = "-s" ] ; then
-    shellStyle="sh"
-    shift
-  elif [ "$1" = "-p" ] ; then
-    shellStyle="props"
-    shift
-  elif [ "$1" = "-v11" ] ; then
-    vcBin32Dir="${vc11Bin32Dir}"
-    vcBin64Dir="${vc11Bin64Dir}"
-    vcvars32Bat="${vc11vars32Bat}"
-    vcvars64Bat="${vc11vars64Bat}"
-    vcSelection="11"
-    shift
-  elif [ "$1" = "-v10" ] ; then
-    vcBin32Dir="${vc10Bin32Dir}"
-    vcBin64Dir="${vc10Bin64Dir}"
-    vcvars32Bat="${vc10vars32Bat}"
-    vcvars64Bat="${vc10vars64Bat}"
-    vcSelection="10"
-    shift
-  elif [ "$1" = "-v9" ] ; then
-    vcBin32Dir="${vc9Bin32Dir}"
-    vcBin64Dir="${vc9Bin64Dir}"
-    vcvars32Bat="${vc9vars32Bat}"
-    vcvars64Bat="${vc9vars64Bat}"
-    vcSelection="9"
-    shift
-  elif [ "$1" = "-v8" ] ; then
-    vcBin32Dir="${vc8Bin32Dir}"
-    vcBin64Dir="${vc8Bin64Dir}"
-    vcvars32Bat="${vc8vars32Bat}"
-    vcvars64Bat="${vc8vars64Bat}"
-    vcSelection="8"
-    shift
-  elif [ "$1" = "-v7" ] ; then
-    vcBin32Dir="${vc7Bin32Dir}"
-    vcBin64Dir="${vc7Bin64Dir}"
-    vcvars32Bat="${vc7vars32Bat}"
-    vcvars64Bat="${vc7vars64Bat}"
-    vcSelection="7"
-    shift
-  elif [ "$1" = "-32" ] ; then
-    arch_data_model=32
-    shift
-  elif [ "$1" = "-64" ] ; then
-    arch_data_model=64
-    shift
-  else
-    msg "${usage}"
-    error "Unknown option: $1"
-  fi
-done
-
-# Need to pick
-if [ "${vcSelection}" = "" ] ; then
-  msg "${usage}"
-  error "You must pick the version"
-fi
-
-# Which vcvars bat file to run
-if [ "${arch_data_model}" = "32" ] ; then
-  vcBinDir="${vcBin32Dir}"
-  vcvarsBat="${vcvars32Bat}"
-fi
-if [ "${arch_data_model}" = "64" ] ; then
-  vcBinDir="${vcBin64Dir}"
-  vcvarsBat="${vcvars64Bat}"
-fi
-
-# Do not allow any error returns
-set -e
-
-# Different systems have different awk's
-if [ -f /usr/bin/nawk ] ; then
-  awk="nawk"
-elif [ -f /usr/bin/gawk ] ; then
-  awk="gawk"
-else
-  awk="awk"
-fi
-
-if [ "${verbose}" = "true" ] ; then
-  echo "# Welcome to verbose mode"
-  set -x
-fi
-
-if [ "${debug}" = "true" ] ; then
-  echo "# Welcome to debug mode"
-  set -x
-fi
-
-# Temp file area
-tmp="/tmp/vsvars.$$"
-rm -f -r ${tmp}
-mkdir -p ${tmp}
-
-# Check paths
-checkPaths() # var path sep
-{
-  set -e
-  sep="$3"
-  checklist="${tmp}/checklist"
-  printf "%s\n" "$2" | \
-    sed -e 's@\\@/@g' | \
-    sed -e 's@//@/@g' | \
-    ${awk} -F"${sep}" '{for(i=1;i<=NF;i++){printf "%s\n",$i;}}'  \
-      > ${checklist}
-  cat ${checklist} | while read orig; do
-    if [ "${orig}" != "" ] ; then
-      if [ ! -d "${orig}" ] ; then
-        warning "Directory in $1 does not exist: ${orig}"
-      fi
-    fi
-  done
-}
-
-# Remove all duplicate entries
-removeDeadDups() # string sepIn sepOut
-{
-  set -e
-  sepIn="$2"
-  sepOut="$3"
-  pathlist="${tmp}/pathlist"
-  printf "%s\n" "$1" | \
-    sed -e 's@\\@/@g' | \
-    sed -e 's@//@/@g' | \
-    ${awk} -F"${sepIn}" '{for(i=1;i<=NF;i++){printf "%s\n",$i;}}'  \
-      > ${pathlist}
-  upaths="${tmp}/upaths"
-  cat ${pathlist} | while read orig; do
-    p="${orig}"
-    if [ "${fixpath}" != "" ] ; then
-      if [ "${p}" != "" ] ; then
-        if [ -d "${p}" ] ; then
-          short=`${fixpath} "${p}"`
-          if [ "${short}" != "" -a -d "${short}" ] ; then
-            p="${short}"
-          fi
-          echo "${p}" >> ${upaths}
-        fi
-      fi
-    fi
-  done
-  newpaths=""
-  for i in  `cat ${upaths}` ; do
-    # For some reason, \r characters can get into this
-    i=`echo "${i}" | tr -d '\r' | sed -e 's@/$@@'`
-    if [ "${newpaths}" = "" ] ; then
-      newpaths="${i}"
-    else
-      newpaths="${newpaths}${sepOut}${i}"
-    fi
-  done
-  printf "%s\n" "${newpaths}" | \
-    ${awk} -F"${sepOut}" \
-       '{a[$1];printf "%s",$1;for(i=2;i<=NF;i++){if(!($i in a)){a[$i];printf "%s%s",FS,$i;}};printf "\n";}'
-}
-
-# Create bat file to process Visual Studio vcvars*.bat files
-createBat() # batfile bindir command
-{
-  bat="$1"
-  bindir="$2"
-  command="$3"
-  stdout="${bat}.stdout"
-  rm -f ${bat} ${stdout}
-  echo "Output from: ${command}" > ${stdout}
-  bdir=`envpath "${bindir}"`
-  cat > ${bat} << EOF  
-REM Pick the right vcvars bat file
-REM Empty these out so we only get the additions we want
-set INCLUDE=
-set LIB=
-set LIBPATH=
-set MSVCDIR=
-set MSSdk=
-set Mstools=
-set DevEnvDir=
-set VCINSTALLDIR=
-set VSINSTALLDIR=
-set WindowsSdkDir=
-REM Run the vcvars bat file, send all output to stderr
-call `${fixpath_windows} ${bdir}`\\${command} > `${fixpath_windows} "${stdout}"`
-REM Echo out env var settings
-echo VS_VS71COMNTOOLS="%VS71COMNTOOLS%"
-echo export VS_VS71COMNTOOLS
-echo VS_VS80COMNTOOLS="%VS80COMNTOOLS%"
-echo export VS_VS80COMNTOOLS
-echo VS_VS90COMNTOOLS="%VS90COMNTOOLS%"
-echo export VS_VS90COMNTOOLS
-echo VS_VS100COMNTOOLS="%VS100COMNTOOLS%"
-echo export VS_VS100COMNTOOLS
-echo VS_VS110COMNTOOLS="%VS110COMNTOOLS%"
-echo export VS_VS110COMNTOOLS
-echo VS_VCINSTALLDIR="%VCINSTALLDIR%"
-echo export VS_VCINSTALLDIR
-echo VS_VSINSTALLDIR="%VSINSTALLDIR%"
-echo export VS_VSINSTALLDIR
-echo VS_DEVENVDIR="%DevEnvDir%"
-echo export VS_DEVENVDIR
-echo VS_MSVCDIR="%MSVCDIR%"
-echo export VS_MSVCDIR
-echo VS_MSSDK="%MSSdk%"
-echo export VS_MSSDK
-echo VS_MSTOOLS="%Mstools%"
-echo export VS_MSTOOLS
-echo VS_WINDOWSSDKDIR="%WindowsSdkDir%"
-echo export VS_WINDOWSSDKDIR
-echo VS_INCLUDE="%INCLUDE%"
-echo export VS_INCLUDE
-echo VS_LIB="%LIB%"
-echo export VS_LIB
-echo VS_LIBPATH="%LIBPATH%"
-echo export VS_LIBPATH
-echo VS_WPATH="%PATH%"
-echo export VS_WPATH
-EOF
-  chmod a+x ${bat}
-}
-
-# Create env file
-createEnv() # batfile envfile
-{
-  rm -f ${1}.stdout ${1}.temp1 ${1}.temp2
-  batfile=`${fixpath} ${1}`
-  cmd.exe -Q -C < "$batfile" 1> ${1}.temp1 2> ${1}.temp2
-  cat ${1}.temp1 | \
-    sed -e 's@^Microsoft.*@@' \
-        -e 's@^.*Copyright.*@@' \
-        -e 's@^.*>REM.*@@' \
-        -e 's@^.*>set.*@@' \
-        -e 's@^.*>echo.*@@' \
-        -e 's@^.*>call.*@@' \
-        -e 's@^.*>$@@' \
-        -e 's@\\@/@g' | \
-    sed -e 's@//@/@g' > $2
-  if [ -f "${1}.stdout" ] ; then
-    cat ${1}.stdout 1>&2
-  fi
-  chmod a+x $2
-}
-
-printEnv() # name pname vsname val
-{
-  name="$1"
-  pname="$2"
-  vsname="$3"
-  val="$4"
-  if [ "${val}" != "" ] ; then
-    if [ "${shellStyle}" = "csh" ] ; then
-      if [ "${debug}" = "true" ] ; then
-        echo "setenv ${vsname} \"${val}\";"
-      fi
-      echo "setenv ${name} \"${val}\";"
-    elif [ "${shellStyle}" = "sh" ] ; then
-      if [ "${debug}" = "true" ] ; then
-        echo "${vsname}=\"${val}\";"
-        echo "export ${vsname};"
-      fi
-      echo "${name}=\"${val}\";"
-      echo "export ${name};"
-    elif [ "${shellStyle}" = "props" ] ; then
-      echo "vs.${pname}=${val}"
-    fi
-  fi
-}
-
-#############################################################################
-
-# Get Visual Studio settings
-if [ "${fixpath}" != "" ] ; then
-
-  # Create bat file to run
-  batfile="${tmp}/vs-to-env.bat"
-  if [ ! -d "${vcBinDir}" ] ; then
-    error "Does not exist: ${vcBinDir}"
-  elif [ "${vcvarsBat}" = "" ] ; then
-    error "No vcvars script: ${vcvarsBat}"
-  else
-    createBat "${batfile}" "${vcBinDir}" "${vcvarsBat}"
-  fi
-
-  # Run bat file to create environment variable settings
-  envfile="${tmp}/env.sh"
-  createEnv "${batfile}" "${envfile}"
-
-  # Read in the VS_* settings
-  . ${envfile}
-
-  # Derive unix style path, save old, and define new (remove dups)
-  VS_UPATH=`${fixpath_path} "${VS_WPATH}"`
-  export VS_UPATH
-  VS_OPATH=`printf "%s" "${PATH}" | sed -e 's@\\\\@/@g'`
-  export VS_OPATH
-  VS_PATH=`removeDeadDups "${VS_UPATH}${pathsepIn}${VS_OPATH}" "${pathsepIn}" "${pathsepOut}"`
-  export VS_PATH
-
-fi
-
-# Adjustments due to differences in vcvars*bat files
-if [ "${VS_MSVCDIR}" = "" ] ; then
-  VS_MSVCDIR="${VS_VCINSTALLDIR}"
-fi
-if [ "${VS_DEVENVDIR}" = "" ] ; then
-  VS_DEVENVDIR="${VS_VSINSTALLDIR}"
-fi
-
-# Print env settings
-#        env           vs.prop       vs env           value
-#        -------       -------       ----------       -----
-printEnv INCLUDE       include       VS_INCLUDE       "${VS_INCLUDE}"
-printEnv LIB           lib           VS_LIB           "${VS_LIB}"
-printEnv LIBPATH       libpath       VS_LIBPATH       "${VS_LIBPATH}"
-if [ "${debug}" = "true" ] ; then
-  printEnv UPATH         upath         VS_UPATH         "${VS_UPATH}"
-  printEnv WPATH         wpath         VS_WPATH         "${VS_WPATH}"
-  printEnv OPATH         opath         VS_OPATH         "${VS_OPATH}"
-fi
-printEnv PATH          path          VS_PATH          "${VS_PATH}"
-printEnv VCINSTALLDIR  vcinstalldir  VS_VCINSTALLDIR  "${VS_VCINSTALLDIR}"
-printEnv VSINSTALLDIR  vsinstalldir  VS_VSINSTALLDIR  "${VS_VSINSTALLDIR}"
-printEnv MSVCDIR       msvcdir       VS_MSVCDIR       "${VS_MSVCDIR}"
-printEnv MSSDK         mssdk         VS_MSSDK         "${VS_MSSDK}"
-printEnv MSTOOLS       mstools       VS_MSTOOLS       "${VS_MSTOOLS}"
-printEnv DEVENVDIR     devenvdir     VS_DEVENVDIR     "${VS_DEVENVDIR}"
-printEnv WINDOWSSDKDIR windowssdkdir VS_WINDOWSSDKDIR "${VS_WINDOWSSDKDIR}"
-if [ "${vcSelection}" = "11" ] ; then
-  printEnv VS110COMNTOOLS vs110comntools VS_VS110COMNTOOLS "${VS_VS110COMNTOOLS}"
-elif [ "${vcSelection}" = "10" ] ; then
-  printEnv VS100COMNTOOLS vs100comntools VS_VS100COMNTOOLS "${VS_VS100COMNTOOLS}"
-elif [ "${vcSelection}" = "9" ] ; then
-  printEnv VS90COMNTOOLS vs90comntools VS_VS90COMNTOOLS "${VS_VS90COMNTOOLS}"
-elif [ "${vcSelection}" = "7" ] ; then
-  printEnv VS71COMNTOOLS vs71comntools VS_VS71COMNTOOLS "${VS_VS71COMNTOOLS}"
-elif [ "${vcSelection}" = "8" ] ; then
-  printEnv VS80COMNTOOLS vs80comntools VS_VS80COMNTOOLS "${VS_VS80COMNTOOLS}"
-fi
-
-# Check final settings
-if [ "${verbose}" = "true" ] ; then
-  checkPaths "Windows PATH" "${VS_WPATH}" ";"
-  checkPaths LIB "${VS_LIB}" ";"
-  checkPaths INCLUDE "${VS_INCLUDE}" ";"
-  checkPaths PATH "${VS_PATH}" "${pathsepIn}"
-fi
-
-# Remove all temp files
-if [ "${debug}" != "true" ] ; then
-  rm -f -r ${tmp}
-fi
-
-exit 0
-
--- a/make/sponsors-rules.gmk	Tue Dec 03 12:37:30 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-################################################################
-# SPONSORS  TARGETS
-################################################################
-
-ifeq ($(PLATFORM)-$(ARCH), windows-i586)
-sponsors:  sponsors-build
-else
-sponsors:
-endif
-
-# The generated java files are generated as a set, so instead of
-# setting the SPONSORS variable to that list of files, set it to
-# the .PHONY target that generates the set of files.
-SPONSORS = sponsors
-
-# put the generated patch in their own place in OUTPUTDIR
-SPONSORS_OUTPUTDIR = $(ABS_OUTPUTDIR)
-
-SPONSORS_BUILD_TARGETS = dll installer
-SPONSORS_BUILD_ARGUMENTS = \
-			MAKEFLAGS= \
-			$(COMMON_BUILD_ARGUMENTS) \
-			ALT_OUTPUTDIR=$(SPONSORS_OUTPUTDIR) \
-			ALT_RTPATCH_DIR=$(ALT_RTPATCH_DIR) \
-			ALT_BASE_IMAGE_ZIP=$(ALT_BASE_IMAGE_ZIP) \
-			ALT_BASE_IMAGE_DIR=$(ALT_BASE_IMAGE_DIR) \
-			ALT_NEW_IMAGE_DIR=$(ALT_NEW_IMAGE_DIR) \
-			ALT_BUNDLE_DATE=$(BUNDLE_DATE)
-
-ifeq ($(BUILD_LANGTOOLS), true)
-  SPONSORS_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
-endif
-
-sponsors-build:
-ifeq ($(ARCH_DATA_MODEL), 32)
-  ifeq ($(BUILD_SPONSORS), true)
-	@$(call MakeStart,sponsors,$(SPONSORS_BUILD_TARGETS))
-	($(CD) $(SPONSORS_TOPDIR)/make && \
-	  $(MAKE) $(SPONSORS_BUILD_TARGETS) $(SPONSORS_BUILD_ARGUMENTS))
-	@$(call MakeFinish,sponsors,$(SPONSORS_BUILD_TARGETS))
-  endif
-endif
-
-sponsors-sanity:
-
-sponsors-clobber::
-
-.PHONY: sponsors sponsors-build sponsors-sanity sponsors-clobber
-
--- a/test/Makefile	Tue Dec 03 12:37:30 2013 -0800
+++ b/test/Makefile	Wed Jul 05 19:24:14 2017 +0200
@@ -59,7 +59,7 @@
 langtools_% :
 	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
 
-jdk_% :
+jdk_% core_%s svc_%:
 	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
 
 ################################################################