--- old/common/autoconf/basics_windows.m4	2016-10-10 11:16:10.912010307 +0200
+++ new/common/autoconf/basics_windows.m4	2016-10-10 11:16:10.808011989 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/common/autoconf/boot-jdk.m4	2016-10-10 11:16:11.332003516 +0200
+++ new/common/autoconf/boot-jdk.m4	2016-10-10 11:16:11.228005198 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/common/autoconf/bootcycle-spec.gmk.in	2016-10-10 11:16:11.759996594 +0200
+++ new/common/autoconf/bootcycle-spec.gmk.in	2016-10-10 11:16:11.651998341 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/common/autoconf/buildjdk-spec.gmk.in	2016-10-10 11:16:12.175989867 +0200
+++ new/common/autoconf/buildjdk-spec.gmk.in	2016-10-10 11:16:12.075991484 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
@@ -156,7 +156,3 @@
 JVM_VARIANT_ZERO := false
 JVM_VARIANT_ZEROSHARK := false
 JVM_VARIANT_CORE := false
-
-# 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)/make/common/MakeBase.gmk
--- old/common/autoconf/compare.sh.in	2016-10-10 11:16:12.591983141 +0200
+++ new/common/autoconf/compare.sh.in	2016-10-10 11:16:12.487984821 +0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, 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
--- old/common/autoconf/jdk-version.m4	2016-10-10 11:16:13.003976477 +0200
+++ new/common/autoconf/jdk-version.m4	2016-10-10 11:16:12.899978159 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/common/autoconf/lib-bundled.m4	2016-10-10 11:16:13.431969556 +0200
+++ new/common/autoconf/lib-bundled.m4	2016-10-10 11:16:13.311971497 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/common/autoconf/source-dirs.m4	2016-10-10 11:16:13.847962829 +0200
+++ new/common/autoconf/source-dirs.m4	2016-10-10 11:16:13.747964446 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/common/autoconf/spec.gmk.in	2016-10-10 11:16:14.271955973 +0200
+++ new/common/autoconf/spec.gmk.in	2016-10-10 11:16:14.163957719 +0200
@@ -175,7 +175,7 @@
 VERSION_STRING := @VERSION_STRING@
 # The short version string, without trailing zeroes and just PRE, if present.
 VERSION_SHORT := @VERSION_SHORT@
-# The Java specification version. It usually equals to the major version number.
+# The Java specification version. It usually equals the major version number.
 VERSION_SPECIFICATION := @VERSION_MAJOR@
 # A GA version is defined by the PRE string being empty. Rather than testing for
 # that, this variable defines it with true/false.
@@ -244,9 +244,6 @@
 # Only build headless support or not
 ENABLE_HEADLESS_ONLY := @ENABLE_HEADLESS_ONLY@
 
-# Legacy support
-USE_NEW_HOTSPOT_BUILD:=@USE_NEW_HOTSPOT_BUILD@
-
 # JDK_OUTPUTDIR specifies where a working jvm is built.
 # You can run $(JDK_OUTPUTDIR)/bin/java
 # Though the layout of the contents of $(JDK_OUTPUTDIR) is not
--- old/common/autoconf/version-numbers	2016-10-10 11:16:14.691949181 +0200
+++ new/common/autoconf/version-numbers	2016-10-10 11:16:14.583950927 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/common/bin/compare_exceptions.sh.incl	2016-10-10 11:16:15.099942583 +0200
+++ new/common/bin/compare_exceptions.sh.incl	2016-10-10 11:16:14.991944330 +0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, 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
--- old/common/bin/hgforest.sh	2016-10-10 11:16:15.519935791 +0200
+++ new/common/bin/hgforest.sh	2016-10-10 11:16:15.415937473 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2016, 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
--- old/common/bin/jib.sh	2016-10-10 11:16:15.931929129 +0200
+++ new/common/bin/jib.sh	2016-10-10 11:16:15.831930746 +0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/common/conf/jib-profiles.js	2016-10-10 11:16:16.347922402 +0200
+++ new/common/conf/jib-profiles.js	2016-10-10 11:16:16.243924083 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
--- old/make/CopyImportModules.gmk	2016-10-10 11:16:16.767915610 +0200
+++ new/make/CopyImportModules.gmk	2016-10-10 11:16:16.663917291 +0200
@@ -41,14 +41,14 @@
   ifeq ($(OPENJDK_TARGET_OS), windows)
     TO_BIN_FILTER := %$(SHARED_LIBRARY_SUFFIX) %.diz %.pdb %.map
 
-    $(eval $(call SetupCopyFiles,COPY_LIBS_TO_BIN, \
+    $(eval $(call SetupCopyFiles, COPY_LIBS_TO_BIN, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/bin, \
         FILES := $(filter $(TO_BIN_FILTER), \
             $(call CacheFind, $(LIBS_DIR))) \
     ))
 
-    $(eval $(call SetupCopyFiles,COPY_LIBS_TO_LIB, \
+    $(eval $(call SetupCopyFiles, COPY_LIBS_TO_LIB, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/lib, \
         FILES := $(filter-out $(TO_BIN_FILTER), \
--- old/make/CreateBuildJdkCopy.gmk	2016-10-10 11:16:17.187908818 +0200
+++ new/make/CreateBuildJdkCopy.gmk	2016-10-10 11:16:17.083910500 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/make/GensrcModuleInfo.gmk	2016-10-10 11:16:17.595902220 +0200
+++ new/make/GensrcModuleInfo.gmk	2016-10-10 11:16:17.491903903 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/make/Images.gmk	2016-10-10 11:16:18.007895558 +0200
+++ new/make/Images.gmk	2016-10-10 11:16:17.899897304 +0200
@@ -412,7 +412,7 @@
 ################################################################################
 # /sample dir
 
-$(eval $(call SetupCopyFiles,COPY_SAMPLES, \
+$(eval $(call SetupCopyFiles, COPY_SAMPLES, \
     SRC := $(SUPPORT_OUTPUTDIR)/sample/image, \
     DEST := $(JDK_IMAGE_DIR)/sample, \
     FILES := $(if $(wildcard $(SUPPORT_OUTPUTDIR)/sample/image), \
--- old/make/Init.gmk	2016-10-10 11:16:18.423888831 +0200
+++ new/make/Init.gmk	2016-10-10 11:16:18.319890513 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, 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
--- old/make/InitSupport.gmk	2016-10-10 11:16:18.847881974 +0200
+++ new/make/InitSupport.gmk	2016-10-10 11:16:18.743883656 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/make/Jprt.gmk	2016-10-10 11:16:19.271875118 +0200
+++ new/make/Jprt.gmk	2016-10-10 11:16:19.163876864 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2016, 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
--- old/make/JrtfsJar.gmk	2016-10-10 11:16:19.683868456 +0200
+++ new/make/JrtfsJar.gmk	2016-10-10 11:16:19.575870202 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
@@ -46,7 +46,7 @@
     jdk/internal/jrtfs \
     #
 
-$(eval $(call SetupJavaCompilation,BUILD_JRTFS, \
+$(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
     SETUP := GENERATE_OLDBYTECODE, \
     SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
     EXCLUDE_FILES := module-info.java, \
@@ -57,7 +57,7 @@
 # file will not be copied unless META-INF/services would also be added to the INCLUDES.
 # Adding META-INF/services would include all files in that directory when only the one
 # is needed, which is why this explicit copy is defined instead.
-$(eval $(call SetupCopyFiles,COPY_JIMAGE_SERVICE_PROVIDER, \
+$(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
     SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
     DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
     FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
--- old/make/MacBundles.gmk	2016-10-10 11:16:20.091861857 +0200
+++ new/make/MacBundles.gmk	2016-10-10 11:16:19.987863539 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/make/Main.gmk	2016-10-10 11:16:20.507855130 +0200
+++ new/make/Main.gmk	2016-10-10 11:16:20.403856813 +0200
@@ -237,7 +237,7 @@
 # Build hotspot target
 
 ifeq ($(BUILD_HOTSPOT),true)
-hotspot:
+  hotspot:
 	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildHotspot.gmk)
 endif
 
--- old/make/common/CORE_PKGS.gmk	2016-10-10 11:16:20.939848145 +0200
+++ new/make/common/CORE_PKGS.gmk	2016-10-10 11:16:20.835849827 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2016, 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
--- old/make/common/JavaCompilation.gmk	2016-10-10 11:16:21.355841417 +0200
+++ new/make/common/JavaCompilation.gmk	2016-10-10 11:16:21.255843034 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/make/common/NON_CORE_PKGS.gmk	2016-10-10 11:16:21.783834496 +0200
+++ new/make/common/NON_CORE_PKGS.gmk	2016-10-10 11:16:21.679836178 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2016, 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
--- old/make/common/SetupJavaCompilers.gmk	2016-10-10 11:16:22.199827769 +0200
+++ new/make/common/SetupJavaCompilers.gmk	2016-10-10 11:16:22.099829386 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/make/devkit/Tools.gmk	2016-10-10 11:16:22.619820977 +0200
+++ new/make/devkit/Tools.gmk	2016-10-10 11:16:22.515822659 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, 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
--- old/make/devkit/createWindowsDevkit.sh	2016-10-10 11:16:23.035814250 +0200
+++ new/make/devkit/createWindowsDevkit.sh	2016-10-10 11:16:22.927815996 +0200
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/corba/make/gensrc/Gensrc-java.corba.gmk	2016-10-10 11:16:23.455807458 +0200
+++ new/corba/make/gensrc/Gensrc-java.corba.gmk	2016-10-10 11:16:23.347809205 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
--- old/hotspot/make/lib/CompileGtest.gmk	2016-10-10 11:16:23.943799567 +0200
+++ new/hotspot/make/lib/CompileGtest.gmk	2016-10-10 11:16:23.807801766 +0200
@@ -69,7 +69,7 @@
     CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \
         -I$(GTEST_FRAMEWORK_SRC)/include \
         $(addprefix -I,$(GTEST_TEST_SRC)), \
-    CFLAGS_windows := /EHsc, \
+    CFLAGS_windows := -EHsc, \
     CFLAGS_solaris := -DGTEST_HAS_EXCEPTIONS=0 -library=stlport4, \
     CFLAGS_macosx := -DGTEST_OS_MAC=1, \
     CFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \
--- old/jdk/make/CompileInterimRmic.gmk	2016-10-10 11:16:24.587789152 +0200
+++ new/jdk/make/CompileInterimRmic.gmk	2016-10-10 11:16:24.391792323 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/CompileTools.gmk	2016-10-10 11:16:25.291777768 +0200
+++ new/jdk/make/CompileTools.gmk	2016-10-10 11:16:25.099780873 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/GenerateModuleSummary.gmk	2016-10-10 11:16:25.903767871 +0200
+++ new/jdk/make/GenerateModuleSummary.gmk	2016-10-10 11:16:25.711770976 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
--- old/jdk/make/Tools.gmk	2016-10-10 11:16:26.523757845 +0200
+++ new/jdk/make/Tools.gmk	2016-10-10 11:16:26.327761015 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/gendata/GendataBreakIterator.gmk	2016-10-10 11:16:27.235746331 +0200
+++ new/jdk/make/gendata/GendataBreakIterator.gmk	2016-10-10 11:16:27.039749501 +0200
@@ -1,5 +1,5 @@
 
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/gendata/GendataHtml32dtd.gmk	2016-10-10 11:16:27.939734947 +0200
+++ new/jdk/make/gendata/GendataHtml32dtd.gmk	2016-10-10 11:16:27.743738117 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/gensrc/Gensrc-java.base.gmk	2016-10-10 11:16:28.639723627 +0200
+++ new/jdk/make/gensrc/Gensrc-java.base.gmk	2016-10-10 11:16:28.447726733 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/gensrc/Gensrc-jdk.jlink.gmk	2016-10-10 11:16:29.347712179 +0200
+++ new/jdk/make/gensrc/Gensrc-jdk.jlink.gmk	2016-10-10 11:16:29.155715283 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
--- old/jdk/make/gensrc/GensrcIcons.gmk	2016-10-10 11:16:30.059700665 +0200
+++ new/jdk/make/gensrc/GensrcIcons.gmk	2016-10-10 11:16:29.867703769 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/gensrc/GensrcLocaleData.gmk	2016-10-10 11:16:30.771689151 +0200
+++ new/jdk/make/gensrc/GensrcLocaleData.gmk	2016-10-10 11:16:30.575692320 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/gensrc/GensrcModuleLoaderMap.gmk	2016-10-10 11:16:31.387679190 +0200
+++ new/jdk/make/gensrc/GensrcModuleLoaderMap.gmk	2016-10-10 11:16:31.191682359 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/jdk/make/gensrc/GensrcVarHandles.gmk	2016-10-10 11:16:31.907670780 +0200
+++ new/jdk/make/gensrc/GensrcVarHandles.gmk	2016-10-10 11:16:31.715673886 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/jdk/make/launcher/Launcher-java.scripting.gmk	2016-10-10 11:16:32.527660755 +0200
+++ new/jdk/make/launcher/Launcher-java.scripting.gmk	2016-10-10 11:16:32.335663860 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/launcher/Launcher-jdk.compiler.gmk	2016-10-10 11:16:33.239649241 +0200
+++ new/jdk/make/launcher/Launcher-jdk.compiler.gmk	2016-10-10 11:16:33.043652410 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/launcher/Launcher-jdk.javadoc.gmk	2016-10-10 11:16:33.943637857 +0200
+++ new/jdk/make/launcher/Launcher-jdk.javadoc.gmk	2016-10-10 11:16:33.751640961 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/launcher/Launcher-jdk.jdeps.gmk	2016-10-10 11:16:34.551628024 +0200
+++ new/jdk/make/launcher/Launcher-jdk.jdeps.gmk	2016-10-10 11:16:34.359631129 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/jdk/make/launcher/Launcher-jdk.jlink.gmk	2016-10-10 11:16:35.071619616 +0200
+++ new/jdk/make/launcher/Launcher-jdk.jlink.gmk	2016-10-10 11:16:34.879622720 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
--- old/jdk/make/launcher/Launcher-jdk.jstatd.gmk	2016-10-10 11:16:35.691609589 +0200
+++ new/jdk/make/launcher/Launcher-jdk.jstatd.gmk	2016-10-10 11:16:35.495612759 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/launcher/Launcher-jdk.pack200.gmk	2016-10-10 11:16:36.399598141 +0200
+++ new/jdk/make/launcher/Launcher-jdk.pack200.gmk	2016-10-10 11:16:36.207601245 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk	2016-10-10 11:16:37.119586498 +0200
+++ new/jdk/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk	2016-10-10 11:16:36.923589667 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/lib/Lib-java.desktop.gmk	2016-10-10 11:16:37.823575113 +0200
+++ new/jdk/make/lib/Lib-java.desktop.gmk	2016-10-10 11:16:37.631578218 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/rmic/Rmic-java.management.gmk	2016-10-10 11:16:38.527563728 +0200
+++ new/jdk/make/rmic/Rmic-java.management.gmk	2016-10-10 11:16:38.335566833 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/jdk/make/rmic/RmicCommon.gmk	2016-10-10 11:16:39.247552086 +0200
+++ new/jdk/make/rmic/RmicCommon.gmk	2016-10-10 11:16:39.043555384 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, 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
--- old/langtools/make/gensrc/GensrcCommon.gmk	2016-10-10 11:16:39.859542188 +0200
+++ new/langtools/make/gensrc/GensrcCommon.gmk	2016-10-10 11:16:39.711544583 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, 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
--- old/nashorn/make/BuildNashorn.gmk	2016-10-10 11:16:40.367533974 +0200
+++ new/nashorn/make/BuildNashorn.gmk	2016-10-10 11:16:40.243535979 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, 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