# HG changeset patch # User henryjen # Date 1383766431 28800 # Node ID bb31481efc2a8e3ff3130accb4af775e01071278 # Parent 4f2011496393a26dcfd7b1f7787a3673ddd32599# Parent fb58db41d533aa46781a1e9d99c866059b79ecbe Merge diff -r 4f2011496393 -r bb31481efc2a .hgignore --- a/.hgignore Mon Oct 28 16:02:32 2013 -0700 +++ b/.hgignore Wed Nov 06 11:33:51 2013 -0800 @@ -5,3 +5,6 @@ ^.hgtip ^.bridge2 .DS_Store +hotspot.log +^JTreport +^JTwork diff -r 4f2011496393 -r bb31481efc2a .hgtags --- a/.hgtags Mon Oct 28 16:02:32 2013 -0700 +++ b/.hgtags Wed Nov 06 11:33:51 2013 -0800 @@ -167,16 +167,20 @@ 661c9aae602bbd9766d12590800c90f1edd1d8dd jdk8-b43 e4f81a817447c3a4f6868f083c81c2fb1b15d44c jdk8-b44 633f2378c904c92bb922a6e19e9f62fe8eac14af jdk8-b45 +f3fc96a9b243322ad5d058911162189e3ded0e96 lambda-b45 27fa766a2298ba8347dc198f0cf85ba6618e17db jdk8-b46 1dcb4b7b9373e64e135c12fe1f8699f1f80e51e8 jdk8-b47 3f6c72d1c2a6e5c9e7d81c3dc984886678a128ad jdk8-b48 +f219811ab95916fc381a69410121e63cd6270f36 lambda-b48 c97b99424815c43818e3cc3ffcdd1a60f3198b52 jdk8-b49 2fd67618b9a3c847780ed7b9d228e862b6e2824c jdk8-b50 +cc5ead46ec895e756cb62ada8c1650f1cf6daa2a lambda-b50 57c0aee7309050b9d6cfcbd202dc704e9260b377 jdk8-b51 8d24def5ceb3b8f2e857f2e18b2804fc59eecf8d jdk8-b52 febd7ff5280067ca482faaeb9418ae88764c1a35 jdk8-b53 c1a277c6022affbc6855bdfb039511e73fbe2395 jdk8-b54 b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55 +115a29d4c47520c4d9d684c321a60803903080bb lambda-b56 76844579fa4b30929731115b237e477181a82394 jdk8-b56 522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57 9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58 diff -r 4f2011496393 -r bb31481efc2a .jcheck/conf --- a/.jcheck/conf Mon Oct 28 16:02:32 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -project=jdk8 diff -r 4f2011496393 -r bb31481efc2a ASSEMBLY_EXCEPTION diff -r 4f2011496393 -r bb31481efc2a LICENSE diff -r 4f2011496393 -r bb31481efc2a Makefile diff -r 4f2011496393 -r bb31481efc2a README diff -r 4f2011496393 -r bb31481efc2a README-builds.html diff -r 4f2011496393 -r bb31481efc2a THIRD_PARTY_README diff -r 4f2011496393 -r bb31481efc2a common/autoconf/Makefile.in diff -r 4f2011496393 -r bb31481efc2a common/autoconf/autogen.sh diff -r 4f2011496393 -r bb31481efc2a common/autoconf/build-aux/config.guess diff -r 4f2011496393 -r bb31481efc2a common/autoconf/build-aux/config.sub diff -r 4f2011496393 -r bb31481efc2a common/autoconf/build-aux/install.sh diff -r 4f2011496393 -r bb31481efc2a common/autoconf/build-aux/pkg.m4 diff -r 4f2011496393 -r bb31481efc2a common/autoconf/builddeps.conf.example diff -r 4f2011496393 -r bb31481efc2a common/autoconf/builddeps.conf.nfs.example diff -r 4f2011496393 -r bb31481efc2a common/autoconf/builddeps.m4 diff -r 4f2011496393 -r bb31481efc2a common/autoconf/config.h.in diff -r 4f2011496393 -r bb31481efc2a common/autoconf/configure diff -r 4f2011496393 -r bb31481efc2a common/autoconf/configure.ac diff -r 4f2011496393 -r bb31481efc2a common/autoconf/generated-configure.sh diff -r 4f2011496393 -r bb31481efc2a common/autoconf/help.m4 diff -r 4f2011496393 -r bb31481efc2a common/autoconf/platform.m4 diff -r 4f2011496393 -r bb31481efc2a common/autoconf/spec.gmk.in diff -r 4f2011496393 -r bb31481efc2a common/bin/hgforest.sh diff -r 4f2011496393 -r bb31481efc2a common/bin/hide_important_warnings_from_javac.sh diff -r 4f2011496393 -r bb31481efc2a common/bin/logger.sh diff -r 4f2011496393 -r bb31481efc2a common/makefiles/IdlCompilation.gmk diff -r 4f2011496393 -r bb31481efc2a common/makefiles/JavaCompilation.gmk diff -r 4f2011496393 -r bb31481efc2a common/makefiles/Main.gmk diff -r 4f2011496393 -r bb31481efc2a common/makefiles/MakeBase.gmk diff -r 4f2011496393 -r bb31481efc2a common/makefiles/Makefile diff -r 4f2011496393 -r bb31481efc2a common/makefiles/NativeCompilation.gmk diff -r 4f2011496393 -r bb31481efc2a common/makefiles/javadoc/CORE_PKGS.gmk --- a/common/makefiles/javadoc/CORE_PKGS.gmk Mon Oct 28 16:02:32 2013 -0700 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Wed Nov 06 11:33:51 2013 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff -r 4f2011496393 -r bb31481efc2a common/makefiles/javadoc/Javadoc.gmk diff -r 4f2011496393 -r bb31481efc2a get_source.sh diff -r 4f2011496393 -r bb31481efc2a make/Defs-internal.gmk diff -r 4f2011496393 -r bb31481efc2a make/README.pre-components diff -r 4f2011496393 -r bb31481efc2a make/corba-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/deploy-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/hotspot-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/install-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/jaxp-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/jaxws-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/jdk-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/jprt.gmk diff -r 4f2011496393 -r bb31481efc2a make/jprt.properties diff -r 4f2011496393 -r bb31481efc2a make/langtools-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/sanity-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/scripts/hgforest.sh diff -r 4f2011496393 -r bb31481efc2a make/scripts/normalizer.pl diff -r 4f2011496393 -r bb31481efc2a make/scripts/update_copyright_year.sh diff -r 4f2011496393 -r bb31481efc2a make/scripts/vsvars.sh diff -r 4f2011496393 -r bb31481efc2a make/scripts/webrev.ksh diff -r 4f2011496393 -r bb31481efc2a make/sponsors-rules.gmk diff -r 4f2011496393 -r bb31481efc2a make/templates/bsd-header diff -r 4f2011496393 -r bb31481efc2a make/templates/gpl-cp-header diff -r 4f2011496393 -r bb31481efc2a make/templates/gpl-header diff -r 4f2011496393 -r bb31481efc2a test/Makefile