Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Mon, 04 Feb 2013 17:30:09 -0400
- author
- jlaskey
- date
- Mon, 04 Feb 2013 17:30:09 -0400
- changeset 878
- ecd447139a39
- parent 877
- 3dc55f0c1b6f
- parent 604
- 2a713921952c
- child 879
- 9ed388a04fa7
Merge
| common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jan 28 16:29:34 2013 -0400 1.2 +++ b/.hgtags Mon Feb 04 17:30:09 2013 -0400 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 Mon Jan 28 16:29:34 2013 -0400 2.2 +++ b/common/autoconf/generated-configure.sh Mon Feb 04 17:30:09 2013 -0400 2.3 @@ -2928,6 +2928,32 @@ 2.4 2.5 2.6 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 2.7 + 2.8 +# 2.9 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 2.10 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.11 +# 2.12 +# This code is free software; you can redistribute it and/or modify it 2.13 +# under the terms of the GNU General Public License version 2 only, as 2.14 +# published by the Free Software Foundation. Oracle designates this 2.15 +# particular file as subject to the "Classpath" exception as provided 2.16 +# by Oracle in the LICENSE file that accompanied this code. 2.17 +# 2.18 +# This code is distributed in the hope that it will be useful, but WITHOUT 2.19 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.20 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.21 +# version 2 for more details (a copy is included in the LICENSE file that 2.22 +# accompanied this code). 2.23 +# 2.24 +# You should have received a copy of the GNU General Public License version 2.25 +# 2 along with this work; if not, write to the Free Software Foundation, 2.26 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.27 +# 2.28 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.29 +# or visit www.oracle.com if you need additional information or have any 2.30 +# questions. 2.31 +# 2.32 + 2.33 # 2.34 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 2.35 # 2.36 @@ -3698,7 +3724,7 @@ 2.37 #CUSTOM_AUTOCONF_INCLUDE 2.38 2.39 # Do not change or remove the following line, it is needed for consistency checks: 2.40 -DATE_WHEN_GENERATED=1358165331 2.41 +DATE_WHEN_GENERATED=1359376859 2.42 2.43 ############################################################################### 2.44 #
3.1 --- a/common/autoconf/jdk-options.m4 Mon Jan 28 16:29:34 2013 -0400 3.2 +++ b/common/autoconf/jdk-options.m4 Mon Feb 04 17:30:09 2013 -0400 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 Mon Jan 28 16:29:34 2013 -0400 4.2 +++ b/common/autoconf/libraries.m4 Mon Feb 04 17:30:09 2013 -0400 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/bin/compare_exceptions.sh.incl Mon Jan 28 16:29:34 2013 -0400 5.2 +++ b/common/bin/compare_exceptions.sh.incl Mon Feb 04 17:30:09 2013 -0400 5.3 @@ -887,6 +887,17 @@ 5.4 ./jre/bin/unpack200.exe 5.5 " 5.6 5.7 +# jabswitch.exe is compiled and linked with incremental turned on in the old 5.8 +# build. This makes no sense, so it's turned off in the new build. 5.9 +ACCEPTED_SIZE_DIFF=" 5.10 +./bin/jabswitch.exe 5.11 +./jre/bin/jabswitch.exe 5.12 +" 5.13 +ACCEPTED_DIS_DIFF=" 5.14 +./bin/jabswitch.exe 5.15 +./jre/bin/jabswitch.exe 5.16 +" 5.17 + 5.18 # On windows, there are unavoidable allignment issues making 5.19 # a perfect disasm diff impossible. Filter out the following: 5.20 # * Random parts of C++ symbols (this is a bit greedy, but does the trick)
6.1 --- a/common/makefiles/Jprt.gmk Mon Jan 28 16:29:34 2013 -0400 6.2 +++ b/common/makefiles/Jprt.gmk Mon Feb 04 17:30:09 2013 -0400 6.3 @@ -43,24 +43,20 @@ 6.4 6.5 BUILD_DIR_ROOT:=$(root_dir)/build 6.6 6.7 -# Appears to be an open build 6.8 -OPEN_BUILD := \ 6.9 -$(shell \ 6.10 - if [ -d $(root_dir)/jdk/src/closed \ 6.11 - -o -d $(root_dir)/jdk/make/closed \ 6.12 - -o -d $(root_dir)/jdk/test/closed \ 6.13 - -o -d $(root_dir)/hotspot/src/closed \ 6.14 - -o -d $(root_dir)/hotspot/make/closed \ 6.15 - -o -d $(root_dir)/hotspot/test/closed ] ; then \ 6.16 - echo "false"; \ 6.17 - else \ 6.18 - echo "true"; \ 6.19 - fi \ 6.20 - ) 6.21 ifdef OPENJDK 6.22 OPEN_BUILD=true 6.23 +else 6.24 + OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \ 6.25 + $(wildcard $(root_dir)/jdk/make/closed), \ 6.26 + $(wildcard $(root_dir)/jdk/test/closed), \ 6.27 + $(wildcard $(root_dir)/hotspot/src/closed), \ 6.28 + $(wildcard $(root_dir)/hotspot/make/closed), \ 6.29 + $(wildcard $(root_dir)/hotspot/test/closed)), \ 6.30 + false,true) 6.31 endif 6.32 6.33 +HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false) 6.34 + 6.35 ########################################################################### 6.36 # To help in adoption of the new configure&&make build process, a bridge 6.37 # build will use the old settings to run configure and do the build. 6.38 @@ -103,6 +99,11 @@ 6.39 ifdef ALT_FREETYPE_HEADERS_PATH 6.40 @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp 6.41 endif 6.42 +ifeq ($(HOTSPOT_AVAILABLE),false) 6.43 + ifdef ALT_JDK_IMPORT_PATH 6.44 + @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp 6.45 + endif 6.46 +endif 6.47 ifeq ($(OPEN_BUILD),true) 6.48 @$(ECHO) " --enable-openjdk-only " >> $@.tmp 6.49 else 6.50 @@ -128,6 +129,9 @@ 6.51 ifdef ALT_SLASH_JAVA 6.52 @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp 6.53 endif 6.54 + ifdef ALT_SPARKLE_FRAMEWORK_DIR 6.55 + @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp 6.56 + endif 6.57 endif 6.58 @if [ -f $@ ] ; then \ 6.59 if ! $(CMP) $@ $@.tmp > /dev/null ; then \ 6.60 @@ -146,6 +150,9 @@ 6.61 ifndef JPRT_ARCHIVE_BUNDLE 6.62 JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip 6.63 endif 6.64 +ifndef JPRT_ARCHIVE_INSTALL_BUNDLE 6.65 + JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip 6.66 +endif 6.67 6.68 # These targets execute in a SPEC free context, before calling bridgeBuild 6.69 # to generate the SPEC. 6.70 @@ -184,6 +191,9 @@ 6.71 else 6.72 $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 6.73 $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 6.74 + if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ 6.75 + $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 6.76 + fi 6.77 endif 6.78 @$(call TargetExit) 6.79
7.1 --- a/make/install-rules.gmk Mon Jan 28 16:29:34 2013 -0400 7.2 +++ b/make/install-rules.gmk Mon Feb 04 17:30:09 2013 -0400 7.3 @@ -96,6 +96,9 @@ 7.4 combo_build: 7.5 @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'` 7.6 $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all 7.7 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all 7.8 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo 7.9 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all 7.10 7.11 install-clobber: 7.12 ifeq ($(BUILD_INSTALL), true)
