--- old/make/autoconf/spec.gmk.in	2018-02-08 07:56:30.000000000 -0500
+++ new/make/autoconf/spec.gmk.in	2018-02-08 07:56:29.000000000 -0500
@@ -221,9 +221,9 @@
   # Only export "VENDOR" to the build if COMPANY_NAME contains a real value.
   # Otherwise the default value for VENDOR, which is used to set the "java.vendor"
   # and "java.vm.vendor" properties is hard-coded into the source code (i.e. in
-  # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor") 
+  # System.c in the jdk for "vm.vendor" and vm_version.cpp in the VM for "java.vm.vendor")
   ifneq ($(COMPANY_NAME), N/A)
-    VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"' 
+    VERSION_CFLAGS += -DVENDOR='"$(COMPANY_NAME)"'
   endif
 endif
 
@@ -629,14 +629,11 @@
 
 INTERIM_RMIC_BASE_MODULES := jdk.rmic
 INTERIM_RMIC_MODULES := $(addsuffix .interim, $(INTERIM_RMIC_BASE_MODULES))
-INTERIM_RMIC_ADD_EXPORTS := \
-    --add-exports java.corba/com.sun.corba.se.impl.util=jdk.rmic.interim \
     #
 # Use = to delay expansion of PathList since it's not available in this file.
-INTERIM_RMIC_ARGS = --limit-modules java.base,jdk.compiler,jdk.javadoc,java.corba \
+INTERIM_RMIC_ARGS = --limit-modules java.base,jdk.compiler,jdk.javadoc \
     --module-path $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/interim_rmic_modules \
         $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules) \
-    $(INTERIM_RMIC_ADD_EXPORTS) \
     #
 
 # You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...