summaryrefslogtreecommitdiff
path: root/java/jdk15
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2006-02-12 20:47:21 +0000
committerGreg Lewis <glewis@FreeBSD.org>2006-02-12 20:47:21 +0000
commitbc1fa829dbaa09645df0bf66b502d2d4d5826a24 (patch)
treee84b6dfb08ebae447bbd06a526601e16b7e1ff56 /java/jdk15
parent. Tweak the fix for linking with the system's version of zlib to just (diff)
. 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>
Notes
Notes: svn path=/head/; revision=155850
Diffstat (limited to 'java/jdk15')
-rw-r--r--java/jdk15/Makefile2
-rw-r--r--java/jdk15/files/patch-hotspot::vm::amd64.ad13
2 files changed, 14 insertions, 1 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);
+ %}
+