From 549ec57a3bb8b912f820ab36ad66d1c7a90744b1 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 15 May 2013 07:03:43 +0200
Subject: ZeroVM is built slightly different

so rearrange hunks a bit to apply there too.
---
 debian/patches/kfreebsd-support-hotspot.diff | 31 ++++------------------------
 debian/patches/kfreebsd-support-jdk.diff     | 12 ++++++++++-
 2 files changed, 15 insertions(+), 28 deletions(-)

(limited to 'debian')

diff --git a/debian/patches/kfreebsd-support-hotspot.diff b/debian/patches/kfreebsd-support-hotspot.diff
index 748ad35..4aab86a 100644
--- a/debian/patches/kfreebsd-support-hotspot.diff
+++ b/debian/patches/kfreebsd-support-hotspot.diff
@@ -446,13 +446,16 @@ diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/src/os/linux/vm/
 index 55f52c3..a82f627 100644
 --- openjdk/hotspot/src/os/linux/vm/os_linux.cpp
 +++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
-@@ -113,8 +113,13 @@
+@@ -113,8 +113,16 @@
  # include <semaphore.h>
  # include <fcntl.h>
  # include <string.h>
 +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 +# include <sys/param.h>
 +# include <sys/sysctl.h>
++#ifndef ETIME
++# define ETIME ETIMEDOUT
++#endif
 +#else
  # include <syscall.h>
  # include <sys/sysinfo.h>
@@ -460,17 +463,6 @@ index 55f52c3..a82f627 100644
  # include <gnu/libc-version.h>
  # include <sys/ipc.h>
  # include <sys/shm.h>
-@@ -125,6 +130,10 @@
- 
- #define MAX_PATH    (2 * K)
- 
-+#ifndef ETIME
-+#define ETIME ETIMEDOUT
-+#endif
-+
- // for timer info max values which include all bits
- #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
- 
 @@ -205,11 +214,22 @@ julong os::available_memory() {
  }
  
@@ -900,21 +892,6 @@ index 58ef931..9448389 100644
  #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 @@
diff --git a/debian/patches/kfreebsd-support-jdk.diff b/debian/patches/kfreebsd-support-jdk.diff
index 290e540..af37691 100644
--- a/debian/patches/kfreebsd-support-jdk.diff
+++ b/debian/patches/kfreebsd-support-jdk.diff
@@ -2038,4 +2038,14 @@ index de94820..9b4ff93 100644
 +#elif defined(__linux__) || defined(__FreeBSD_kernel__)
      FILE *fp;
      unsigned long vsize = 0;
- 
+
+--- openjdk/hotspot/src/share/vm/asm/assembler.hpp.orig	2013-05-15 12:05:45.603359758 +0200
++++ openjdk/hotspot/src/share/vm/asm/assembler.hpp	2013-05-15 12:04:40.119540639 +0200
+@@ -25,6 +25,7 @@
+ #ifndef SHARE_VM_ASM_ASSEMBLER_HPP
+ #define SHARE_VM_ASM_ASSEMBLER_HPP
+ 
++#include "utilities/globalDefinitions.hpp"
+ #include "code/oopRecorder.hpp"
+ #include "code/relocInfo.hpp"
+ #include "memory/allocation.hpp"
-- 
cgit v1.2.3