From c558d40e79e1a0d9ed3aca3cb2b62f4e1baae0f4 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 13 May 2013 21:16:34 +0200
Subject: Include utilities/globalDefinitions.hpp early

so stdint.h/intypes.h doesn't get included without __STDC_LIMIT_MACROS
set. Otherwise SIZE_MAX stays undefined.
---
 debian/patches/kfreebsd-support-hotspot.diff | 68 ++++++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/debian/patches/kfreebsd-support-hotspot.diff b/debian/patches/kfreebsd-support-hotspot.diff
index 05404b5..dfa103e 100644
--- a/debian/patches/kfreebsd-support-hotspot.diff
+++ b/debian/patches/kfreebsd-support-hotspot.diff
@@ -890,6 +890,68 @@ index 58ef931..9448389 100644
  
    CellTypeState *basicBlockState =
        NEW_RESOURCE_ARRAY(CellTypeState, bbNo * _state_len);
--- 
-1.7.10.4
-
+--- openjdk/hotspot/src/share/vm/ci/ciObject.hpp.orig	2013-05-12 18:20:12.688303624 +0200
++++ openjdk/hotspot/src/share/vm/ci/ciObject.hpp	2013-05-12 18:20:18.500302224 +0200
+@@ -25,6 +25,7 @@
+ #ifndef SHARE_VM_CI_CIOBJECT_HPP
+ #define SHARE_VM_CI_CIOBJECT_HPP
+ 
++#include "utilities/globalDefinitions.hpp"
+ #include "ci/ciClassList.hpp"
+ #include "memory/allocation.hpp"
+ #include "runtime/handles.hpp"
+--- openjdk/hotspot/src/share/vm/precompiled/precompiled.hpp.orig	2013-05-12 19:07:21.809316797 +0200
++++ openjdk/hotspot/src/share/vm/precompiled/precompiled.hpp	2013-05-12 19:07:24.350507077 +0200
+@@ -26,11 +26,11 @@
+ // or if the user passes USE_PRECOMPILED_HEADER=0 to the makefiles.
+ #ifndef DONT_USE_PRECOMPILED_HEADER
+ 
++# include "ci/ciArray.hpp"
+ # include "asm/assembler.hpp"
+ # include "asm/assembler.inline.hpp"
+ # include "asm/codeBuffer.hpp"
+ # include "asm/register.hpp"
+-# include "ci/ciArray.hpp"
+ # include "ci/ciArrayKlass.hpp"
+ # include "ci/ciClassList.hpp"
+ # include "ci/ciConstant.hpp"
+--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp.orig	2013-05-12 23:38:04.815301011 +0200
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	2013-05-12 23:38:13.159314491 +0200
+@@ -22,6 +22,7 @@
+  *
+  */
+ 
++#include "utilities/globalDefinitions.hpp"
+ // no precompiled headers
+ #include "classfile/vmSymbols.hpp"
+ #include "gc_interface/collectedHeap.hpp"
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp.orig	2013-05-13 08:26:02.233299403 +0200
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2013-05-13 08:26:11.662320533 +0200
+@@ -22,6 +22,7 @@
+  *
+  */
+ 
++#include "utilities/globalDefinitions.hpp"
+ // no precompiled headers
+ #include "classfile/classLoader.hpp"
+ #include "classfile/systemDictionary.hpp"
+--- openjdk/hotspot/src/os/linux/vm/osThread_linux.cpp.orig	2013-05-13 10:14:54.977305814 +0200
++++ openjdk/hotspot/src/os/linux/vm/osThread_linux.cpp	2013-05-13 10:15:12.863586024 +0200
+@@ -22,6 +22,7 @@
+  *
+  */
+ 
++#include "utilities/globalDefinitions.hpp"
+ // no precompiled headers
+ #include "runtime/atomic.hpp"
+ #include "runtime/handles.inline.hpp"
+--- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.orig	2013-05-13 11:34:51.322318085 +0200
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2013-05-13 11:35:02.410309395 +0200
+@@ -22,6 +22,7 @@
+  *
+  */
+ 
++#include "utilities/globalDefinitions.hpp"
+ // no precompiled headers
+ #include "assembler_x86.inline.hpp"
+ #include "classfile/classLoader.hpp"
-- 
cgit v1.2.3