aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2006-02-13 04:47:21 +0800
committerglewis <glewis@FreeBSD.org>2006-02-13 04:47:21 +0800
commit173816e3c82b432f33ea4a941e82b42803cf1bc0 (patch)
treea80873b791f2bd81dc96ef8f56c073240ade3ec2 /java
parent1af5a66dccc69c956278ddd7e3f242a54dfa4212 (diff)
downloadfreebsd-ports-gnome-173816e3c82b432f33ea4a941e82b42803cf1bc0.tar.gz
freebsd-ports-gnome-173816e3c82b432f33ea4a941e82b42803cf1bc0.tar.zst
freebsd-ports-gnome-173816e3c82b432f33ea4a941e82b42803cf1bc0.zip
. Set the REX bits correctly on amd64. Fixes possible segfaults with
Eclipse on that platform. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=71987 . Bump PORTREVISION. Submitted by: Sean McNeil <sean@mcneil.com>
Diffstat (limited to 'java')
-rw-r--r--java/jdk15/Makefile2
-rw-r--r--java/jdk15/files/patch-hotspot::vm::amd64.ad13
-rw-r--r--java/jdk16/Makefile2
-rw-r--r--java/jdk16/files/patch-hotspot::vm::amd64.ad13
4 files changed, 28 insertions, 2 deletions
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 9c415e21df76..a5d7f21b1a3e 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdk15/files/patch-hotspot::vm::amd64.ad b/java/jdk15/files/patch-hotspot::vm::amd64.ad
new file mode 100644
index 000000000000..53c174afeb37
--- /dev/null
+++ b/java/jdk15/files/patch-hotspot::vm::amd64.ad
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../hotspot/src/cpu/amd64/vm/amd64.ad.orig Wed Feb 8 15:18:24 2006
++++ ../../hotspot/src/cpu/amd64/vm/amd64.ad Wed Feb 8 15:17:35 2006
+@@ -7246,7 +7246,7 @@
+
+ format %{ "negl $dst\t# int" %}
+ opcode(0xF7, 0x03); // Opcode F7 /3
+- ins_encode(REX_reg(dst), OpcP, RM_opc_mem(secondary, dst));
++ ins_encode(REX_mem(dst), OpcP, RM_opc_mem(secondary, dst));
+ ins_pipe(ialu_reg);
+ %}
+
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 9c415e21df76..a5d7f21b1a3e 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/communitysource/j2se/java2/download.xml
# http://www.eyesbeyond.com/freebsddom/java/jdk15.html
diff --git a/java/jdk16/files/patch-hotspot::vm::amd64.ad b/java/jdk16/files/patch-hotspot::vm::amd64.ad
new file mode 100644
index 000000000000..53c174afeb37
--- /dev/null
+++ b/java/jdk16/files/patch-hotspot::vm::amd64.ad
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../../hotspot/src/cpu/amd64/vm/amd64.ad.orig Wed Feb 8 15:18:24 2006
++++ ../../hotspot/src/cpu/amd64/vm/amd64.ad Wed Feb 8 15:17:35 2006
+@@ -7246,7 +7246,7 @@
+
+ format %{ "negl $dst\t# int" %}
+ opcode(0xF7, 0x03); // Opcode F7 /3
+- ins_encode(REX_reg(dst), OpcP, RM_opc_mem(secondary, dst));
++ ins_encode(REX_mem(dst), OpcP, RM_opc_mem(secondary, dst));
+ ins_pipe(ialu_reg);
+ %}
+