aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/kfreebsd-support-jdk.diff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2013-05-15 07:03:43 +0200
committerGuido Günther <agx@sigxcpu.org>2013-05-16 18:48:16 +0200
commit549ec57a3bb8b912f820ab36ad66d1c7a90744b1 (patch)
tree6bb3954bda7628a2f9de65f97fd87bb81d69dc1a /debian/patches/kfreebsd-support-jdk.diff
parentd13c08099c8db06cf4fa107b0b867c9cf31e1940 (diff)
ZeroVM is built slightly differentHEADmaster
so rearrange hunks a bit to apply there too.
Diffstat (limited to 'debian/patches/kfreebsd-support-jdk.diff')
-rw-r--r--debian/patches/kfreebsd-support-jdk.diff12
1 files changed, 11 insertions, 1 deletions
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"