@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2015/02/23 13:34:56 tnn Exp $
+$NetBSD: distinfo,v 1.79 2015/03/01 21:44:29 tnn Exp $
 
 SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -101,8 +101,9 @@
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553
 SHA1 (patch-hotspot_src_share_vm_runtime_arguments.cpp) = 797e0382e5d67180757070ae5b76577809f7ad15
 SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b
-SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fe40909864fc561495b1e15a5bc6c7c6373830b2
+SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 7b2b1808dd819b3cd3f84121ddd169421231d98b
 SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e
+SHA1 (patch-hotspot_src_share_vm_utilities_vmError.cpp) = 071f44a1ce8ecc2871067cb9758d481dad4af07d
 SHA1 (patch-jaxp_build.xml) = 3c539e2667a7ba86f1034607b3dc67fe7f14267a
 SHA1 (patch-jaxp_make_Makefile) = 4e65defb4ccd973cc13f343cf5931781c6091d51
 SHA1 (patch-jaxws_build.xml) = 7704357c5a8b9d1a564dc8bd88be2ba7dcd1b0c2

@@ -1,21 +1,37 @@
-$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.3 2014/01/02 01:16:35 ryoon Exp $
+$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.4 2015/03/01 21:44:29 tnn Exp $
 
-SunOS fixes.
-
---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2014-01-01 05:50:08.000000000 +0000
+--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2015-01-26 15:21:49.000000000 +0000
 +++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
-@@ -31,6 +31,10 @@
+@@ -31,6 +31,16 @@
  // globally used constants & types, class (forward)
  // declarations and a few frequently used utility functions.
  
-+#ifdef SOLARIS
-+#include <inttypes.h>
-+#endif // SOLARIS
++#ifndef __STDC_CONSTANT_MACROS
++#define __STDC_CONSTANT_MACROS
++#endif
++#ifndef __STDC_FORMAT_MACROS
++#define __STDC_FORMAT_MACROS
++#endif
++#ifndef __STDC_LIMIT_MACROS
++#define __STDC_LIMIT_MACROS
++#endif
 +
  #include <ctype.h>
  #include <string.h>
  #include <stdarg.h>
-@@ -241,6 +245,7 @@ extern "C" void breakpoint();
+@@ -76,10 +86,7 @@
+ # include <sys/procfs.h>
+ # endif
+ 
+-#if defined(LINUX) || defined(_ALLBSD_SOURCE)
+-#ifndef __STDC_LIMIT_MACROS
+-#define __STDC_LIMIT_MACROS
+-#endif // __STDC_LIMIT_MACROS
++#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS)
+ #include <inttypes.h>
+ #include <signal.h>
+ #ifndef __OpenBSD__
+@@ -241,6 +248,7 @@ extern "C" void breakpoint();
  #define BREAKPOINT ::breakpoint()
  #endif
  
@@ -23,7 +39,7 @@
  // checking for nanness
  #ifdef SOLARIS
  #ifdef SPARC
-@@ -252,6 +257,9 @@ inline int g_isnan(float  f) { return is
+@@ -252,6 +260,9 @@ inline int g_isnan(float  f) { return is
  inline int g_isnan(double f) { return isnand(f); }
  #elif defined(__APPLE__)
  inline int g_isnan(double f) { return isnan(f); }