changeset 1312:eaa43665c420

Stop using -bootclasspath with jimages in bootcycle builds
author erikj
date Wed, 26 Nov 2014 14:25:00 +0100
parents 4b0f3a593860
children 8b625a643dba
files common/autoconf/boot-jdk.m4 common/autoconf/bootcycle-spec.gmk.in common/autoconf/generated-configure.sh common/autoconf/spec.gmk.in make/common/SetupJavaCompilers.gmk
diffstat 5 files changed, 7 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/boot-jdk.m4	Mon Nov 24 15:21:27 2014 +0100
+++ b/common/autoconf/boot-jdk.m4	Wed Nov 26 14:25:00 2014 +0100
@@ -305,20 +305,6 @@
     AC_MSG_ERROR([Cannot continue])
   fi
 
-  # Setup proper paths for what we found
-  BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
-  if test ! -f "$BOOT_RTJAR"; then
-    # On MacOSX it is called classes.jar
-    BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
-    if test -f "$BOOT_RTJAR"; then
-      # Remove the ..
-      BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
-    fi
-  fi
-  BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
-  BOOT_JDK="$BOOT_JDK"
-  AC_SUBST(BOOT_RTJAR)
-  AC_SUBST(BOOT_TOOLSJAR)
   AC_SUBST(BOOT_JDK)
 
   # Setup tools from the Boot JDK.
--- a/common/autoconf/bootcycle-spec.gmk.in	Mon Nov 24 15:21:27 2014 +0100
+++ b/common/autoconf/bootcycle-spec.gmk.in	Wed Nov 26 14:25:00 2014 +0100
@@ -43,10 +43,7 @@
 # Override specific values to do a boot cycle build
 
 # Use a different Boot JDK
-OLD_BOOT_JDK := $(BOOT_JDK)
 BOOT_JDK := $(JDK_IMAGE_DIR)
-BOOT_RTJAR := $(JDK_IMAGE_DIR)/lib/modules/bootmodules.jimage
-BOOT_TOOLSJAR := $(JDK_IMAGE_DIR)/lib/modules/appmodules.jimage
 
 # The bootcycle build has a different output directory
 BUILD_OUTPUT:=@BUILD_OUTPUT@/bootcycle-build
--- a/common/autoconf/generated-configure.sh	Mon Nov 24 15:21:27 2014 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Nov 26 14:25:00 2014 +0100
@@ -820,8 +820,6 @@
 JAVAC
 JAVA
 BOOT_JDK
-BOOT_TOOLSJAR
-BOOT_RTJAR
 JAVA_CHECK
 JAVAC_CHECK
 COOKED_BUILD_NUMBER
@@ -4328,7 +4326,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1415912524
+DATE_WHEN_GENERATED=1416999037
 
 ###############################################################################
 #
@@ -25533,20 +25531,6 @@
     as_fn_error $? "Cannot continue" "$LINENO" 5
   fi
 
-  # Setup proper paths for what we found
-  BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
-  if test ! -f "$BOOT_RTJAR"; then
-    # On MacOSX it is called classes.jar
-    BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
-    if test -f "$BOOT_RTJAR"; then
-      # Remove the ..
-      BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
-    fi
-  fi
-  BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
-  BOOT_JDK="$BOOT_JDK"
-
-
 
 
   # Setup tools from the Boot JDK.
--- a/common/autoconf/spec.gmk.in	Mon Nov 24 15:21:27 2014 +0100
+++ b/common/autoconf/spec.gmk.in	Wed Nov 26 14:25:00 2014 +0100
@@ -250,11 +250,9 @@
 
 BUILD_HOTSPOT=@BUILD_HOTSPOT@
 
-# The boot jdk to use. These are overridden in bootcycle-spec.gmk. Make sure to keep
-# them in sync.
+# The boot jdk to use. This is overridden in bootcycle-spec.gmk. Make sure to keep
+# it in sync.
 BOOT_JDK:=@BOOT_JDK@
-BOOT_RTJAR:=@BOOT_RTJAR@
-BOOT_TOOLSJAR=$(BOOT_JDK)/lib/tools.jar
 
 # When compiling Java source to be run by the boot jdk
 # use these extra flags, eg -source 6 -target 6
--- a/make/common/SetupJavaCompilers.gmk	Mon Nov 24 15:21:27 2014 +0100
+++ b/make/common/SetupJavaCompilers.gmk	Wed Nov 26 14:25:00 2014 +0100
@@ -48,10 +48,13 @@
 # The generate old bytecode javac setup uses the new compiler to compile for the
 # boot jdk to generate tools that need to be run with the boot jdk.
 # Thus we force the target bytecode to the previous JDK version.
+# Add -Xlint:-options to avoid the warning about not setting -bootclasspath. Since
+# it's running on the boot jdk, the default bootclasspath is correct.
 $(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
     JVM := $(JAVA_SMALL), \
     JAVAC := $(NEW_JAVAC), \
-    FLAGS := $(BOOT_JDK_SOURCETARGET) -bootclasspath $(BOOT_RTJAR) $(DISABLE_WARNINGS), \
+    FLAGS := $(BOOT_JDK_SOURCETARGET) -XDignore.symbol.file=true \
+        $(DISABLE_WARNINGS) -Xlint:-options, \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))