Changeset: 436b4a3231bf
Author:    dcubed
Date:      2011-10-13 09:35 -0700
URL:       http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/436b4a3231bf

7098194: integrate macosx-port changes
Summary: Integrate bsd-port/hotspot and macosx-port/hotspot changes as of 
2011.09.29.
Reviewed-by: kvn, dholmes, never, phh
Contributed-by: Christos Zoulas <chris...@zoulas.com>, Greg Lewis 
<gle...@eyesbeyond.com>, Kurt Miller <k...@intricatesoftware.com>, Alexander 
Strange <astra...@apple.com>, Mike Swingler <swing...@apple.com>, Roger Hoover 
<rhoo...@apple.com>, Victor Hernandez <vhernan...@apple.com>, Pratik Solanki 
<psola...@apple.com>

! .hgignore
+ agent/src/os/bsd/MacosxDebuggerLocal.m
! agent/src/os/bsd/Makefile
! agent/src/os/bsd/symtab.c
! agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
! agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
! make/Makefile
! make/bsd/makefiles/adlc.make
! make/bsd/makefiles/buildtree.make
! make/bsd/makefiles/defs.make
! make/bsd/makefiles/dtrace.make
! make/bsd/makefiles/gcc.make
! make/bsd/makefiles/sa.make
! make/bsd/makefiles/saproc.make
! make/bsd/makefiles/top.make
! make/bsd/makefiles/vm.make
! make/defs.make
- make/templates/bsd-header
! src/cpu/x86/vm/jni_x86.h
+ src/os/bsd/dtrace/generateJvmOffsets.cpp
+ src/os/bsd/dtrace/generateJvmOffsets.h
+ src/os/bsd/dtrace/generateJvmOffsetsMain.c
+ src/os/bsd/dtrace/hotspot.d
+ src/os/bsd/dtrace/hotspot_jni.d
+ src/os/bsd/dtrace/hs_private.d
+ src/os/bsd/dtrace/jhelper.d
+ src/os/bsd/dtrace/jvm_dtrace.c
+ src/os/bsd/dtrace/jvm_dtrace.h
+ src/os/bsd/dtrace/libjvm_db.c
+ src/os/bsd/dtrace/libjvm_db.h
! src/os/bsd/vm/dtraceJSDT_bsd.cpp
! src/os/bsd/vm/jvm_bsd.h
! src/os/bsd/vm/os_bsd.cpp
! src/os/linux/vm/os_linux.cpp
! src/os/solaris/vm/os_solaris.cpp
! src/os/windows/vm/os_windows.cpp
! src/os_cpu/bsd_x86/vm/bsd_x86_32.s
! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
! src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
! src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
! src/share/vm/code/nmethod.cpp
! src/share/vm/compiler/compileBroker.cpp
! src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp
! src/share/vm/gc_implementation/shared/vmGCOperations.cpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/opto/connode.cpp
! src/share/vm/prims/jni.cpp
! src/share/vm/prims/jvm.cpp
! src/share/vm/prims/jvm.h
! src/share/vm/prims/unsafe.cpp
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/java.cpp
! src/share/vm/runtime/objectMonitor.cpp
! src/share/vm/runtime/os.cpp
! src/share/vm/runtime/os.hpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/synchronizer.cpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/thread.hpp
! src/share/vm/runtime/vmThread.cpp
! src/share/vm/services/classLoadingService.cpp
! src/share/vm/services/memoryManager.cpp
! src/share/vm/services/runtimeService.cpp
! src/share/vm/services/threadService.cpp
! src/share/vm/utilities/debug.cpp
! src/share/vm/utilities/dtrace.hpp
+ src/share/vm/utilities/dtrace_usdt2_disabled.hpp
! src/share/vm/utilities/globalDefinitions.hpp
! src/share/vm/utilities/hashtable.cpp

Reply via email to