aboutsummaryrefslogtreecommitdiffstats
path: root/java/jdk16
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2007-08-17 02:50:38 +0800
committerjkim <jkim@FreeBSD.org>2007-08-17 02:50:38 +0800
commit4dfb5c012ac92bd487fb7ae2570bb344a91c3b36 (patch)
treef0973389d16ddf9a0d1ed2d7ac03291ba8f2ebd8 /java/jdk16
parent41b9fec7d5b69df1b323ad481c0873ab99faaa77 (diff)
downloadfreebsd-ports-gnome-4dfb5c012ac92bd487fb7ae2570bb344a91c3b36.tar.gz
freebsd-ports-gnome-4dfb5c012ac92bd487fb7ae2570bb344a91c3b36.tar.zst
freebsd-ports-gnome-4dfb5c012ac92bd487fb7ae2570bb344a91c3b36.zip
Unbreak build on -CURRENT.
Approved by: glewis (maintainer)
Diffstat (limited to 'java/jdk16')
-rw-r--r--java/jdk16/files/patch-hotspot-vm-escape.cpp27
-rw-r--r--java/jdk16/files/patch-hotspot-vm-jvm_bsd.cpp13
-rw-r--r--java/jdk16/files/patch-hotspot-vm-vmError_bsd.cpp11
3 files changed, 51 insertions, 0 deletions
diff --git a/java/jdk16/files/patch-hotspot-vm-escape.cpp b/java/jdk16/files/patch-hotspot-vm-escape.cpp
new file mode 100644
index 000000000000..cf7776d02ae7
--- /dev/null
+++ b/java/jdk16/files/patch-hotspot-vm-escape.cpp
@@ -0,0 +1,27 @@
+--- ../../hotspot/src/share/vm/opto/escape.cpp 21 Jul 2006 17:22:54 -0000 1.1.1.2
++++ ../../hotspot/src/share/vm/opto/escape.cpp 9 Aug 2007 16:24:59 -0000 1.3
+@@ -35,21 +35,21 @@
+ }
+
+ #ifndef PRODUCT
+-static char *node_type_names[] = {
++static const char *node_type_names[] = {
+ "UnknownType",
+ "JavaObject",
+ "LocalVar",
+ "Field"
+ };
+
+-static char *esc_names[] = {
++static const char *esc_names[] = {
+ "UnknownEscape",
+ "NoEscape ",
+ "ArgEscape ",
+ "GlobalEscape "
+ };
+
+-static char *edge_type_suffix[] = {
++static const char *edge_type_suffix[] = {
+ "?", // UnknownEdge
+ "P", // PointsToEdge
+ "D", // DeferredEdge
diff --git a/java/jdk16/files/patch-hotspot-vm-jvm_bsd.cpp b/java/jdk16/files/patch-hotspot-vm-jvm_bsd.cpp
new file mode 100644
index 000000000000..98eba554c4a9
--- /dev/null
+++ b/java/jdk16/files/patch-hotspot-vm-jvm_bsd.cpp
@@ -0,0 +1,13 @@
+--- ../../hotspot/src/os/bsd/vm/jvm_bsd.cpp 28 Mar 2007 04:52:29 -0000 1.1
++++ ../../hotspot/src/os/bsd/vm/jvm_bsd.cpp 9 Aug 2007 16:12:56 -0000 1.3
+@@ -116,8 +116,8 @@
+ */
+
+ struct siglabel {
+- char *name;
+- int number;
++ const char *name;
++ int number;
+ };
+
+ struct siglabel siglabels[] =
diff --git a/java/jdk16/files/patch-hotspot-vm-vmError_bsd.cpp b/java/jdk16/files/patch-hotspot-vm-vmError_bsd.cpp
new file mode 100644
index 000000000000..45b8b33513ea
--- /dev/null
+++ b/java/jdk16/files/patch-hotspot-vm-vmError_bsd.cpp
@@ -0,0 +1,11 @@
+--- ../../hotspot/src/os/bsd/vm/vmError_bsd.cpp 28 Mar 2007 04:52:29 -0000 1.1
++++ ../../hotspot/src/os/bsd/vm/vmError_bsd.cpp 9 Aug 2007 15:52:44 -0000 1.3
+@@ -30,7 +30,7 @@
+ // Unlike system(), this function can be called from signal handler. It
+ // doesn't block SIGINT et al.
+ int VMError::fork_and_exec(char* cmd) {
+- char * argv[4];
++ const char *argv[4];
+ argv[0] = "sh";
+ argv[1] = "-c";
+ argv[2] = cmd;