Rototil include order so stdint doesn't get included without the necessary

feature test macros. Should fix "UINTPTR_MAX not declared" error.

3 files changed, 50 insertions, 1 deletions

diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index eb246e23f30..5f9d8172c36 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/02/21 20:24:57 tnn Exp $
+$NetBSD: distinfo,v 1.11 2015/03/01 21:43:50 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337
 RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157
@@ -56,6 +56,8 @@ SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp)
 SHA1 (patch-hotspot_src_os_bsd_vm_osThread__bsd.cpp) = c34887b4bf0873c70a44adaaa9be38614603e1d4
 SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = f38d3ea8002bc8c58d1cf05e70424858dabd2991
 SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = aacb4e03f62f1a6f9b38de39a966c318b70b1293
+SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = fd4a21718b486cd89ec6207fe49b37918ea5f4b8
+SHA1 (patch-hotspot_src_share_vm_utilities_vmError.cpp) = fe64b54a69b0852d346fa5c8db310c43bbc7993d
 SHA1 (patch-jdk_make_CompileLaunchers.gmk) = 76bae0aab5528a6c020d2fdd5ba7c1ffa132aca2
 SHA1 (patch-jdk_make_CreateJars.gmk) = 0f49c8ec33121d7878ea4b6bd06d2e4e4af9a1d5
 SHA1 (patch-jdk_make_GenerateSources.gmk) = ec1b64805afb6edca637d87529b1d3fa59d20828
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
new file mode 100644
index 00000000000..9d12d56ccfa
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp
@@ -0,0 +1,33 @@
+$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.1 2015/03/01 21:43:50 tnn Exp $
+
+--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig	2015-02-02 15:32:37.000000000 +0000
++++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -31,6 +31,16 @@
+ // globally used constants & types, class (forward)
+ // declarations and a few frequently used utility functions.
+ 
++#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>
+@@ -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__
diff --git a/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp
new file mode 100644
index 00000000000..14a2d892f50
--- /dev/null
+++ b/lang/openjdk8/patches/patch-hotspot_src_share_vm_utilities_vmError.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-hotspot_src_share_vm_utilities_vmError.cpp,v 1.1 2015/03/01 21:43:50 tnn Exp $
+
+Don't include system headers before setting feature test macros.
+
+--- hotspot/src/share/vm/utilities/vmError.cpp.orig	2015-02-02 15:32:37.000000000 +0000
++++ hotspot/src/share/vm/utilities/vmError.cpp
+@@ -22,7 +22,6 @@
+  *
+  */
+ 
+-#include <fcntl.h>
+ #include "precompiled.hpp"
+ #include "compiler/compileBroker.hpp"
+ #include "gc_interface/collectedHeap.hpp"