Mercurial > hg > fedora
view java-1.7.0-icedtea-win32.patch @ 56:1f400b0db89c default tip
updated readme
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Thu, 30 Aug 2007 14:41:30 -0400 |
parents | 32c44002d507 |
children |
line wrap: on
line source
--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java.orig 2007-08-27 16:27:50.000000000 -0400 +++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2007-08-27 16:28:43.000000000 -0400 @@ -31,8 +31,6 @@ import sun.jvm.hotspot.debugger.dbx.*; import sun.jvm.hotspot.debugger.proc.*; import sun.jvm.hotspot.debugger.remote.*; -import sun.jvm.hotspot.debugger.win32.*; -import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.oops.*; @@ -333,8 +331,6 @@ if (os.equals("solaris")) { setupDebuggerSolaris(); - } else if (os.equals("win32")) { - setupDebuggerWin32(); } else if (os.equals("linux")) { setupDebuggerLinux(); } else { @@ -384,10 +380,6 @@ db = new HotSpotTypeDataBase(machDesc, new HotSpotSolarisVtblAccess(debugger, jvmLibNames), debugger, jvmLibNames); - } else if (os.equals("win32")) { - db = new HotSpotTypeDataBase(machDesc, - new Win32VtblAccess(debugger, jvmLibNames), - debugger, jvmLibNames); } else if (os.equals("linux")) { db = new HotSpotTypeDataBase(machDesc, new LinuxVtblAccess(debugger, jvmLibNames), @@ -553,8 +545,6 @@ os = debugger.getOS(); if (os.equals("solaris")) { setupJVMLibNamesSolaris(); - } else if (os.equals("win32")) { - setupJVMLibNamesWin32(); } else if (os.equals("linux")) { setupJVMLibNamesLinux(); } else { @@ -569,42 +559,6 @@ } // - // Win32 - // - - private void setupDebuggerWin32() { - setupJVMLibNamesWin32(); - - if (cpu.equals("x86")) { - machDesc = new MachineDescriptionIntelX86(); - } else if (cpu.equals("amd64")) { - machDesc = new MachineDescriptionAMD64(); - } else if (cpu.equals("ia64")) { - machDesc = new MachineDescriptionIA64(); - } else { - throw new DebuggerException("Win32 supported under x86, amd64 and ia64 only"); - } - - // Note we do not use a cache for the local debugger in server - // mode; it will be taken care of on the client side (once remote - // debugging is implemented). - - if (System.getProperty("sun.jvm.hotspot.debugger.useWindbgDebugger") != null) { - debugger = new WindbgDebuggerLocal(machDesc, !isServer); - } else { - debugger = new Win32DebuggerLocal(machDesc, !isServer); - } - - attachDebugger(); - - // FIXME: add support for server mode - } - - private void setupJVMLibNamesWin32() { - jvmLibNames = new String[] { "jvm.dll", "jvm_g.dll" }; - } - - // // Linux // --- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java.orig 2007-08-27 16:30:06.000000000 -0400 +++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2007-08-27 16:30:58.000000000 -0400 @@ -32,8 +32,6 @@ import sun.jvm.hotspot.debugger.dbx.*; import sun.jvm.hotspot.debugger.proc.*; import sun.jvm.hotspot.debugger.cdbg.*; -import sun.jvm.hotspot.debugger.win32.*; -import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; import sun.jvm.hotspot.debugger.sparc.*; import sun.jvm.hotspot.debugger.remote.*; @@ -512,8 +510,6 @@ if (os.equals("solaris")) { setupDebuggerSolaris(); - } else if (os.equals("win32")) { - setupDebuggerWin32(); } else if (os.equals("linux")) { setupDebuggerLinux(); } else { @@ -561,9 +557,6 @@ if (os.equals("solaris")) { db = new HotSpotTypeDataBase(machDesc, new HotSpotSolarisVtblAccess(debugger, jvmLibNames), debugger, jvmLibNames); - } else if (os.equals("win32")) { - db = new HotSpotTypeDataBase(machDesc, new Win32VtblAccess(debugger, jvmLibNames), - debugger, jvmLibNames); } else if (os.equals("linux")) { db = new HotSpotTypeDataBase(machDesc, new LinuxVtblAccess(debugger, jvmLibNames), debugger, jvmLibNames); @@ -735,8 +728,6 @@ os = debugger.getOS(); if (os.equals("solaris")) { setupJVMLibNamesSolaris(); - } else if (os.equals("win32")) { - setupJVMLibNamesWin32(); } else if (os.equals("linux")) { setupJVMLibNamesLinux(); } else { @@ -752,41 +743,6 @@ } // - // Win32 - // - - private void setupDebuggerWin32() { - setupJVMLibNamesWin32(); - - if (cpu.equals("x86")) { - machDesc = new MachineDescriptionIntelX86(); - } else if (cpu.equals("amd64")) { - machDesc = new MachineDescriptionAMD64(); - } else if (cpu.equals("ia64")) { - machDesc = new MachineDescriptionIA64(); - } else { - throw new DebuggerException("Win32 supported under x86, amd64 and ia64 only"); - } - - // Note we do not use a cache for the local debugger in server - // mode; it will be taken care of on the client side (once remote - // debugging is implemented). - - if (System.getProperty("sun.jvm.hotspot.debugger.useWindbgDebugger") != null) { - debugger = new WindbgDebuggerLocal(machDesc, !isServer); - } else { - debugger = new Win32DebuggerLocal(machDesc, !isServer); - } - - attachDebugger(); - } - - private void setupJVMLibNamesWin32() { - jvmLibNames = new String[] { "jvm.dll", "jvm_g.dll" }; - saLibNames = new String[] { "sa.dll", "sa_g.dll" }; - } - - // // Linux // --- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java.orig 2007-08-27 16:33:03.000000000 -0400 +++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2007-08-27 16:33:28.000000000 -0400 @@ -30,9 +30,6 @@ import sun.jvm.hotspot.runtime.solaris_sparc.SolarisSPARCJavaThreadPDAccess; import sun.jvm.hotspot.runtime.solaris_x86.SolarisX86JavaThreadPDAccess; import sun.jvm.hotspot.runtime.solaris_amd64.SolarisAMD64JavaThreadPDAccess; -import sun.jvm.hotspot.runtime.win32_amd64.Win32AMD64JavaThreadPDAccess; -import sun.jvm.hotspot.runtime.win32_x86.Win32X86JavaThreadPDAccess; -import sun.jvm.hotspot.runtime.win32_ia64.Win32IA64JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_x86.LinuxX86JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess; @@ -72,14 +69,6 @@ } else if (cpu.equals("amd64")) { access = new SolarisAMD64JavaThreadPDAccess(); } - } else if (os.equals("win32")) { - if (cpu.equals("x86")) { - access = new Win32X86JavaThreadPDAccess(); - } else if (cpu.equals("amd64")) { - access = new Win32AMD64JavaThreadPDAccess(); - } else if (cpu.equals("ia64")) { - access = new Win32IA64JavaThreadPDAccess(); - } } else if (os.equals("linux")) { if (cpu.equals("x86")) { access = new LinuxX86JavaThreadPDAccess();