From 7fbf406a0eca73265d4a2750e5322c67eb8fe6c2 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Fri, 1 Jul 2016 12:32:21 +0200
Subject: [PATCH 1/3] 8158629: bash >(...) construct still causes race
 conditions

Reviewed-by: tbell
---
 make/common/MakeBase.gmk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 703994958d6..15c6bc6254d 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -801,15 +801,20 @@ endif
 # of the build in case of failure. The  command line itself is stored in a file,
 # and also logged to stdout if the LOG=cmdlines option has been given.
 #
+# NOTE: If the command redirects stdout, the caller needs to wrap it in a
+# subshell (by adding parentheses around it), otherwise the redirect to the
+# subshell tee process will create a race condition where the target file may
+# not be fully written when the make recipe is done.
+#
 # Param 1 - The path to base the name of the log file / command line file on
 # Param 2 - The command to run
 ExecuteWithLog = \
   $(call LogCmdlines, Exececuting: [$(strip $2)]) \
   $(call WriteFile, $2, $(strip $1).cmdline) \
-  ( ( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
+  ( $(strip $2) > >($(TEE) $(strip $1).log) 2> >($(TEE) $(strip $1).log >&2) || \
       ( exitcode=$(DOLLAR)? && \
       $(CP) $(strip $1).log $(MAKESUPPORT_OUTPUTDIR)/failure-logs/$(subst /,_,$(patsubst $(BUILD_OUTPUT)/%,%,$(strip $1))).log && \
-      exit $(DOLLAR)exitcode ) ) && wait )
+      exit $(DOLLAR)exitcode ) )
 
 ################################################################################
 # Find lib dir for module

From 29852f47c03927ddcb98342f2910a059867d6170 Mon Sep 17 00:00:00 2001
From: Bhavesh Patel <bpatel@openjdk.org>
Date: Wed, 13 Jul 2016 14:23:53 -0700
Subject: [PATCH 2/3] 8161255: jdk build "all" (docs) fails on all platforms,
 error from DefaultLoggerFinder.java

Reviewed-by: tbell, ksrini, darcy
---
 make/Javadoc.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk
index f194dd95f89..d1607b24bab 100644
--- a/make/Javadoc.gmk
+++ b/make/Javadoc.gmk
@@ -424,7 +424,7 @@ $(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
 	@($(call COMMON_JAVADOCFLAGS) ; \
           $(call COMMON_JAVADOCTAGS) ; \
           $(call OptionOnly,-Xdoclint:reference) ; \
-          $(call OptionOnly,-Xdoclint/package:-org.omg.*) ; \
+          $(call OptionOnly,-Xdoclint/package:-org.omg.*$(COMMA)jdk.internal.logging.*) ; \
           $(call OptionPair,-system,none) ; \
 	  $(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \
 	  $(call OptionPair,-addmods,$(COREAPI_MODULES)) ; \

From 1c7cd18b25c89ff10045bc54b249998c3bc80bd2 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Wed, 13 Jul 2016 14:42:09 -0700
Subject: [PATCH 3/3] 8160398: (jdeps) Replace a list of JDK 8 internal API for
 detecting if it's removed in JDK 9 or later

Reviewed-by: dfuchs
---
 make/CompileJavaModules.gmk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index a53f2b13887..f377d6687c5 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -409,6 +409,8 @@ jdk.jconsole_CLEAN_FILES := $(wildcard \
 
 ################################################################################
 
+jdk.jdeps_COPY := .txt
+
 jdk.jdeps_CLEAN_FILES := $(wildcard \
     $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
     $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)