[MERGE FOR REVIEW] HotSpot 23.25-b01 Merge

Andrew Hughes gnu.andrew at redhat.com
Thu Sep 12 07:06:03 PDT 2013



Differences that remain between this and jdk7u25-b15 [0]:

* Formatting correction in agent/test/jdi/sagtest.java
* ^webrev/ in .hgignore
* .jcheck/conf settings
* hotspot/make/hotspot_version has JDK_MINOR_VER=6
* hotspot/make/jprt.properties kept at jdk6 (no idea what this is for)
* make/{linux,solaris,windows}/makefiles/rules.make: bootstrap version kept at 5
* src/os/linux/vm/os_linux.cpp: keep old version of get_stack_bounds, reverting 7017193 which causes
  performance regressions and keeping the simpler fix in [1]
* src/os_cpu/linux_x86/vm/os_linux_x86.cpp: keep typo fix (Redhat -> Red Hat)
* src/os_cpu/windows_x86/vm/os_windows_x86.cpp: keep typo fix (execption->exception)
* src/share/vm/gc_implementation/g1/concurrentMark.cpp: keep backport of 7197906
* src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp: Likewise.
* src/share/vm/memory/blockOffsetTable.hpp: Likewise.
* src/share/vm/opto/superword.cpp: keep typo fix (unsafe -> Unsafe)
* src/share/vm/utilities/globalDefinitions.hpp: keep 6933846: GCC 4.5 warning removals
* test/runtime/7110720/Test7110720.sh: keep full license header
* TRADEMARK: seems to not exist in 7 but seems to be no reason to remove it

[0] http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot/rev/40acb370626f
[1] https://java.net/jira/browse/OPENJDK6-3

Let me know if this is ok to push.  I'll look at merging some of these minor typo changes
into 8 if not already present.
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07

More information about the jdk6-dev mailing list