hg: jdk6/jdk6/hotspot: 2 new changesets

[abhi.saha at oracle.com]

Changeset: f6b8cfca1b53
Author:    kamg
Date:      2011-03-24 14:42 -0400
URL:       http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/f6b8cfca1b53

7020373: JSR rewriting can overflow memory address size variables
Summary: Abort if incoming classfile's parameters would cause overflows
Reviewed-by: coleenp, dcubed, never

! src/share/vm/oops/generateOopMap.cpp
+ test/runtime/7020373/Test7020373.sh

Changeset: 9b013e207574
Author:    asaha
Date:      2011-05-10 10:46 -0700
URL:       http://hg.openjdk.java.net/jdk6/jdk6/hotspot/rev/9b013e207574

Merge

- make/linux/makefiles/makedeps.make
- make/solaris/makefiles/makedeps.make
- make/windows/README
- make/windows/makefiles/makedeps.make
- src/os/linux/launcher/java.c
- src/os/linux/launcher/java.h
- src/os/linux/launcher/java_md.c
- src/os/linux/launcher/java_md.h
- src/os/linux/vm/hpi_linux.cpp
- src/os/linux/vm/hpi_linux.hpp
- src/os/linux/vm/objectMonitor_linux.cpp
- src/os/linux/vm/objectMonitor_linux.hpp
- src/os/linux/vm/objectMonitor_linux.inline.hpp
- src/os/solaris/launcher/java.c
- src/os/solaris/launcher/java.h
- src/os/solaris/launcher/java_md.c
- src/os/solaris/launcher/java_md.h
- src/os/solaris/vm/hpi_solaris.cpp
- src/os/solaris/vm/hpi_solaris.hpp
- src/os/solaris/vm/objectMonitor_solaris.cpp
- src/os/solaris/vm/objectMonitor_solaris.hpp
- src/os/solaris/vm/objectMonitor_solaris.inline.hpp
- src/os/windows/vm/hpi_windows.cpp
- src/os/windows/vm/hpi_windows.hpp
- src/os/windows/vm/objectMonitor_windows.cpp
- src/os/windows/vm/objectMonitor_windows.hpp
- src/os/windows/vm/objectMonitor_windows.inline.hpp
- src/share/tools/MakeDeps/ArgsParser.java
- src/share/tools/MakeDeps/BuildConfig.java
- src/share/tools/MakeDeps/Database.java
- src/share/tools/MakeDeps/DirectoryTree.java
- src/share/tools/MakeDeps/DirectoryTreeNode.java
- src/share/tools/MakeDeps/FileFormatException.java
- src/share/tools/MakeDeps/FileList.java
- src/share/tools/MakeDeps/FileName.java
- src/share/tools/MakeDeps/Macro.java
- src/share/tools/MakeDeps/MacroDefinitions.java
- src/share/tools/MakeDeps/MakeDeps.java
- src/share/tools/MakeDeps/MetroWerksMacPlatform.java
- src/share/tools/MakeDeps/Platform.java
- src/share/tools/MakeDeps/UnixPlatform.java
- src/share/tools/MakeDeps/Util.java
- src/share/tools/MakeDeps/WinGammaPlatform.java
- src/share/tools/MakeDeps/WinGammaPlatformVC6.java
- src/share/tools/MakeDeps/WinGammaPlatformVC7.java
- src/share/tools/MakeDeps/WinGammaPlatformVC8.java
- src/share/tools/MakeDeps/WinGammaPlatformVC9.java
- src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
- src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
- src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep
- src/share/vm/gc_implementation/includeDB_gc_g1
- src/share/vm/gc_implementation/includeDB_gc_parNew
- src/share/vm/gc_implementation/includeDB_gc_parallelScavenge
- src/share/vm/gc_implementation/includeDB_gc_serial
- src/share/vm/gc_implementation/includeDB_gc_shared
- src/share/vm/includeDB_compiler1
- src/share/vm/includeDB_compiler2
- src/share/vm/includeDB_core
- src/share/vm/includeDB_features
- src/share/vm/includeDB_gc
- src/share/vm/includeDB_gc_parallel
- src/share/vm/includeDB_jvmti
- src/share/vm/includeDB_shark
- src/share/vm/includeDB_zero
! src/share/vm/oops/generateOopMap.cpp
- src/share/vm/prims/hpi_imported.h
- src/share/vm/runtime/hpi.cpp
- src/share/vm/runtime/hpi.hpp