# HG changeset patch
# User ihse
# Date 1476172171 -7200
# Node ID f285e333e8dbfe00847fb9f6ede66cda531c491d
# Parent  0875007901f7d364a08220b052f0c81003e9c8c5
8167424: Various trivial fixes in build system
Reviewed-by: erikj, tbell

diff -r 0875007901f7 -r f285e333e8db common/autoconf/basics_windows.m4
--- a/common/autoconf/basics_windows.m4	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/basics_windows.m4	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/boot-jdk.m4
--- a/common/autoconf/boot-jdk.m4	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/boot-jdk.m4	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/bootcycle-spec.gmk.in
--- a/common/autoconf/bootcycle-spec.gmk.in	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/bootcycle-spec.gmk.in	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/buildjdk-spec.gmk.in
--- a/common/autoconf/buildjdk-spec.gmk.in	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/buildjdk-spec.gmk.in	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/compare.sh.in
--- a/common/autoconf/compare.sh.in	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/compare.sh.in	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/generated-configure.sh	Tue Oct 11 09:49:31 2016 +0200
@@ -1111,6 +1111,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -1389,6 +1390,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1641,6 +1643,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1778,7 +1789,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1931,6 +1942,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -3733,7 +3745,7 @@
 
 
 #
-# 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
@@ -3792,7 +3804,7 @@
 
 # ... then the rest
 #
-# 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
@@ -4403,7 +4415,7 @@
 
 
 #
-# 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
@@ -4498,7 +4510,7 @@
 
 
 #
-# 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
@@ -4818,7 +4830,7 @@
 
 
 #
-# 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
@@ -5091,7 +5103,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1475218974
+DATE_WHEN_GENERATED=1476172133
 
 ###############################################################################
 #
diff -r 0875007901f7 -r f285e333e8db common/autoconf/jdk-version.m4
--- a/common/autoconf/jdk-version.m4	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/jdk-version.m4	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/lib-bundled.m4
--- a/common/autoconf/lib-bundled.m4	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/lib-bundled.m4	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/source-dirs.m4
--- a/common/autoconf/source-dirs.m4	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/source-dirs.m4	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/spec.gmk.in
--- a/common/autoconf/spec.gmk.in	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/spec.gmk.in	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/autoconf/version-numbers
--- a/common/autoconf/version-numbers	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/autoconf/version-numbers	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/bin/compare_exceptions.sh.incl
--- a/common/bin/compare_exceptions.sh.incl	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/bin/compare_exceptions.sh.incl	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/bin/hgforest.sh
--- a/common/bin/hgforest.sh	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/bin/hgforest.sh	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/bin/jib.sh
--- a/common/bin/jib.sh	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/bin/jib.sh	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db common/conf/jib-profiles.js
--- a/common/conf/jib-profiles.js	Wed Jul 05 22:19:47 2017 +0200
+++ b/common/conf/jib-profiles.js	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/CopyImportModules.gmk
--- a/make/CopyImportModules.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/CopyImportModules.gmk	Tue Oct 11 09:49:31 2016 +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), \
diff -r 0875007901f7 -r f285e333e8db make/CreateBuildJdkCopy.gmk
--- a/make/CreateBuildJdkCopy.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/CreateBuildJdkCopy.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/GensrcModuleInfo.gmk
--- a/make/GensrcModuleInfo.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/GensrcModuleInfo.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/Images.gmk
--- a/make/Images.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/Images.gmk	Tue Oct 11 09:49:31 2016 +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), \
diff -r 0875007901f7 -r f285e333e8db make/Init.gmk
--- a/make/Init.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/Init.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/InitSupport.gmk
--- a/make/InitSupport.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/InitSupport.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/Jprt.gmk
--- a/make/Jprt.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/Jprt.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/JrtfsJar.gmk
--- a/make/JrtfsJar.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/JrtfsJar.gmk	Tue Oct 11 09:49:31 2016 +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))
diff -r 0875007901f7 -r f285e333e8db make/MacBundles.gmk
--- a/make/MacBundles.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/MacBundles.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/Main.gmk
--- a/make/Main.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/Main.gmk	Tue Oct 11 09:49:31 2016 +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
 
diff -r 0875007901f7 -r f285e333e8db make/common/CORE_PKGS.gmk
--- a/make/common/CORE_PKGS.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/common/CORE_PKGS.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/common/JavaCompilation.gmk
--- a/make/common/JavaCompilation.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/common/JavaCompilation.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/common/NON_CORE_PKGS.gmk
--- a/make/common/NON_CORE_PKGS.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/common/NON_CORE_PKGS.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/common/SetupJavaCompilers.gmk
--- a/make/common/SetupJavaCompilers.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/common/SetupJavaCompilers.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/devkit/Tools.gmk
--- a/make/devkit/Tools.gmk	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/devkit/Tools.gmk	Tue Oct 11 09:49:31 2016 +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
diff -r 0875007901f7 -r f285e333e8db make/devkit/createWindowsDevkit.sh
--- a/make/devkit/createWindowsDevkit.sh	Wed Jul 05 22:19:47 2017 +0200
+++ b/make/devkit/createWindowsDevkit.sh	Tue Oct 11 09:49:31 2016 +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