# HG changeset patch
# User duke
# Date 1499278042 -7200
# Node ID 2c040ffbf304962e38b17905e08057f140549ab3
# Parent  e549997f615fb7ca38f871ceb8b997f9d20355f1# Parent  e49b8c74a1c01a23f88479a4fd66e075e57bde34
Merge

diff -r e549997f615f -r 2c040ffbf304 .hgtags-top-repo
--- a/.hgtags-top-repo	Thu Nov 13 09:38:49 2014 -0800
+++ b/.hgtags-top-repo	Wed Jul 05 20:07:22 2017 +0200
@@ -281,3 +281,4 @@
 201d4e235d597a25a2d3ee1404394789ba386119 jdk9-b36
 723a67b0c442391447b1d8aad8b249d06d1032e8 jdk9-b37
 d42c0a90afc3c66ca87543076ec9aafd4b4680de jdk9-b38
+512dbbeb1730edcebfec873fc3f1455660b32000 jdk9-b39
diff -r e549997f615f -r 2c040ffbf304 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk	Thu Nov 13 09:38:49 2014 -0800
+++ b/make/CompileJavaModules.gmk	Wed Jul 05 20:07:22 2017 +0200
@@ -245,7 +245,6 @@
 
 ################################################################################
 # Exclude building of IIOP transport for RMI Connector
-java.management_EXCLUDES := com/sun/jmx/remote/protocol/iiop
 
 ifeq ($(RMICONNECTOR_IIOP), false)
   java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop
@@ -264,11 +263,11 @@
 java.corba_COPY := .prp
 java.corba_CLEAN := .properties
 
-java.corba_EXCLUDES := \
+java.corba_EXCLUDES += \
     com/sun/corba/se/PortableActivationIDL \
     com/sun/tools/corba/se/logutil \
     #
-java.corba_EXCLUDE_FILES := \
+java.corba_EXCLUDE_FILES += \
     com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
     com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
     com/sun/org/omg/CORBA/IDLTypeOperations.java \
@@ -350,12 +349,12 @@
     $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  jdk.sctp_EXCLUDE_FILES := $(SCTP_IMPL_CLASSES)
+  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS),aix)
   # These files are duplicated in AIX_SRC_DIRS
-  jdk.sctp_EXCLUDE_FILES := $(SCTP_IMPL_CLASSES)
+  jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
 endif
 
 ################################################################################
@@ -373,7 +372,7 @@
 
 ################################################################################
 
-jdk.jdi_EXCLUDES := \
+jdk.jdi_EXCLUDES += \
     com/sun/tools/example/debug/bdi \
     com/sun/tools/example/debug/event \
     com/sun/tools/example/debug/gui \
@@ -414,7 +413,7 @@
 jdk.localedata_COPY := _dict _th
 # Exclude BreakIterator classes that are just used in compile process to generate
 # data files and shouldn't go in the product
-jdk.localedata_EXCLUDE_FILES := sun/text/resources/th/BreakIteratorRules_th.java
+jdk.localedata_EXCLUDE_FILES += sun/text/resources/th/BreakIteratorRules_th.java
 
 ################################################################################
 # Setup the compilation of each module