--- a/jdk/make/Bundles.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/Bundles.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -35,7 +35,7 @@
 
   # JDK_BUNDLE_DIR and JRE_BUNDLE_DIR are defined in SPEC.
 
-  MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/bundle
+  MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle
 
   # All these OPENJDK checks are needed since there is no coherency between
   # these values in open and closed. Should probably be fixed.

--- a/jdk/make/CompileDemos.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/CompileDemos.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -29,9 +29,7 @@
 include MakeBase.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 
 # Prepare the find cache.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))

--- a/jdk/make/CompileInterimRmic.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/CompileInterimRmic.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -28,7 +28,7 @@
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 
 ##########################################################################################
 

--- a/jdk/make/CopyIntoClasses.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,202 +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.
-#
-
-# Copy icu and _dict files used by the text break iterator
-
-COPY_PATTERNS := .icu _dict .dat _options .js aliasmap .spp .wav .css \
-    .png .gif .xml .dtd .txt oqlhelp.html content-types.properties
-
-# These directories should not be copied at all
-EXCLUDES += \
-    java/awt/doc-files \
-    java/lang/doc-files \
-    javax/swing/doc-files \
-    javax/swing/text/doc-files \
-    javax/swing/plaf/synth/doc-files \
-    javax/swing/undo/doc-files \
-    sun/awt/X11/doc-files \
-    sun/util/cldr/resources \
-    #
-
-# These files should never be included
-EXFILES += build.xml README.txt version.txt
-
-# These icons are handled in GensrcIcons.gmk
-EXFILES += \
-    sun/awt/X11/java-icon16.png \
-    sun/awt/X11/java-icon24.png \
-    sun/awt/X11/java-icon32.png \
-    sun/awt/X11/java-icon48.png \
-    $(wildcard $(JDK_TOPDIR)/src/share/classes/sun/awt/resources/*.png) \
-    #
-
-ifndef OPENJDK
-  # Theses icons have closed replacements
-  SWING_PLAF_MOTIF_RESOURCES_DIR := $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif
-  EXFILES += \
-      $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png \
-      $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png \
-      $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \
-      $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png) \
-      #
-
-  EXFILES += mib_core.txt
-endif
-
-ifeq ($(ENABLE_JFR), true)
-  JFR_CONFIGURATION_DIR_CLOSED := $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings
-  COPY_FILES += \
-      $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd
-endif
-
-SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/data/swingbeaninfo/images
-SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif)
-OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%, \
-    $(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%, \
-    $(SWING_BEANINFO_RESOURCES_SRC))
-
-COPY_EXTRA += $(OUT_BEANINFO_RESOURCES)
-
-# The exception handling of swing beaninfo
-# These resources violates the convention of having code and resources together under
-# $(JDK_TOPDIR)/src/.../classes directories
-$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: \
-    $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif
-	$(call install-file)
-
-##########################################################################################
-#
-# Copy the META-INF/services configuration files that are scattered around the source tree
-# into classes/META-INF/services. Be aware that META-INF directories that are located at a
-# source root (.../classes/META-INF) are automatically copied verbatim by the
-# SetupJavaCompilation macro.
-#
-# Any other META-INF/services configuration file is found here and platform specific comments
-# are uncommented and the configuration file is stored in the output META-INF directory.
-
-# Make sure the output directory is created.
-$(eval $(call MakeDir, $(JDK_OUTPUTDIR)/classes/META-INF/services))
-# Find all META-INF/services/* files
-ALL_META-INF_DIRS_share := $(shell $(FIND) $(JDK_TOPDIR)/src/share/classes -type d -a -name META-INF)
-ALL_META-INF_DIRS_targetapi := $(shell $(FIND) $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes -type d -a -name META-INF)
-# Platform specific overrides shared
-ifneq ($(ALL_META-INF_DIRS_targetapi), )
-  ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_targetapi) \
-      $(filter-out %$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes%,%,$(ALL_META-INF_DIRS_targetapi)), \
-      $(ALL_META-INF_DIRS_share))
-else
-  ALL_META-INF_DIRS := $(ALL_META-INF_DIRS_share)
-endif
-
-SRC_SERVICES_FILES := $(wildcard $(addsuffix /services/*, $(ALL_META-INF_DIRS)))
-
-# The number of services files are relatively few. If the increase in numbers, then
-# we have to use ListPathsSafelyNow here.
-# Change $(JDK_TOPDIR)/src/.../META-INF/services/yyyy into $(JDK_OUTPUTDIR)/classes/META-INF/services/yyyy
-# The \n in the printf command is needed to make sed work on Solaris.
-OUT_SERVICES_FILES := $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
-    $(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g'))
-OUT_SERVICES_FILES_COLON := $(addsuffix :, $(OUT_SERVICES_FILES))
-# Exception handling for print services with no META-INF directory
-SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*)
-OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \
-    $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \
-    $(SRC_SERVICES_FILES_PRINT)))
-OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :, $(OUT_SERVICES_FILES_PRINT))
-RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON), $(SRC_SERVICES_FILES_PRINT))
-
-# Now setup the dependency rules to generate a META-INF/services/... from the correct source.
-META-INF_RULES_SERVICES := $(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON), $(SRC_SERVICES_FILES))
-# Eval the newly created rules to incorporate them into the make tree.
-define addto_meta-inf_services
-  $1
-	echo $(LOG_INFO) Installing META-INF/services/$$(@F)
-	$(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@
-endef
-$(foreach i, $(META-INF_RULES_SERVICES), $(eval $(call addto_meta-inf_services, $i)))
-# Here is the generic rule, whose receipt the above rules will trigger.
-
-COPY_EXTRA += $(OUT_SERVICES_FILES)
-COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT)
-
-################################################################################
-
-JAVAX_SOUND_SRC := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services
-
-JAVAX_SOUND_SRC_FILES := \
-    javax.sound.midi.spi.MidiDeviceProvider \
-    javax.sound.midi.spi.MidiFileReader \
-    javax.sound.midi.spi.MidiFileWriter \
-    javax.sound.midi.spi.SoundbankReader \
-    javax.sound.sampled.spi.AudioFileReader \
-    javax.sound.sampled.spi.AudioFileWriter \
-    javax.sound.sampled.spi.FormatConversionProvider \
-    javax.sound.sampled.spi.MixerProvider
-
-COPY_EXTRA += $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, $(JAVAX_SOUND_SRC_FILES))
-
-JAVAX_SOUND_RULES := $(foreach F, $(JAVAX_SOUND_SRC_FILES), $(JDK_OUTPUTDIR)/classes/META-INF/services/$(notdir $F):$(JAVAX_SOUND_SRC)/$F)
-
-$(foreach R, $(JAVAX_SOUND_RULES), $(eval $(call addto_meta-inf_services, $R)))
-
-################################################################################
-
-ifneq ($(OPENJDK_TARGET_OS), macosx)
-  OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/datatransfer/resources/flavormap.properties
-else
-  OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES = $(JDK_TOPDIR)/src/java.desktop/macosx/classes/sun/datatransfer/resources/flavormap.properties
-endif
-
-$(JDK_OUTPUTDIR)/classes/sun/datatransfer/resources/flavormap.properties: $(OPENJDK_TARGET_OS_FLAVORMAP_PROPERTIES)
-	$(install-file)
-
-COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/datatransfer/resources/flavormap.properties
-
-################################################################################
-
-CLEAN_FILES := $(wildcard \
-    $(JDK_TOPDIR)/src/share/classes/com/sun/imageio/plugins/common/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties \
-    $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties \
-    $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/com/sun/rowset/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources/*.properties \
-    $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver/resources/*.properties \
-    )
-
-# Copy zh_HK files from zh_TW
-
-$(JDK_OUTPUTDIR)/classes/%_zh_HK.properties: $(JDK_OUTPUTDIR)/classes/%_zh_TW.properties
-	$(install-file)
-
-COPY_EXTRA += $(patsubst $(JDK_TOPDIR)/src/share/classes/%, $(JDK_OUTPUTDIR)/classes/%, \
-    $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $(CLEAN_FILES))))

--- a/jdk/make/CreateJars.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/CreateJars.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -524,7 +524,6 @@
     EXCLUDES := $(TOOLS_JAR_EXCLUDES), \
     EXTRA_FILES := \
         $(JDK_OUTPUTDIR)/modules/jdk.jdi/META-INF/services/com.sun.jdi.connect.Connector \
-        $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.jdi.connect.Connector \
         META-INF/services/com.sun.jdi.connect.spi.TransportService \
         META-INF/services/com.sun.tools.attach.spi.AttachProvider \
         META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \

--- a/jdk/make/CreateSecurityJars.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/CreateSecurityJars.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -32,8 +32,6 @@
 # The jars created in this file are required for the exploded jdk image to function and
 # cannot wait to be built in the images target.
 
-SECURITY_CLASSES_SUBDIR := modules
-
 ##########################################################################################
 # Create manifest for security jars
 #
@@ -67,7 +65,7 @@
 SUNPKCS11_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunpkcs11.jar
 
 $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR, , \
-    SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.pkcs11, \
+    SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.pkcs11, \
     SUFFIXES := .class, \
     INCLUDES := sun/security/pkcs11, \
     JAR := $(SUNPKCS11_JAR_UNSIGNED), \
@@ -94,7 +92,7 @@
 SUNEC_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunec.jar
 
 $(eval $(call SetupArchive,BUILD_SUNEC_JAR, , \
-    SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.ec, \
+    SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.ec, \
     SUFFIXES := .class, \
     INCLUDES := sun/security/ec, \
     JAR := $(SUNEC_JAR_UNSIGNED), \
@@ -122,7 +120,7 @@
 
 ifneq ($(BUILD_CRYPTO), no)
   $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR, , \
-      SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/java.base, \
+      SRCS := $(JDK_OUTPUTDIR)/modules/java.base, \
       SUFFIXES := .class, \
       INCLUDES := com/sun/crypto/provider, \
       JAR := $(SUNJCE_PROVIDER_JAR_UNSIGNED), \
@@ -153,7 +151,7 @@
 
 ifneq ($(BUILD_CRYPTO), no)
   $(eval $(call SetupArchive,BUILD_JCE_JAR, , \
-      SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/java.base, \
+      SRCS := $(JDK_OUTPUTDIR)/modules/java.base, \
       SUFFIXES := .class, \
       INCLUDES := javax/crypto sun/security/internal, \
       JAR := $(JCE_JAR_UNSIGNED), \
@@ -185,7 +183,7 @@
   SUNMSCAPI_JAR_UNSIGNED := $(JDK_OUTPUTDIR)/jce/unsigned/sunmscapi.jar
 
   $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR, , \
-      SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.mscapi, \
+      SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.mscapi, \
       SUFFIXES := .class, \
       INCLUDES := sun/security/mscapi, \
       JAR := $(SUNMSCAPI_JAR_UNSIGNED), \
@@ -218,7 +216,7 @@
     UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
 
     $(eval $(call SetupArchive,BUILD_UCRYPTO_JAR, , \
-        SRCS := $(JDK_OUTPUTDIR)/$(SECURITY_CLASSES_SUBDIR)/jdk.crypto.ucrypto, \
+        SRCS := $(JDK_OUTPUTDIR)/modules/jdk.crypto.ucrypto, \
         SUFFIXES := .class, \
         INCLUDES := com/oracle/security/ucrypto, \
         JAR := $(UCRYPTO_JAR_UNSIGNED), \

--- a/jdk/make/Tools.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/Tools.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -32,7 +32,7 @@
 include MakeBase.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 
 # Cache all finds needed for this file.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))

--- a/jdk/make/bundle/JDK-Info.plist	Wed Aug 20 11:30:13 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-        <key>CFBundleExecutable</key>
-        <string>libjli.dylib</string>
-        <key>CFBundleGetInfoString</key>
-        <string>@@INFO@@</string>
-        <key>CFBundleIdentifier</key>
-        <string>@@ID@@</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>7.0</string>
-        <key>CFBundleName</key>
-        <string>@@NAME@@</string>
-        <key>CFBundlePackageType</key>
-        <string>BNDL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>@@VERSION@@</string>
-        <key>JavaVM</key>
-        <dict>
-                <key>JVMCapabilities</key>
-                <array>
-                        <string>CommandLine</string>
-                </array>
-                <key>JVMMinimumFrameworkVersion</key>
-                <string>13.2.9</string>
-                <key>JVMMinimumSystemVersion</key>
-                <string>10.6.0</string>
-                <key>JVMPlatformVersion</key>
-                <string>@@PLATFORM_VERSION@@</string>
-                <key>JVMVendor</key>
-                <string>@@VENDOR@@</string>
-                <key>JVMVersion</key>
-                <string>@@VERSION@@</string>
-        </dict>
-</dict>
-</plist>

--- a/jdk/make/bundle/JRE-Info.plist	Wed Aug 20 11:30:13 2014 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-        <key>CFBundleExecutable</key>
-        <string>libjli.dylib</string>
-        <key>CFBundleGetInfoString</key>
-        <string>@@INFO@@</string>
-        <key>CFBundleIdentifier</key>
-        <string>@@ID@@</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>7.0</string>
-        <key>CFBundleName</key>
-        <string>@@NAME@@</string>
-        <key>CFBundlePackageType</key>
-        <string>BNDL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
-        <key>CFBundleSignature</key>
-        <string>????</string>
-        <key>CFBundleVersion</key>
-        <string>@@VERSION@@</string>
-        <key>JavaVM</key>
-        <dict>
-                <key>JVMMinimumFrameworkVersion</key>
-                <string>13.2.9</string>
-                <key>JVMMinimumSystemVersion</key>
-                <string>10.6.0</string>
-                <key>JVMPlatformVersion</key>
-                <string>@@PLATFORM_VERSION@@</string>
-                <key>JVMVendor</key>
-                <string>@@VENDOR@@</string>
-                <key>JVMVersion</key>
-                <string>@@VERSION@@</string>
-        </dict>
-</dict>
-</plist>

--- a/jdk/make/copy/Copy-java.base.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/copy/Copy-java.base.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -32,17 +32,17 @@
 # Copy exported header files to outputdir.
 #
 JAVA_BASE_HEADERS := \
-    $(INCLUDEDIR)/jni.h \
-    $(INCLUDEDIR)/jvmti.h \
-    $(INCLUDEDIR)/jvmticmlr.h \
-    $(INCLUDEDIR)/classfile_constants.h \
-    $(OPENJDK_TARGET_OS_INCLUDE)/jni_md.h \
+    $(INCLUDE_DST_DIR)/jni.h \
+    $(INCLUDE_DST_DIR)/jvmti.h \
+    $(INCLUDE_DST_DIR)/jvmticmlr.h \
+    $(INCLUDE_DST_DIR)/classfile_constants.h \
+    $(INCLUDE_DST_OS_DIR)/jni_md.h \
     #
 
-$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/java.base/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.base/share/native/include/%.h
 	$(call install-file)
 
-$(OPENJDK_TARGET_OS_INCLUDE)/%.h: \
+$(INCLUDE_DST_OS_DIR)/%.h: \
     $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
 	$(call install-file)
 
@@ -50,17 +50,17 @@
 
 CALENDARS_SRC := $(JDK_TOPDIR)/src/java.base/share/conf
 
-$(LIBDIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties
+$(LIB_DST_DIR)/calendars.properties: $(CALENDARS_SRC)/calendars.properties
 	$(call install-file)
 
-BASE_CONF_FILES += $(LIBDIR)/calendars.properties
+BASE_CONF_FILES += $(LIB_DST_DIR)/calendars.properties
 
-$(LIBDIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties
+$(LIB_DST_DIR)/hijrah-config-umalqura.properties: $(CALENDARS_SRC)/hijrah-config-umalqura.properties
 	$(MKDIR) -p $(@D)
 	$(RM) $@
 	$(CP) $< $@
 
-BASE_CONF_FILES += $(LIBDIR)/hijrah-config-umalqura.properties
+BASE_CONF_FILES += $(LIB_DST_DIR)/hijrah-config-umalqura.properties
 
 ################################################################################
 
@@ -68,10 +68,10 @@
 
   TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
 
-  $(LIBDIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
+  $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
 	$(call install-file)
 
-  BASE_CONF_FILES += $(LIBDIR)/tzmappings
+  BASE_CONF_FILES += $(LIB_DST_DIR)/tzmappings
 
 endif
 

--- a/jdk/make/copy/Copy-java.desktop.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/copy/Copy-java.desktop.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -30,20 +30,20 @@
 ################################################################################
 
 JAVA_DESKTOP_HEADERS := \
-    $(INCLUDEDIR)/jawt.h \
-    $(OPENJDK_TARGET_OS_INCLUDE)/jawt_md.h \
+    $(INCLUDE_DST_DIR)/jawt.h \
+    $(INCLUDE_DST_OS_DIR)/jawt_md.h \
     #
 
-$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
 	$(call install-file)
 
-$(OPENJDK_TARGET_OS_INCLUDE)/%.h: \
+$(INCLUDE_DST_OS_DIR)/%.h: \
     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
 	$(call install-file)
 
 ################################################################################
 
-ICCPROFILE_DEST_DIR := $(LIBDIR)/cmm
+ICCPROFILE_DEST_DIR := $(LIB_DST_DIR)/cmm
 
 ifdef OPENJDK
   ICCPROFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf/cmm/lcms
@@ -102,20 +102,20 @@
 
 ################################################################################
 #
-# Copy property files from sun/print to LIBDIR
+# Copy property files from sun/print to LIB_DST_DIR
 #
 PSFONTPROPFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf
 PSFONTPROPFILE_SRCS := $(wildcard $(PSFONTPROPFILE_SRC_DIR)/psfont*.properties*)
-PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIBDIR),$(PSFONTPROPFILE_SRCS))
+PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIB_DST_DIR),$(PSFONTPROPFILE_SRCS))
 
-$(LIBDIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
+$(LIB_DST_DIR)/%: $(PSFONTPROPFILE_SRC_DIR)/%
 	$(call install-file)
 
 DESKTOP_CONF_FILES += $(PSFONTPROPFILE_TARGET_FILES)
 
 ################################################################################
 #
-# Copy cursor.properties and cursors gif files to LIBDIR
+# Copy cursor.properties and cursors gif files to LIB_DST_DIR
 #
 ifneq ($(OPENJDK_TARGET_OS), macosx)
   OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf
@@ -123,7 +123,7 @@
   OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/conf
 endif
 
-CURSORS_DEST_DIR := $(LIBDIR)/images/cursors
+CURSORS_DEST_DIR := $(LIB_DST_DIR)/images/cursors
 CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf/images/cursors
 
 $(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties

--- a/jdk/make/copy/Copy-java.logging.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/copy/Copy-java.logging.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -29,10 +29,10 @@
 
 LOGGING_LIB_SRC := $(JDK_TOPDIR)/src/java.logging/share/conf
 
-$(LIBDIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
+$(LIB_DST_DIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
 	$(call install-file)
 
-LOGGING_CONF_FILES := $(LIBDIR)/logging.properties
+LOGGING_CONF_FILES := $(LIB_DST_DIR)/logging.properties
 
 ################################################################################
 

--- a/jdk/make/copy/Copy-java.management.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/copy/Copy-java.management.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -27,7 +27,7 @@
 
 ################################################################################
 
-MGMT_LIBDIR := $(LIBDIR)/management
+MGMT_LIBDIR := $(LIB_DST_DIR)/management
 MGMT_LIB_SRC := $(JDK_TOPDIR)/src/java.management/share/conf
 MGMT_SRC_FILES := $(wildcard $(MGMT_LIB_SRC)/*)
 MGMT_TARGET_FILES := $(subst $(MGMT_LIB_SRC),$(MGMT_LIBDIR),$(MGMT_SRC_FILES))

--- a/jdk/make/copy/Copy-jdk.hprof.agent.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/copy/Copy-jdk.hprof.agent.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -29,10 +29,10 @@
 
 HPROF_SRC := $(JDK_TOPDIR)/src/demo/share/jvmti/hprof/jvm.hprof.txt
 
-$(LIBDIR)/jvm.hprof.txt: $(HPROF_SRC)
+$(LIB_DST_DIR)/jvm.hprof.txt: $(HPROF_SRC)
 	$(call install-file)
 
-HPROF_CONF_FILES := $(LIBDIR)/jvm.hprof.txt
+HPROF_CONF_FILES := $(LIB_DST_DIR)/jvm.hprof.txt
 
 ################################################################################
 

--- a/jdk/make/copy/Copy-jdk.jdwp.agent.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/copy/Copy-jdk.jdwp.agent.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -28,9 +28,9 @@
 ################################################################################
 
 
-JDK_DEBUG_AGENT_HEADERS := $(INCLUDEDIR)/jdwpTransport.h
+JDK_DEBUG_AGENT_HEADERS := $(INCLUDE_DST_DIR)/jdwpTransport.h
 
-$(INCLUDEDIR)/%.h: $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
 	$(call install-file)
 
 ################################################################################

--- a/jdk/make/copy/CopyCommon.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/copy/CopyCommon.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -28,13 +28,13 @@
 include $(SPEC)
 include MakeBase.gmk
 
-INCLUDEDIR = $(JDK_OUTPUTDIR)/include
-LIBDIR := $(JDK_OUTPUTDIR)/lib
+INCLUDE_DST_DIR := $(JDK_OUTPUTDIR)/include
+LIB_DST_DIR := $(JDK_OUTPUTDIR)/lib
 
-OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS)
+INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS)
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32
+  INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/win32
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
-  OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
+  INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/darwin
 endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/data/bundle/JDK-Info.plist	Thu Aug 21 11:05:35 2014 +0200
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>English</string>
+        <key>CFBundleExecutable</key>
+        <string>libjli.dylib</string>
+        <key>CFBundleGetInfoString</key>
+        <string>@@INFO@@</string>
+        <key>CFBundleIdentifier</key>
+        <string>@@ID@@</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>7.0</string>
+        <key>CFBundleName</key>
+        <string>@@NAME@@</string>
+        <key>CFBundlePackageType</key>
+        <string>BNDL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.0</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>@@VERSION@@</string>
+        <key>JavaVM</key>
+        <dict>
+                <key>JVMCapabilities</key>
+                <array>
+                        <string>CommandLine</string>
+                </array>
+                <key>JVMMinimumFrameworkVersion</key>
+                <string>13.2.9</string>
+                <key>JVMMinimumSystemVersion</key>
+                <string>10.6.0</string>
+                <key>JVMPlatformVersion</key>
+                <string>@@PLATFORM_VERSION@@</string>
+                <key>JVMVendor</key>
+                <string>@@VENDOR@@</string>
+                <key>JVMVersion</key>
+                <string>@@VERSION@@</string>
+        </dict>
+</dict>
+</plist>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/data/bundle/JRE-Info.plist	Thu Aug 21 11:05:35 2014 +0200
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>English</string>
+        <key>CFBundleExecutable</key>
+        <string>libjli.dylib</string>
+        <key>CFBundleGetInfoString</key>
+        <string>@@INFO@@</string>
+        <key>CFBundleIdentifier</key>
+        <string>@@ID@@</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>7.0</string>
+        <key>CFBundleName</key>
+        <string>@@NAME@@</string>
+        <key>CFBundlePackageType</key>
+        <string>BNDL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.0</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>@@VERSION@@</string>
+        <key>JavaVM</key>
+        <dict>
+                <key>JVMMinimumFrameworkVersion</key>
+                <string>13.2.9</string>
+                <key>JVMMinimumSystemVersion</key>
+                <string>10.6.0</string>
+                <key>JVMPlatformVersion</key>
+                <string>@@PLATFORM_VERSION@@</string>
+                <key>JVMVendor</key>
+                <string>@@VENDOR@@</string>
+                <key>JVMVersion</key>
+                <string>@@VERSION@@</string>
+        </dict>
+</dict>
+</plist>

--- a/jdk/make/gendata/Gendata-java.base.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/gendata/Gendata-java.base.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -64,15 +64,15 @@
 
 GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security
 GENDATA_JAVA_SECURITY := $(JDK_OUTPUTDIR)/lib/security/java.security
- 
+
 # RESTRICTED_PKGS_SRC is optionally set in custom extension for this makefile
- 
+
 $(GENDATA_JAVA_SECURITY): $(BUILD_TOOLS) $(GENDATA_JAVA_SECURITY_SRC) $(RESTRICTED_PKGS_SRC)
 	$(ECHO) "Generating java.security"
 	$(MKDIR) -p $(@D)
 	$(TOOL_MAKEJAVASECURITY) $(GENDATA_JAVA_SECURITY_SRC) $@ $(OPENJDK_TARGET_OS) \
 		$(RESTRICTED_PKGS_SRC) || exit 1
- 
+
 GENDATA += $(GENDATA_JAVA_SECURITY)
 
 ##########################################################################################

--- a/jdk/make/gendata/GendataCommon.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/gendata/GendataCommon.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -28,9 +28,7 @@
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 # We need the tools.
 include Tools.gmk
 

--- a/jdk/make/gensrc/GensrcCommon.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/gensrc/GensrcCommon.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -30,9 +30,7 @@
 include JavaCompilation.gmk
 include NativeCompilation.gmk
 include TextFileProcessing.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 # We need the tools.
 include Tools.gmk
 

--- a/jdk/make/gensrc/GensrcSwing.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/gensrc/GensrcSwing.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -78,11 +78,8 @@
 	$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing
 	$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \
 	    -sourcepath "$(subst $(SPACE),$(PATH_SEP),\
-	        $(if $(SHUFFLED),$(wildcard $(JDK_TOPDIR)/src/*/*/classes) \
-	        $(JDK_OUTPUTDIR)/gensrc/java.base, \
-	        $(JDK_TOPDIR)/src/share/classes \
-                $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
-	        $(JDK_OUTPUTDIR)/gensrc))" \
+	        $(wildcard $(JDK_TOPDIR)/src/*/*/classes) \
+	        $(JDK_OUTPUTDIR)/gensrc/java.base)" \
 	    -doclet build.tools.swingbeaninfo.GenDocletBeanInfo \
 	    -x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/java.desktop/javax/swing \
 	    -t $(DOCLET_DATA_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \

--- a/jdk/make/lib/Awt2dLibraries.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -23,12 +23,9 @@
 # questions.
 #
 
-# Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))
-
 WIN_AWT_LIB := $(JDK_OUTPUTDIR)/objs/libawt/awt.lib
 
-##########################################################################################
+################################################################################
 
 BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
     $(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/awt/medialib
@@ -76,7 +73,7 @@
 
 DESKTOP_LIBRARIES += $(BUILD_LIBMLIB_IMAGE)
 
-##########################################################################################
+################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
 
@@ -144,7 +141,7 @@
 
 endif
 
-##########################################################################################
+################################################################################
 
 LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
@@ -296,7 +293,7 @@
 
 DESKTOP_LIBRARIES += $(BUILD_LIBAWT)
 
-##########################################################################################
+################################################################################
 
 ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
   ifndef BUILD_HEADLESS_ONLY
@@ -388,7 +385,7 @@
   endif
 endif
 
-##########################################################################################
+################################################################################
 
 LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms
 LIBLCMS_CPPFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
@@ -441,7 +438,7 @@
 
 $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
 
-##########################################################################################
+################################################################################
 
 ifdef OPENJDK
   BUILD_LIBJAVAJPEG_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers
@@ -515,7 +512,7 @@
 
 DESKTOP_LIBRARIES += $(BUILD_LIBJAVAJPEG)
 
-##########################################################################################
+################################################################################
 
 LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
     $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libfontmanager
@@ -607,54 +604,7 @@
 
 DESKTOP_LIBRARIES += $(BUILD_LIBFONTMANAGER)
 
-##########################################################################################
-
-ifndef OPENJDK
-
-  LIBT2K_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k
-  LIBT2K_CFLAGS := $(addprefix -I, $(LIBT2K_SRC)) \
-      -I$(JDK_TOPDIR)/src/closed/java.desktop/share/native/libt2k/t2k \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/loops \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/sun/font \
-      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
-      -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
-  #
-
-  $(eval $(call SetupNativeCompilation,BUILD_LIBT2K, \
-      LIBRARY := t2k, \
-      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-      SRC := $(LIBT2K_SRC), \
-      EXCLUDE_FILES := t2k/orion.c, \
-      LANG := C++, \
-      OPTIMIZATION := HIGH, \
-      CFLAGS := $(CFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \
-      CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBT2K_CFLAGS), \
-      CFLAGS_windows = -DCC_NOEX, \
-      CXXFLAGS_windows = -DCC_NOEX, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libt2k/mapfile-vers, \
-      LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LDFLAGS_windows := user32.lib $(JDK_OUTPUTDIR)/objs/libfontmanager/fontmanager.lib, \
-      LDFLAGS_SUFFIX_posix := $(LIBM) $(LIBCXX) -lfontmanager -ljava -ljvm -lc, \
-      LDFLAGS_SUFFIX_solaris := -lawt -lawt_xawt, \
-      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
-      RC_FLAGS := $(RC_FLAGS) \
-          -D "JDK_FNAME=t2k.dll" \
-          -D "JDK_INTERNAL_NAME=t2k" \
-          -D "JDK_FTYPE=0x2L", \
-      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libt2k, \
-      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-  # t2k is linked against fontmanager
-  $(BUILD_LIBT2K): $(BUILD_LIBFONTMANAGER)
-
-  DESKTOP_LIBRARIES += $(BUILD_LIBT2K)
-endif
-
-##########################################################################################
+################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
   LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
@@ -768,99 +718,7 @@
 
 DESKTOP_LIBRARIES += $(BUILD_LIBJAWT)
 
-##########################################################################################
-
-ifndef OPENJDK
-
-  LIBKCMS_SRC := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libkcms \
-      $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libkcms \
-      #
-  LIBKCMS_CFLAGS += $(addprefix -I, $(LIBKCMS_SRC)) \
-      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
-      -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
-      #
-  LIBKCMS_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/closed/java.desktop/windows/native/libkcms/cmm.rc
-
-  LIBKCMS_CFLAGS += $(CFLAGS_JDKLIB)
-
-  ifeq ($(OPENJDK_TARGET_OS), solaris)
-    # This particular library uses a feature called PIC_CODE_SMALL (on solaris)
-    # implement it like this...since it's only used here
-    LIBKCMS_CFLAGS := $(patsubst -KPIC, -Kpic, $(LIBKCMS_CFLAGS))
-  else ifeq ($(OPENJDK_TARGET_CPU_ARCH), ppc)
-    LIBKCMS_CFLAGS := $(patsubst -fPIC, -fpic, $(LIBKCMS_CFLAGS))
-  endif
-
-  $(eval $(call SetupNativeCompilation,BUILD_LIBKCMS, \
-      LIBRARY := kcms, \
-      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-      SRC := $(LIBKCMS_SRC), \
-      LANG := C, \
-      EXCLUDE_FILES := $(BUILD_LIBKCMS_EXCLUDE_FILES), \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(LIBKCMS_CFLAGS) \
-          -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST, \
-      CFLAGS_linux := -Wno-missing-field-initializers, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libkcms/mapfile-vers, \
-      LDFLAGS := $(LDFLAGS_JDKLIB) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LDFLAGS_SUFFIX_linux := -lc -lpthread, \
-      LDFLAGS_SUFFIX_solaris := -lc, \
-      LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib version.lib, \
-      LDFLAGS_SUFFIX_posix := -lm -ljava -ljvm, \
-      VERSIONINFO_RESOURCE := $(LIBKCMS_VERSIONINFO_RESOURCE), \
-      RC_FLAGS := $(RC_FLAGS) \
-          -D "JDK_FNAME=kcms.dll" \
-          -D "JDK_INTERNAL_NAME=kcms" \
-          -D "JDK_FTYPE=0x2L", \
-      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libkcms, \
-      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-  $(BUILD_LIBKCMS): $(BUILD_LIBJAVA)
-
-  DESKTOP_LIBRARIES += $(BUILD_LIBKCMS)
-
-endif
-
-##########################################################################################
-
-ifndef OPENJDK
-  ifeq ($(OPENJDK_TARGET_OS), solaris)
-    ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-
-      ifeq ($(shell if test "$(OS_VERSION_MAJOR)" -eq 5 -a "$(OS_VERSION_MINOR)" -le 10; then $(ECHO) ok; fi), ok)
-
-        SUNWJDGA_MAPFILE :=
-        ifeq ($(OPENJDK_TARGET_CPU_ARCH), sparc)
-          SUNWJDGA_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdga/mapfile-vers
-        endif
-
-        $(eval $(call SetupNativeCompilation,BUILD_LIBSUNWJDGA, \
-            LIBRARY := sunwjdga, \
-            OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-            SRC := $(JDK_TOPDIR)/src/java.desktop/unix/native/libsunwjdga, \
-            LANG := C, \
-            OPTIMIZATION := LOW, \
-            CFLAGS := $(CFLAGS_JDKLIB) \
-                -I$(JDK_TOPDIR)/src/share/javavm/export \
-                -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \
-                $(X_CFLAGS), \
-            MAPFILE := $(SUNWJDGA_MAPFILE), \
-            LDFLAGS := $(LDFLAGS_JDKLIB) \
-                $(call SET_SHARED_LIBRARY_ORIGIN), \
-            LDFLAGS_SUFFIX := $(X_LIBS) -ldga -lX11 $(LIBDL) -lc, \
-            OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsunwjdga, \
-            DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-        DESKTOP_LIBRARIES += $(BUILD_LIBSUNWJDGA)
-
-      endif
-    endif
-  endif
-endif
-
-##########################################################################################
+################################################################################
 
 ifeq ($(BUILD_HEADLESS), true)
   # Mac and Windows only use the native AWT lib, do not build libawt_headless
@@ -932,7 +790,7 @@
   endif
 endif
 
-##########################################################################################
+################################################################################
 
 ifndef BUILD_HEADLESS_ONLY
 
@@ -1041,47 +899,7 @@
 
 endif
 
-##########################################################################################
-
-ifndef OPENJDK
-
-  LIBDCPR_SRC_DIRS := $(JDK_TOPDIR)/src/closed/java.desktop/share/native/libdcpr
-  LIBDCPR_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBDCPR_SRC_DIRS) -type d)) \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/sun/java2d/pipe \
-      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
-      -I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
-      #
-
-  $(eval $(call SetupNativeCompilation,BUILD_LIBDCPR, \
-      LIBRARY := dcpr, \
-      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-      SRC := $(LIBDCPR_SRC_DIRS), \
-      LANG := C, \
-      OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKLIB) \
-          $(LIBDCPR_CFLAGS), \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdcpr/mapfile-vers, \
-      LDFLAGS := $(LDFLAGS_JDKLIB) \
-          $(call SET_SHARED_LIBRARY_ORIGIN), \
-      LDFLAGS_SUFFIX := $(LIBM) $(LDFLAGS_JDKLIB_SUFFIX), \
-      LDFLAGS_SUFFIX_windows := $(WIN_JAVA_LIB), \
-      LDFLAGS_SUFFIX_posix := -lm, \
-      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
-      RC_FLAGS := $(RC_FLAGS) \
-          -D "JDK_FNAME=dcpr.dll" \
-          -D "JDK_INTERNAL_NAME=dcpr" \
-          -D "JDK_FTYPE=0x2L", \
-      OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libdcpr, \
-      DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
-
-  $(BUILD_LIBDCPR): $(BUILD_LIBJAVA)
-
-  DESKTOP_LIBRARIES += $(BUILD_LIBDCPR)
-
-endif
-
-##########################################################################################
+################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
@@ -1158,7 +976,7 @@
 
 endif
 
-##########################################################################################
+################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
@@ -1199,3 +1017,8 @@
   #$(BUILD_LIBOSXUI): $(BUILD_LIBJAVA)
 
 endif
+
+################################################################################
+
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))

--- a/jdk/make/lib/CoreLibraries.gmk	Wed Aug 20 11:30:13 2014 -0700
+++ b/jdk/make/lib/CoreLibraries.gmk	Thu Aug 21 11:05:35 2014 +0200
@@ -26,6 +26,8 @@
 WIN_VERIFY_LIB := $(JDK_OUTPUTDIR)/objs/libverify/verify.lib
 
 ##########################################################################################
+# libfdlibm is statically linked with libjava below and not delivered into the 
+# product on its own.
 
 BUILD_LIBFDLIBM_OPTIMIZATION := HIGH