Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Mon, 04 Feb 2013 18:08:42 -0500
- author
- dholmes
- date
- Mon, 04 Feb 2013 18:08:42 -0500
- changeset 626
- bebeaa04ab8e
- parent 625
- 2f8fd30f02e6
- parent 608
- 7e584be2ee58
- child 627
- 28071e4ca1de
Merge
| common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
| common/makefiles/javadoc/Javadoc.gmk | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Jan 22 19:30:52 2013 -0500 1.2 +++ b/.hgtags Mon Feb 04 18:08:42 2013 -0500 1.3 @@ -195,3 +195,4 @@ 1.4 51ad2a34342055333eb5f36e2fb514b027895708 jdk8-b71 1.5 c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72 1.6 93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73 1.7 +b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74
2.1 --- a/common/autoconf/generated-configure.sh Tue Jan 22 19:30:52 2013 -0500 2.2 +++ b/common/autoconf/generated-configure.sh Mon Feb 04 18:08:42 2013 -0500 2.3 @@ -3731,7 +3731,7 @@ 2.4 #CUSTOM_AUTOCONF_INCLUDE 2.5 2.6 # Do not change or remove the following line, it is needed for consistency checks: 2.7 -DATE_WHEN_GENERATED=1358901036 2.8 +DATE_WHEN_GENERATED=1359938124 2.9 2.10 ############################################################################### 2.11 # 2.12 @@ -10786,7 +10786,8 @@ 2.13 as_fn_error $? "Milestone must have a value" "$LINENO" 5 2.14 elif test "x$with_milestone" != x; then 2.15 MILESTONE="$with_milestone" 2.16 -else 2.17 +fi 2.18 +if test "x$MILESTONE" = x; then 2.19 MILESTONE=internal 2.20 fi 2.21 2.22 @@ -29255,6 +29256,12 @@ 2.23 fi 2.24 2.25 2.26 +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling 2.27 +# this doesn't make sense so we remove it. 2.28 +if test "x$COMPILE_TYPE" = xcross; then 2.29 + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'` 2.30 +fi 2.31 + 2.32 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then 2.33 2.34 # Print a helpful message on how to acquire the necessary build dependency.
3.1 --- a/common/autoconf/jdk-options.m4 Tue Jan 22 19:30:52 2013 -0500 3.2 +++ b/common/autoconf/jdk-options.m4 Mon Feb 04 18:08:42 2013 -0500 3.3 @@ -389,7 +389,8 @@ 3.4 AC_MSG_ERROR([Milestone must have a value]) 3.5 elif test "x$with_milestone" != x; then 3.6 MILESTONE="$with_milestone" 3.7 -else 3.8 +fi 3.9 +if test "x$MILESTONE" = x; then 3.10 MILESTONE=internal 3.11 fi 3.12
4.1 --- a/common/autoconf/libraries.m4 Tue Jan 22 19:30:52 2013 -0500 4.2 +++ b/common/autoconf/libraries.m4 Mon Feb 04 18:08:42 2013 -0500 4.3 @@ -136,6 +136,12 @@ 4.4 AC_PATH_X 4.5 AC_PATH_XTRA 4.6 4.7 +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling 4.8 +# this doesn't make sense so we remove it. 4.9 +if test "x$COMPILE_TYPE" = xcross; then 4.10 + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[[^ ]]*//g'` 4.11 +fi 4.12 + 4.13 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then 4.14 HELP_MSG_MISSING_DEPENDENCY([x11]) 4.15 AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
5.1 --- a/common/autoconf/spec.gmk.in Tue Jan 22 19:30:52 2013 -0500 5.2 +++ b/common/autoconf/spec.gmk.in Mon Feb 04 18:08:42 2013 -0500 5.3 @@ -434,6 +434,12 @@ 5.4 5.5 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 5.6 5.7 +# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... 5.8 +BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 5.9 +BOOTSTRAP_JAVAC_ARGS:="-Xbootclasspath/p:$(BOOTSTRAP_JAVAC_JAR)" -cp $(BOOTSTRAP_JAVAC_JAR) 5.10 +NEW_JAVAC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javac.Main 5.11 +NEW_JAVADOC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javadoc.Main 5.12 + 5.13 # Base flags for RC 5.14 # Guarding this against resetting value. Legacy make files include spec multiple 5.15 # times.
6.1 --- a/common/bin/compare.sh Tue Jan 22 19:30:52 2013 -0500 6.2 +++ b/common/bin/compare.sh Mon Feb 04 18:08:42 2013 -0500 6.3 @@ -350,9 +350,15 @@ 6.4 OTHER_DIR=$2 6.5 WORK_DIR=$3 6.6 ZIP_FILE=$4 6.7 + # Optionally provide different name for other zipfile 6.8 + OTHER_ZIP_FILE=$5 6.9 6.10 THIS_ZIP=$THIS_DIR/$ZIP_FILE 6.11 - OTHER_ZIP=$OTHER_DIR/$ZIP_FILE 6.12 + if [ -n "$OTHER_ZIP_FILE" ]; then 6.13 + OTHER_ZIP=$OTHER_DIR/$OTHER_ZIP_FILE 6.14 + else 6.15 + OTHER_ZIP=$OTHER_DIR/$ZIP_FILE 6.16 + fi 6.17 6.18 THIS_SUFFIX="${THIS_ZIP##*.}" 6.19 OTHER_SUFFIX="${OTHER_ZIP##*.}" 6.20 @@ -962,6 +968,9 @@ 6.21 echo "[FILTER] List filenames in the image to compare, works for jars, zips, libs and execs" 6.22 echo "Example:" 6.23 echo "bash ./common/bin/compareimages.sh CodePointIM.jar" 6.24 + echo "" 6.25 + echo "-2zips <file1> <file2> Compare two zip files only" 6.26 + echo "" 6.27 exit 10 6.28 fi 6.29 6.30 @@ -1023,6 +1032,13 @@ 6.31 -execs) 6.32 CMP_EXECS=true 6.33 ;; 6.34 + -2zips) 6.35 + CMP_2_ZIPS=true 6.36 + THIS_FILE=$2 6.37 + OTHER_FILE=$3 6.38 + shift 6.39 + shift 6.40 + ;; 6.41 *) 6.42 CMP_NAMES=false 6.43 CMP_PERMS=false 6.44 @@ -1041,6 +1057,18 @@ 6.45 shift 6.46 done 6.47 6.48 +if [ "$CMP_2_ZIPS" = "true" ]; then 6.49 + THIS_DIR="$(dirname $THIS_FILE)" 6.50 + THIS_DIR="$(cd "$THIS_DIR" && pwd )" 6.51 + OTHER_DIR="$(dirname $OTHER_FILE)" 6.52 + OTHER_DIR="$(cd "$OTHER_DIR" && pwd )" 6.53 + THIS_FILE_NAME="$(basename $THIS_FILE)" 6.54 + OTHER_FILE_NAME="$(basename $OTHER_FILE)" 6.55 + echo Comparing $THIS_DIR/$THIS_FILE_NAME and $OTHER_DIR/$OTHER_FILE_NAME 6.56 + compare_zip_file $THIS_DIR $OTHER_DIR $COMPARE_ROOT/2zips $THIS_FILE_NAME $OTHER_FILE_NAME 6.57 + exit 6.58 +fi 6.59 + 6.60 if [ "$CMP_NAMES" = "false" ] && [ "$CMP_TYPES" = "false" ] && [ "$CMP_PERMS" = "false" ] && [ "$CMP_GENERAL" = "false" ] && [ "$CMP_ZIPS" = "false" ] && [ "$CMP_JARS" = "false" ] && [ "$CMP_LIBS" = "false" ] && [ "$CMP_EXECS" = "false" ]; then 6.61 CMP_NAMES=true 6.62 CMP_PERMS=true
7.1 --- a/common/bin/compare_exceptions.sh.incl Tue Jan 22 19:30:52 2013 -0500 7.2 +++ b/common/bin/compare_exceptions.sh.incl Mon Feb 04 18:08:42 2013 -0500 7.3 @@ -887,6 +887,17 @@ 7.4 ./jre/bin/unpack200.exe 7.5 " 7.6 7.7 +# jabswitch.exe is compiled and linked with incremental turned on in the old 7.8 +# build. This makes no sense, so it's turned off in the new build. 7.9 +ACCEPTED_SIZE_DIFF=" 7.10 +./bin/jabswitch.exe 7.11 +./jre/bin/jabswitch.exe 7.12 +" 7.13 +ACCEPTED_DIS_DIFF=" 7.14 +./bin/jabswitch.exe 7.15 +./jre/bin/jabswitch.exe 7.16 +" 7.17 + 7.18 # On windows, there are unavoidable allignment issues making 7.19 # a perfect disasm diff impossible. Filter out the following: 7.20 # * Random parts of C++ symbols (this is a bit greedy, but does the trick)
8.1 --- a/common/makefiles/IdlCompilation.gmk Tue Jan 22 19:30:52 2013 -0500 8.2 +++ b/common/makefiles/IdlCompilation.gmk Mon Feb 04 18:08:42 2013 -0500 8.3 @@ -71,7 +71,7 @@ 8.4 $4 8.5 $(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6) 8.6 $(CP) -rp $3/$$($4_TMPDIR)/* $3 8.7 - ($(CD) $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5) 8.8 + ($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5) 8.9 $(RM) -rf $3/$$($4_TMPDIR) 8.10 endef 8.11
9.1 --- a/common/makefiles/JavaCompilation.gmk Tue Jan 22 19:30:52 2013 -0500 9.2 +++ b/common/makefiles/JavaCompilation.gmk Mon Feb 04 18:08:42 2013 -0500 9.3 @@ -42,8 +42,8 @@ 9.4 FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST 9.5 9.6 define SetupJavaCompiler 9.7 - # param 1 is for example BOOT_JAVAC or NEW_JAVAC 9.8 - # This is the name later used to decide which java compiler to use. 9.9 + # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE 9.10 + # This is the name of the compiler setup. 9.11 # param 2-9 are named args. 9.12 # JVM:=The jvm used to run the javac/javah command 9.13 # JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out 9.14 @@ -487,10 +487,10 @@ 9.15 # Using sjavac to compile. 9.16 $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state 9.17 9.18 - # Create SJAVAC variable, 9.19 - # expects $1_JAVAC to be "bootclasspathprepend -jar ...javac.jar" 9.20 - # and it is rewritten into "bootclasspathprepend com.sun.tools.sjavac.Main" 9.21 - $1_SJAVAC:=$$(word 1,$$($1_JAVAC)) -cp $$(word 3,$$($1_JAVAC)) com.sun.tools.sjavac.Main 9.22 + # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be 9.23 + # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main" 9.24 + # and javac is simply replaced with sjavac. 9.25 + $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC)) 9.26 9.27 # Set the $1_REMOTE to spawn a background javac server. 9.28 $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
10.1 --- a/common/makefiles/Jprt.gmk Tue Jan 22 19:30:52 2013 -0500 10.2 +++ b/common/makefiles/Jprt.gmk Mon Feb 04 18:08:42 2013 -0500 10.3 @@ -150,6 +150,9 @@ 10.4 ifndef JPRT_ARCHIVE_BUNDLE 10.5 JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip 10.6 endif 10.7 +ifndef JPRT_ARCHIVE_INSTALL_BUNDLE 10.8 + JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip 10.9 +endif 10.10 10.11 # These targets execute in a SPEC free context, before calling bridgeBuild 10.12 # to generate the SPEC. 10.13 @@ -188,6 +191,9 @@ 10.14 else 10.15 $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 10.16 $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 10.17 + if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ 10.18 + $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 10.19 + fi 10.20 endif 10.21 @$(call TargetExit) 10.22
11.1 --- a/common/makefiles/javadoc/CORE_PKGS.gmk Tue Jan 22 19:30:52 2013 -0500 11.2 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Mon Feb 04 18:08:42 2013 -0500 11.3 @@ -127,6 +127,11 @@ 11.4 java.sql \ 11.5 java.text \ 11.6 java.text.spi \ 11.7 + java.time \ 11.8 + java.time.temporal \ 11.9 + java.time.calendar \ 11.10 + java.time.format \ 11.11 + java.time.zone \ 11.12 java.util \ 11.13 java.util.concurrent \ 11.14 java.util.concurrent.atomic \
12.1 --- a/common/makefiles/javadoc/Javadoc.gmk Tue Jan 22 19:30:52 2013 -0500 12.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Mon Feb 04 18:08:42 2013 -0500 12.3 @@ -1,4 +1,4 @@ 12.4 -# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 12.5 +# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 12.6 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 12.7 # 12.8 # This code is free software; you can redistribute it and/or modify it 12.9 @@ -46,14 +46,11 @@ 12.10 12.11 BUILD_NUMBER=$(JDK_BUILD_NUMBER) 12.12 12.13 -BOOT_JAVA_CMD=$(JAVA) 12.14 - 12.15 -JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar 12.16 -JAVADOC_CMD = $(BOOT_JAVA_CMD) \ 12.17 +JAVADOC_CMD = $(JAVA) \ 12.18 -Xmx1024m \ 12.19 -Djava.awt.headless=true \ 12.20 - "-Xbootclasspath/p:$(JAVADOC_JAR)" \ 12.21 - -jar $(JAVADOC_JAR) -bootclasspath $(JDK_OUTPUTDIR)/classes 12.22 + $(NEW_JAVADOC) \ 12.23 + -bootclasspath $(JDK_OUTPUTDIR)/classes 12.24 12.25 # Copyright year for beginning of Java and some of the apis 12.26 # (Needed when creating the javadocs) 12.27 @@ -269,6 +266,7 @@ 12.28 -quiet \ 12.29 -use \ 12.30 -keywords \ 12.31 + -Xdoclint:none \ 12.32 -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \ 12.33 $(ADDITIONAL_JAVADOCFLAGS) 12.34
13.1 --- a/make/install-rules.gmk Tue Jan 22 19:30:52 2013 -0500 13.2 +++ b/make/install-rules.gmk Mon Feb 04 18:08:42 2013 -0500 13.3 @@ -96,6 +96,9 @@ 13.4 combo_build: 13.5 @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'` 13.6 $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all 13.7 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all 13.8 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo 13.9 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all 13.10 13.11 install-clobber: 13.12 ifeq ($(BUILD_INSTALL), true)
14.1 --- a/make/jprt.properties Tue Jan 22 19:30:52 2013 -0500 14.2 +++ b/make/jprt.properties Mon Feb 04 18:08:42 2013 -0500 14.3 @@ -92,6 +92,7 @@ 14.4 ${jprt.my.test.target.set:TESTNAME=jdk_text}, \ 14.5 ${jprt.my.test.target.set:TESTNAME=jdk_tools}, \ 14.6 ${jprt.my.test.target.set:TESTNAME=jdk_jfr}, \ 14.7 + ${jprt.my.test.target.set:TESTNAME=jdk_time}, \ 14.8 ${jprt.my.test.target.set:TESTNAME=jdk_other} 14.9 14.10 # All vm test targets (testset=all)
15.1 --- a/test/Makefile Tue Jan 22 19:30:52 2013 -0500 15.2 +++ b/test/Makefile Mon Feb 04 18:08:42 2013 -0500 15.3 @@ -63,7 +63,8 @@ 15.4 jdk_nio \ 15.5 jdk_security1 \ 15.6 jdk_text \ 15.7 - jdk_util 15.8 + jdk_util \ 15.9 + jdk_time 15.10 15.11 # These tests are not part of the default testing list 15.12 JDK_NONDEFAULT_TEST_LIST = \
