Update SunOS support for recent update.

4 files changed, 47 insertions, 10 deletions

diff --git a/lang/openjdk7/PLIST.SunOS b/lang/openjdk7/PLIST.SunOS
index 786f69041c3..481edf6eb88 100644
--- a/lang/openjdk7/PLIST.SunOS
+++ b/lang/openjdk7/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.2 2013/06/23 17:39:43 jperkin Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.3 2014/01/08 13:09:38 jperkin Exp $
 bin/openjdk7-jar
 bin/openjdk7-java
 bin/openjdk7-javac
@@ -431,7 +431,6 @@ java/openjdk7/jre/lib/${ARCH}/libnet.so
 java/openjdk7/jre/lib/${ARCH}/libnio.so
 java/openjdk7/jre/lib/${ARCH}/libnpt.diz
 java/openjdk7/jre/lib/${ARCH}/libnpt.so
-java/openjdk7/jre/lib/${ARCH}/librmi.so
 java/openjdk7/jre/lib/${ARCH}/libsaproc.diz
 java/openjdk7/jre/lib/${ARCH}/libsaproc.so
 java/openjdk7/jre/lib/${ARCH}/libsctp.so
@@ -486,7 +485,6 @@ java/openjdk7/jre/lib/security/java.policy
 java/openjdk7/jre/lib/security/java.security
 java/openjdk7/jre/lib/security/local_policy.jar
 java/openjdk7/jre/lib/security/sunpkcs11-solaris.cfg
-java/openjdk7/jre/lib/servicetag/jdk_header.png
 java/openjdk7/jre/lib/sound.properties
 java/openjdk7/jre/lib/zi/Africa/Abidjan
 java/openjdk7/jre/lib/zi/Africa/Accra
@@ -730,6 +728,7 @@ java/openjdk7/jre/lib/zi/Asia/Kamchatka
 java/openjdk7/jre/lib/zi/Asia/Karachi
 java/openjdk7/jre/lib/zi/Asia/Kashgar
 java/openjdk7/jre/lib/zi/Asia/Kathmandu
+java/openjdk7/jre/lib/zi/Asia/Khandyga
 java/openjdk7/jre/lib/zi/Asia/Kolkata
 java/openjdk7/jre/lib/zi/Asia/Krasnoyarsk
 java/openjdk7/jre/lib/zi/Asia/Kuala_Lumpur
@@ -768,6 +767,7 @@ java/openjdk7/jre/lib/zi/Asia/Thimphu
 java/openjdk7/jre/lib/zi/Asia/Tokyo
 java/openjdk7/jre/lib/zi/Asia/Ulaanbaatar
 java/openjdk7/jre/lib/zi/Asia/Urumqi
+java/openjdk7/jre/lib/zi/Asia/Ust-Nera
 java/openjdk7/jre/lib/zi/Asia/Vientiane
 java/openjdk7/jre/lib/zi/Asia/Vladivostok
 java/openjdk7/jre/lib/zi/Asia/Yakutsk
@@ -943,6 +943,7 @@ java/openjdk7/jre/lib/zi/SystemV/YST9YDT
 java/openjdk7/jre/lib/zi/WET
 java/openjdk7/jre/lib/zi/ZoneInfoMappings
 java/openjdk7/lib/ct.sym
+java/openjdk7/lib/${ARCH}/jli/libjli.so
 java/openjdk7/lib/ir.idl
 java/openjdk7/lib/jconsole.jar
 java/openjdk7/lib/orb.idl
@@ -971,7 +972,6 @@ java/openjdk7/man/ja_JP.UTF-8/man1/jsadebugd.1
 java/openjdk7/man/ja_JP.UTF-8/man1/jstack.1
 java/openjdk7/man/ja_JP.UTF-8/man1/jstat.1
 java/openjdk7/man/ja_JP.UTF-8/man1/jstatd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jvisualvm.1
 java/openjdk7/man/ja_JP.UTF-8/man1/keytool.1
 java/openjdk7/man/ja_JP.UTF-8/man1/native2ascii.1
 java/openjdk7/man/ja_JP.UTF-8/man1/orbd.1
@@ -1011,7 +1011,6 @@ java/openjdk7/man/man1/jsadebugd.1
 java/openjdk7/man/man1/jstack.1
 java/openjdk7/man/man1/jstat.1
 java/openjdk7/man/man1/jstatd.1
-java/openjdk7/man/man1/jvisualvm.1
 java/openjdk7/man/man1/keytool.1
 java/openjdk7/man/man1/native2ascii.1
 java/openjdk7/man/man1/orbd.1
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 4bdc13df08b..8e4b5ea138d 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2014/01/07 07:27:39 abs Exp $
+$NetBSD: distinfo,v 1.38 2014/01/08 13:09:38 jperkin Exp $
 
 SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253
 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f
@@ -108,7 +108,7 @@ SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849
 SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c
-SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = 3b97d40cd82b807acb45227935f0c7a58fdf7b89
+SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b
 SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666
 SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = da6017447c5537048fcf04198c400f96568dc6e2
@@ -116,6 +116,7 @@ SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9
 SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47
 SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68
 SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2
+SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
 SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b
 SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46
 SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 65fa2d6191311766cdb5d9933d760cae7955f664
diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp
index 5b5bed230cc..f174127ac1a 100644
--- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp
+++ b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp
@@ -1,10 +1,31 @@
-$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp,v 1.2 2014/01/02 01:16:35 ryoon Exp $
+$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp,v 1.3 2014/01/08 13:09:38 jperkin Exp $
 
 GCC support.
 
 --- hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.orig	2014-01-01 05:50:05.000000000 +0000
 +++ hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
-@@ -241,7 +241,22 @@ address os::current_stack_pointer() {
+@@ -235,13 +235,43 @@ frame os::get_sender_for_C_frame(frame*
+   return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
+ }
+ 
++#ifdef AMD64
++#define SPELL_REG_SP "rsp"
++#else
++#define SPELL_REG_SP "esp"
++#endif
++
++#ifdef SPARC_WORKS
+ extern "C" intptr_t *_get_current_sp();  // in .il file
++#else
++#ifdef _GNU_SOURCE
++extern "C" intptr_t *_get_current_sp() {
++  register intptr_t *rsp __asm__ (SPELL_REG_SP);
++  return rsp;
++}
++#endif // _GNU_SOURCE
++#endif // SPARC_WORKS
+ 
+ address os::current_stack_pointer() {
    return (address)_get_current_sp();
  }
  
@@ -27,7 +48,7 @@ GCC support.
  
  frame os::current_frame() {
    intptr_t* fp = _get_current_fp();  // it's inlined so want current fp
-@@ -937,7 +952,12 @@ add_func_t*          os::atomic_add_func
+@@ -937,7 +967,12 @@ add_func_t*          os::atomic_add_func
  extern "C" void _solaris_raw_setup_fpu(address ptr);
  void os::setup_fpu() {
    address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp
new file mode 100644
index 00000000000..32f31e90540
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-hotspot_src_share_vm_utilities_hashtable.cpp,v 1.1 2014/01/08 13:09:38 jperkin Exp $
+
+Delete obsolete (and now harmful) SunOS code.
+
+--- hotspot/src/share/vm/utilities/hashtable.cpp.orig	2014-01-01 05:50:08.000000000 +0000
++++ hotspot/src/share/vm/utilities/hashtable.cpp
+@@ -318,9 +318,6 @@ template class Hashtable<constantPoolOop
+ template class Hashtable<Symbol*, mtSymbol>;
+ template class Hashtable<klassOop, mtClass>;
+ template class Hashtable<oop, mtClass>;
+-#ifdef SOLARIS
+-template class Hashtable<oop, mtSymbol>;
+-#endif
+ template class Hashtable<oopDesc*, mtSymbol>;
+ template class Hashtable<Symbol*, mtClass>;
+ template class HashtableEntry<Symbol*, mtSymbol>;