Add SunOS/GCC support. With huge thanks to "jesse" from #SmartOS who did the

bulk of the porting work.  Tested on SmartOS 32-bit.  64-bit builds currently
fail, they should hopefully be fixed soon.

1 files changed, 124 insertions, 0 deletions

diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp
new file mode 100644
index 00000000000..70ed1cd8d30
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp
@@ -0,0 +1,124 @@
+$NetBSD: patch-hotspot_src_os_solaris_vm_os__solaris.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $
+
+Misc SunOS casts.
+
+--- hotspot/src/os/solaris/vm/os_solaris.cpp.orig	2012-08-10 16:24:27.000000000 +0000
++++ hotspot/src/os/solaris/vm/os_solaris.cpp
+@@ -630,7 +630,7 @@ static bool assign_distribution(processo
+   const processorid_t limit_id = max_id + 1;
+   // Make up markers for available processors.
+   bool* available_id = NEW_C_HEAP_ARRAY(bool, limit_id);
+-  for (uint c = 0; c < limit_id; c += 1) {
++  for (processorid_t c = 0; c < limit_id; c += 1) {
+     available_id[c] = false;
+   }
+   for (uint a = 0; a < id_length; a += 1) {
+@@ -653,7 +653,7 @@ static bool assign_distribution(processo
+     // ... find the next available processor in the board.
+     for (uint slot = 0; slot < processors_per_board; slot += 1) {
+       uint try_id = board * processors_per_board + slot;
+-      if ((try_id < limit_id) && (available_id[try_id] == true)) {
++      if ((try_id < (uint)limit_id) && (available_id[try_id] == true)) {
+         distribution[assigned] = try_id;
+         available_id[try_id] = false;
+         assigned += 1;
+@@ -661,7 +661,7 @@ static bool assign_distribution(processo
+       }
+     }
+     board += 1;
+-    if (board * processors_per_board + 0 >= limit_id) {
++    if (board * processors_per_board + 0 >= (uint)limit_id) {
+       board = 0;
+     }
+   }
+@@ -718,7 +718,7 @@ bool os::bind_to_processor(uint processo
+ bool os::getenv(const char* name, char* buffer, int len) {
+   char* val = ::getenv( name );
+   if ( val == NULL
+-  ||   strlen(val) + 1  >  len ) {
++  ||   strlen(val) + 1  >  (size_t)len ) {
+     if (len > 0)  buffer[0] = 0; // return a null string
+     return false;
+   }
+@@ -925,7 +925,7 @@ void os::init_system_properties_values()
+         strcpy(library_path, common_path);
+       } else {
+         int inserted = 0;
+-        for (i = 0; i < info->dls_cnt; i++, path++) {
++        for (i = 0; (uint_t)i < info->dls_cnt; i++, path++) {
+           uint_t flags = path->dls_flags & LA_SER_MASK;
+           if (((flags & LA_SER_LIBPATH) == 0) && !inserted) {
+             strcat(library_path, common_path);
+@@ -1059,7 +1059,8 @@ extern "C" void* java_start(void* thread
+   // in java_to_os_priority. So we save the native priority
+   // in the osThread and recall it here.
+ 
+-  if ( osthr->thread_id() != -1 ) {
++  // thread_id_t ("osThread_solaris.hpp") == thread_t (<thread.h>) == unsigned int
++  if ( osthr->thread_id() != (unsigned int)-1 ) {
+     if ( UseThreadPriorities ) {
+       int prio = osthr->native_priority();
+       if (ThreadPriorityVerbose) {
+@@ -2855,7 +2856,7 @@ void os::numa_make_global(char *addr, si
+ // Get the number of the locality groups.
+ size_t os::numa_get_groups_num() {
+   size_t n = Solaris::lgrp_nlgrps(Solaris::lgrp_cookie());
+-  return n != -1 ? n : 1;
++  return n != (size_t) -1 ? n : 1;
+ }
+ 
+ // Get a list of leaf locality groups. A leaf lgroup is group that
+@@ -2867,7 +2868,7 @@ size_t os::numa_get_leaf_groups(int *ids
+      return 1;
+    }
+    int result_size = 0, top = 1, bottom = 0, cur = 0;
+-   for (int k = 0; k < size; k++) {
++   for (size_t k = 0; k < size; k++) {
+      int r = Solaris::lgrp_children(Solaris::lgrp_cookie(), ids[cur],
+                                     (Solaris::lgrp_id_t*)&ids[top], size - top);
+      if (r == -1) {
+@@ -2987,7 +2988,7 @@ char *os::scan_pages(char *start, char*
+           }
+ 
+         if ((validity[i] & 2) != 0 && page_expected->lgrp_id > 0) {
+-          if (outdata[types * i] != page_expected->lgrp_id) {
++          if (outdata[types * i] != (uint64_t)page_expected->lgrp_id) {
+             break;
+           }
+         }
+@@ -4714,7 +4715,7 @@ const char * signames[] = {
+ const char* os::exception_name(int exception_code, char* buf, size_t size) {
+   if (0 < exception_code && exception_code <= SIGRTMAX) {
+     // signal
+-    if (exception_code < sizeof(signames)/sizeof(const char*)) {
++    if ((size_t)exception_code < sizeof(signames)/sizeof(const char*)) {
+        jio_snprintf(buf, size, "%s", signames[exception_code]);
+     } else {
+        jio_snprintf(buf, size, "SIG%d", exception_code);
+@@ -5051,7 +5052,7 @@ void os::init(void) {
+   // If the pagesize of the VM is greater than 8K determine the appropriate
+   // number of initial guard pages.  The user can change this with the
+   // command line arguments, if needed.
+-  if (vm_page_size() > 8*K) {
++  if ((size_t)vm_page_size() > 8*K) {
+     StackYellowPages = 1;
+     StackRedPages = 1;
+     StackShadowPages = round_to((StackShadowPages*8*K), vm_page_size()) / vm_page_size();
+@@ -5072,7 +5073,7 @@ jint os::init_2(void) {
+ 
+   // Allocate a single page and mark it as readable for safepoint polling.  Also
+   // use this first mmap call to check support for MAP_ALIGN.
+-  address polling_page = (address)Solaris::mmap_chunk((char*)page_size,
++  address polling_page = (address)Solaris::mmap_chunk((char*)(uintptr_t)page_size,
+                                                       page_size,
+                                                       MAP_PRIVATE | MAP_ALIGN,
+                                                       PROT_READ);
+@@ -5126,7 +5127,7 @@ jint os::init_2(void) {
+   // stack on a power of 2 boundary.  The real fix for this
+   // should be to fix the guard page mechanism.
+ 
+-  if (vm_page_size() > 8*K) {
++  if ((size_t)vm_page_size() > 8*K) {
+       threadStackSizeInBytes = (threadStackSizeInBytes != 0)
+          ? threadStackSizeInBytes +
+            ((StackYellowPages + StackRedPages) * vm_page_size())