--- a/jdk/.hgtags Wed Jul 05 18:38:46 2017 +0200
+++ b/jdk/.hgtags Wed Jul 05 18:38:51 2017 +0200
@@ -196,3 +196,4 @@
32a57e645e012a1f0665c075969ca598e0dbb948 jdk8-b72
733885f57e14cc27f5a5ff0dffe641d2fa3c704a jdk8-b73
57d5d954462831ac353a1f40d3bb05ddb4620952 jdk8-b74
+4a67fdb752b7d6329d9be9c28d3f9d6cf7eb9a3c jdk8-b75
--- a/jdk/make/common/shared/Defs-solaris.gmk Wed Jul 05 18:38:46 2017 +0200
+++ b/jdk/make/common/shared/Defs-solaris.gmk Wed Jul 05 18:38:51 2017 +0200
@@ -211,7 +211,9 @@
MAPFILE_EXCEPTIONS = \
(libjdgaSUNWafb|libjdgaSUNWcg6|libjdgaSUNWffb|libjdgaSUNWm64|libxinerama)
else
- MAPFILE_EXCEPTIONS = ()
+ # At present there are no exceptions for non
+ # SPARC. Use a harmless value.
+ MAPFILE_EXCEPTIONS = (NO_EXCEPTIONS)
endif
# Macro to check it's input file for banned dependencies and verify the
--- a/jdk/make/common/shared/Sanity.gmk Wed Jul 05 18:38:46 2017 +0200
+++ b/jdk/make/common/shared/Sanity.gmk Wed Jul 05 18:38:51 2017 +0200
@@ -1486,26 +1486,6 @@
######################################################
sane-gcc-compiler:
ifndef OPENJDK
- ifeq ($(PLATFORM), solaris)
- @if [ -r $(GCC_COMPILER_PATH) ]; then \
- if [ ! "$(GCC_VER)" = $(REQUIRED_GCC_VER) ]; then \
- $(ECHO) "ERROR: The Solaris GCC compiler version must be $(REQUIRED_GCC_VER). \n" \
- " You are using the following compiler version: $(GCC_VER) \n" \
- " The compiler was obtained from the following location: \n" \
- " $(GCC_COMPILER_PATH) \n" \
- " Please change your compiler. \n" \
- "" >> $(ERROR_FILE) ; \
- fi \
- else \
- $(ECHO) "ERROR: You do not have a valid GCC_COMPILER_PATH setting. \n" \
- " Please check your access to \n" \
- " $(GCC_COMPILER_PATH) \n" \
- " and/or check your value of ALT_GCC_COMPILER_PATH. \n" \
- " This will affect you if you build the plugin target. \n" \
- "" >> $(ERROR_FILE) ; \
- fi
- endif
-
ifeq ($(PLATFORM), linux)
ifeq ($(ARCH_DATA_MODEL), 32)
ifdef ALT_GCC29_COMPILER_PATH
--- a/jdk/makefiles/CreateJars.gmk Wed Jul 05 18:38:46 2017 +0200
+++ b/jdk/makefiles/CreateJars.gmk Wed Jul 05 18:38:51 2017 +0200
@@ -836,7 +836,7 @@
$(IMAGES_OUTPUTDIR)/symbols/_the.symbols: $(IMAGES_OUTPUTDIR)/lib/rt.jar
$(RM) -r $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
$(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols/META-INF/sym
- $(JAVA) $(JAVAC_JARS) \
+ $(JAVA) $(NEW_JAVAC) \
-bootclasspath $(JDK_OUTPUTDIR)/classes \
-XDprocess.packages -proc:only \
-processor com.sun.tools.javac.sym.CreateSymbols \
--- a/jdk/makefiles/GensrcSwing.gmk Wed Jul 05 18:38:46 2017 +0200
+++ b/jdk/makefiles/GensrcSwing.gmk Wed Jul 05 18:38:51 2017 +0200
@@ -71,7 +71,7 @@
$(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing/SwingBeanInfoBase.java $(JDK_OUTPUTDIR)/gensrc/sun/swing/BeanInfoUtils.java $(BUILD_TOOLS)
$(ECHO) Generating beaninfo
$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
- $(JAVA) -Djava.awt.headless=true -jar $(JAVADOC_JARS) -doclet GenDocletBeanInfo \
+ $(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) -doclet GenDocletBeanInfo \
-x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
-t $(DOCLETSRC_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \
-XDignore.symbol.file=true \
--- a/jdk/makefiles/Setup.gmk Wed Jul 05 18:38:46 2017 +0200
+++ b/jdk/makefiles/Setup.gmk Wed Jul 05 18:38:51 2017 +0200
@@ -23,10 +23,6 @@
# questions.
#
-JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-JAVAH_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar
-JAVADOC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar" -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar
-
DISABLE_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
# The generate old bytecode javac setup uses the new compiler to compile for the
@@ -34,7 +30,7 @@
# Thus we force the target bytecode to 7.
$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-source 7 -target 7 -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
@@ -43,8 +39,7 @@
# new jdk. This new bytecode might only be possible to run using the new jvm.
$(eval $(call SetupJavaCompiler,GENERATE_JDKBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
- JAVAH:=$(JAVAH_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes -source 8 -target 8 -encoding ascii -XDignore.symbol.file=true $(DISABLE_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
@@ -55,7 +50,7 @@
# (it will be in "make images") therefore we use classes instead.
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE,\
JVM:=$(JAVA),\
- JAVAC:=$(JAVAC_JARS),\
+ JAVAC:=$(NEW_JAVAC),\
FLAGS:=-bootclasspath $(JDK_OUTPUTDIR)/classes $(DISABLE_WARNINGS),\
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))