cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to early access build 42:

Browse Source 
- sync/regen patches
- use os_bsd_x86.cpp from OpenJDK bsd-java repository plus
  Greg Lewis's fixes posted to the bsd-port-dev list
- use Xiaobin Lu's datatype corrections from OpenJDK bug
  6787106 + additional datatype corrections from me.
- use Vladimir Kozlov's bug fix from OpenJDK bug 6782820
- remove obsolete IcedTea awt binary plugs and update binary
  plug distfile
- correctly define DEVTOOLS_PATH for bsd and verify + correct
  Defs-utils.gmk locations for bsd utilities
This commit is contained in:
kurt 2009-01-04 23:25:15 +00:00
parent ac787fe024
commit ac17ae9adf
129 changed files with 1652 additions and 1544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devel/jdk/1.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2008/12/22 15:06:39 kurt Exp $
# $OpenBSD: Makefile,v 1.24 2009/01/04 23:25:15 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= i386 amd64
@ -6,12 +6,12 @@ ONLY_FOR_ARCHS= i386 amd64
COMMENT-main= Java2(TM) SE Dev Kit v${V} Early Access ${B}
COMMENT-jre= Java2(TM) SE Runtime Environment v${V} Early Access ${B}
V= 1.7.0.00
B= b24
DISTFILES= openjdk7-${B}.tar.bz2 \
jdk-7-icedtea-plugs-1.6.tar.gz
B= b42
DISTFILES= openjdk-7-ea-src-${B}-19_dec_2008.zip \
jdk-7-icedtea-plugs-1.6a.tar.gz:0
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}${B}p6
PKGNAME-jre= jre-${V}${B}p6
PKGNAME-main= jdk-${V}${B}
PKGNAME-jre= jre-${V}${B}
CATEGORIES= devel/jdk java
@ -23,7 +23,8 @@ FLAVOR?=
HOMEPAGE= https://jdk7.dev.java.net/
MASTER_SITES= http://www.intricatesoftware.com/distfiles/
MASTER_SITES= http://www.java.net/download/openjdk/jdk7/promoted/${B}/
MASTER_SITES0= http://www.intricatesoftware.com/distfiles/
MAINTAINER= Kurt Miller <kurt@openbsd.org>
@ -57,6 +58,7 @@ MAKE_ENV= ALT_BOOTDIR=${ALT_BOOTDIR} \
ALT_FREETYPE_HEADERS_PATH=${X11BASE}/include \
ALT_FREETYPE_LIB_PATH=${X11BASE}/lib \
ALT_BINARY_PLUGS_PATH=${WRKDIR}/jdk-7-icedtea-plugs \
ALT_DEVTOOLS_PATH=${LOCALBASE}/bin \
ANT_HOME=${LOCALBASE} \
DEFAULT_LIBPATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \
NO_DOCS=true \
@ -76,7 +78,7 @@ JREHOME= jre-1.7.0
SUBST_VARS= JDKHOME JREHOME
WRKDIST= ${WRKDIR}/openjdk7-${B}
WRKDIST= ${WRKDIR}/openjdk
JVMARCH= ${MACHINE_ARCH:S/i386/i586/}
BUILDDIR= ${WRKDIST}/build/bsd-${JVMARCH}
JDKIMAGEDIR= ${BUILDDIR}/j2sdk-image
@ -91,8 +93,8 @@ PKG_ARGS+= -Dclient_vm=0
COPYDIRS= hotspot/src/os/linux/launcher \
hotspot/src/os/linux/vm \
hotspot/src/os_cpu/linux_x86/vm \
hotspot/build/linux \
hotspot/build/linux/makefiles \
hotspot/make/linux \
hotspot/make/linux/makefiles \
jdk/src/linux/doc/man
COPYFILES= corba/make/common/Defs-linux.gmk \

20
devel/jdk/1.7/distinfo
View File

@ -1,10 +1,10 @@
MD5 (jdk-7-icedtea-plugs-1.6.tar.gz) = HPc2mSWI1kg2mv1z9Xg44w==
MD5 (openjdk7-b24.tar.bz2) = zu/WZpxZxglDdirikYaB/g==
RMD160 (jdk-7-icedtea-plugs-1.6.tar.gz) = W9jeOp+vRhjw5hd2ieR6OLoFeHw=
RMD160 (openjdk7-b24.tar.bz2) = G/jwOzelOGR7lqdqHp8tzLMX7ms=
SHA1 (jdk-7-icedtea-plugs-1.6.tar.gz) = RTNHhYt2G14WI9upWHJPm1oR0UQ=
SHA1 (openjdk7-b24.tar.bz2) = n9rVr5MoPD5KMdac3jQf7nuHq2Y=
SHA256 (jdk-7-icedtea-plugs-1.6.tar.gz) = M3fJE0EPFe+oYpH4Blyq5m6wG3SIdeko4uf97TzNA/s=
SHA256 (openjdk7-b24.tar.bz2) = 850RBlzMWsTCAFZNHw41n9QHnhZ2+p/ASWU0uTkqKDw=
SIZE (jdk-7-icedtea-plugs-1.6.tar.gz) = 246049
SIZE (openjdk7-b24.tar.bz2) = 42556029
MD5 (jdk-7-icedtea-plugs-1.6a.tar.gz) = lh6B1+T6Isb1o6OGufbK4g==
MD5 (openjdk-7-ea-src-b42-19_dec_2008.zip) = iesoqqPonpNQ8V5eS3GKQA==
RMD160 (jdk-7-icedtea-plugs-1.6a.tar.gz) = xfN51TYwgBeV3HhlUZgf3HtQTYQ=
RMD160 (openjdk-7-ea-src-b42-19_dec_2008.zip) = bS/IdsJNyIVQ62lVSM9+6agU6VY=
SHA1 (jdk-7-icedtea-plugs-1.6a.tar.gz) = A3qIJwYAfjM0JUCOAG9VZVT9pRQ=
SHA1 (openjdk-7-ea-src-b42-19_dec_2008.zip) = C7yXcHZaEX7/7K7skXg2XY6ySmE=
SHA256 (jdk-7-icedtea-plugs-1.6a.tar.gz) = dXe+50eFCjVr0Y2we2APrhOTycQNS81Psy6yyWbIaNc=
SHA256 (openjdk-7-ea-src-b42-19_dec_2008.zip) = 2uIMhu2aaYKAA/0K9ffo94su94vXPujNGDpbywxLz+g=
SIZE (jdk-7-icedtea-plugs-1.6a.tar.gz) = 64679
SIZE (openjdk-7-ea-src-b42-19_dec_2008.zip) = 87715520

11
devel/jdk/1.7/patches/patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_dynamicany_jmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_dynamicany_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk.orig Fri Feb 29 00:05:48 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk Fri Feb 29 00:06:28 2008
@@ -41,4 +41,6 @@ com_sun_corba_se_impl_dynamicany_java = \
com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java \
com/sun/corba/se/impl/dynamicany/DynStructImpl.java \
com/sun/corba/se/impl/dynamicany/DynUnionImpl.java \
- com/sun/corba/se/impl/dynamicany/DynValueImpl.java
+ com/sun/corba/se/impl/dynamicany/DynValueImpl.java \
+ com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java
+

11
devel/jdk/1.7/patches/patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_ior_jmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_ior_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk.orig Fri Feb 29 08:58:24 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk Fri Feb 29 08:58:45 2008
@@ -63,6 +63,7 @@ com_sun_corba_se_impl_ior_java = \
com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java \
com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java \
com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java \
+ com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \
com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \
com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \
com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java

11
devel/jdk/1.7/patches/patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_orbutil_jmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_orbutil_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk.orig Tue Mar 4 11:00:25 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk Tue Mar 4 11:01:33 2008
@@ -27,6 +27,7 @@ com_sun_corba_se_impl_orbutil_java = \
com/sun/corba/se/impl/orbutil/CacheTable.java \
com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java \
com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
+ com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
com/sun/corba/se/impl/orbutil/HexOutputStream.java \
com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \
com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \

11
devel/jdk/1.7/patches/patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_protocol_jmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_impl_protocol_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.orig Thu Feb 28 17:17:49 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk Thu Feb 28 17:18:22 2008
@@ -63,6 +63,7 @@ com_sun_corba_se_impl_protocol_java = \
com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java \
+ com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java \
com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java \

11
devel/jdk/1.7/patches/patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_spi_legacy_interceptor_jmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_spi_legacy_interceptor_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk.orig Sun Mar 2 08:21:25 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk Sun Mar 2 08:21:49 2008
@@ -28,6 +28,7 @@
#
com_sun_corba_se_spi_legacy_interceptor_java = \
+ com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java \
com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \
com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \
com/sun/corba/se/spi/legacy/interceptor/UnknownType.java

11
devel/jdk/1.7/patches/patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_spi_presentation_rmi_jmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_spi_presentation_rmi_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk.orig Mon Mar 3 18:42:57 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk Mon Mar 3 18:43:30 2008
@@ -27,6 +27,7 @@ com_sun_corba_se_spi_presentation_rmi_java = \
com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java \
com/sun/corba/se/spi/presentation/rmi/DynamicStub.java \
com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \
+ com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \
com/sun/corba/se/spi/presentation/rmi/StubAdapter.java

11
devel/jdk/1.7/patches/patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_spi_transport_jmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_spi_transport_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk.orig Sat Mar 1 18:14:37 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk Sat Mar 1 18:15:06 2008
@@ -26,6 +26,7 @@
com_sun_corba_se_spi_transport_java = \
com/sun/corba/se/spi/transport/CorbaAcceptor.java \
com/sun/corba/se/spi/transport/CorbaConnection.java \
+ com/sun/corba/se/spi/transport/CorbaConnectionCache.java \
com/sun/corba/se/spi/transport/CorbaContactInfo.java \
com/sun/corba/se/spi/transport/CorbaContactInfoList.java \
com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java \

15
devel/jdk/1.7/patches/patch-corba_make_common_shared_Defs-bsd_gmk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-corba_make_common_shared_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/shared/Defs-bsd.gmk.orig Thu Nov 8 12:05:45 2007
+++ corba/make/common/shared/Defs-bsd.gmk Thu Nov 8 12:06:44 2007
$OpenBSD: patch-corba_make_common_shared_Defs-bsd_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- corba/make/common/shared/Defs-bsd.gmk.orig Mon Dec 22 14:34:15 2008
+++ corba/make/common/shared/Defs-bsd.gmk Mon Dec 22 16:02:53 2008
@@ -54,7 +54,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && p
endef
@ -10,3 +10,12 @@ $OpenBSD: patch-corba_make_common_shared_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:43
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
@@ -107,7 +107,7 @@ endif
ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
else
- DEVTOOLS_PATH =/usr/bin/
+ DEVTOOLS_PATH =/usr/local/bin/
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.

72
devel/jdk/1.7/patches/patch-corba_make_common_shared_Defs-utils_gmk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-corba_make_common_shared_Defs-utils_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/shared/Defs-utils.gmk.orig Tue Feb 26 21:56:19 2008
+++ corba/make/common/shared/Defs-utils.gmk Tue Feb 26 22:06:55 2008
$OpenBSD: patch-corba_make_common_shared_Defs-utils_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- corba/make/common/shared/Defs-utils.gmk.orig Thu Oct 23 03:40:16 2008
+++ corba/make/common/shared/Defs-utils.gmk Mon Dec 22 16:26:52 2008
@@ -53,6 +53,13 @@ ifeq ($(PLATFORM),linux)
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
endif
@ -9,57 +9,35 @@ $OpenBSD: patch-corba_make_common_shared_Defs-utils_gmk,v 1.1 2008/03/19 18:05:4
+ UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
+ UTILS_USR_BIN_PATH=$(USRBIN_PATH)
+ UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
+ UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
+ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+endif
+
ifeq ($(PLATFORM),solaris)
UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
@@ -81,7 +88,11 @@ FINDBUGS = $(FINDBUGS_HOME)/bin/findbugs
ADB = $(UTILS_COMMAND_PATH)adb
AR = $(UTILS_CCS_BIN_PATH)ar
AS = $(UTILS_CCS_BIN_PATH)as
@@ -189,6 +196,25 @@ ifeq ($(PLATFORM),linux)
NM = $(UTILS_USR_BIN_PATH)nm
STRIP = $(UTILS_USR_BIN_PATH)strip
YACC = $(UTILS_USR_BIN_PATH)yacc
+endif
+
+# BSD specific
+ifeq ($(PLATFORM),bsd)
+BASENAME = $(UTILS_USR_BIN_PATH)basename
+else
BASENAME = $(UTILS_COMMAND_PATH)basename
+endif
CAT = $(UTILS_COMMAND_PATH)cat
CHMOD = $(UTILS_COMMAND_PATH)chmod
CMP = $(UTILS_USR_BIN_PATH)cmp
@@ -96,7 +107,11 @@ DIFF = $(UTILS_USR_BIN_PATH)diff
DIRNAME = $(UTILS_USR_BIN_PATH)dirname
ECHO = $(UTILS_COMMAND_PATH)echo
EGREP = $(UTILS_COMMAND_PATH)egrep
+ifeq ($(PLATFORM),bsd)
+EGREP = $(UTILS_USR_BIN_PATH)egrep
+EXPR = $(UTILS_COMMAND_PATH)expr
+else
EXPR = $(UTILS_USR_BIN_PATH)expr
+endif
FILE = $(UTILS_USR_BIN_PATH)file
FIND = $(UTILS_USR_BIN_PATH)find
FMT = $(UTILS_COMMAND_PATH)fmt
@@ -127,7 +142,11 @@ RMDIR = $(UTILS_COMMAND_PATH)rmdir
RPM = $(UTILS_COMMAND_PATH)rpm
RPMBUILD = $(UTILS_COMMAND_PATH)rpmbuild
SCCS = $(UTILS_CCS_BIN_PATH)sccs
+ifeq ($(PLATFORM),bsd)
+FMT = $(UTILS_USR_BIN_PATH)fmt
+GREP = $(UTILS_USR_BIN_PATH)grep
+GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
+ID = $(UTILS_USR_BIN_PATH)id
+MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
+SED = $(UTILS_USR_BIN_PATH)sed
+else
SED = $(UTILS_COMMAND_PATH)sed
+endif
SH = $(UTILS_COMMAND_PATH)sh
SHOWREV = $(UTILS_USR_BIN_PATH)showrev
SORT = $(UTILS_COMMAND_PATH)sort
@@ -135,7 +154,11 @@ STRIP = $(UTILS_CCS_BIN_PATH)strip
TAIL = $(UTILS_USR_BIN_PATH)tail
TAR = $(UTILS_COMMAND_PATH)tar
TEST = $(UTILS_USR_BIN_PATH)test
+ifeq ($(PLATFORM),bsd)
+SORT = $(UTILS_USR_BIN_PATH)sort
+TOUCH = $(UTILS_USR_BIN_PATH)touch
+else
TOUCH = $(UTILS_COMMAND_PATH)touch
+endif
TR = $(UTILS_USR_BIN_PATH)tr
TRUE = $(UTILS_COMMAND_PATH)true
UNAME = $(UTILS_COMMAND_PATH)uname
+TEST = $(UTILS_COMMAND_PATH)test
+TRUE = $(UTILS_USR_BIN_PATH)true
+UNAME = $(UTILS_USR_BIN_PATH)uname
+UNZIP = $(UTILS_DEVTOOL_PATH)unzip
endif
# Solaris specific

8
devel/jdk/1.7/patches/patch-corba_make_jprt_config
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-corba_make_jprt_config,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/jprt.config.orig Tue Feb 26 21:49:17 2008
+++ corba/make/jprt.config Tue Feb 26 21:53:42 2008
@@ -180,6 +180,35 @@ elif [ "${osname}" = Linux ] ; then
$OpenBSD: patch-corba_make_jprt_config,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- corba/make/jprt.config.orig Thu Oct 23 03:40:16 2008
+++ corba/make/jprt.config Mon Dec 22 14:34:17 2008
@@ -174,6 +174,35 @@ elif [ "${osname}" = Linux ] ; then
umask 002

14
devel/jdk/1.7/patches/patch-corba_make_org_omg_CORBA_Makefile
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-corba_make_org_omg_CORBA_Makefile,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/org/omg/CORBA/Makefile.orig Sat Dec 1 00:00:00 2007
+++ corba/make/org/omg/CORBA/Makefile Thu Feb 28 15:22:56 2008
@@ -47,8 +47,8 @@ else
endif
FILES_java = \
- $(ORG_OMG_SENDINGCONTEXT_java) \
- $(ORG_OMG_CORBA_2_3_java) \
+ $(org_omg_SendingContext_java) \
+ $(org_omg_CORBA_2_3_java) \
$(ORG_OMG_CORBA_java)
#

34
devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_sa_make
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-hotspot_build_bsd_makefiles_sa_make,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/build/bsd/makefiles/sa.make.orig Wed Nov 7 12:41:30 2007
+++ hotspot/build/bsd/makefiles/sa.make Wed Nov 7 12:41:35 2007
@@ -31,6 +31,7 @@
include $(GAMMADIR)/build/bsd/makefiles/rules.make
AGENT_DIR = $(GAMMADIR)/agent
+SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
include $(GAMMADIR)/build/sa.files
@@ -42,7 +43,7 @@ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
# gnumake 3.78.1 does not accept the *s that
# are in AGENT_ALLFILES, so use the shell to expand them
-AGENT_ALLFILES := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_ALLFILES))
+AGENT_ALLFILES := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_ALLFILES))
SA_CLASSDIR = $(GENERATED)/saclasses
@@ -50,11 +51,11 @@ SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.sa
SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
-# if $(AGENT_DIR) does not exist, we don't build SA
+# if $(SASRCDIR) does not exist, we don't build SA
# also, we don't build SA on Itanium.
all:
- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
+ if [ -d $(SASRCDIR) -a "$(SRCARCH)" != "ia64" ] ; then \
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
fi

63
devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_vm_make
View File

@ -1,63 +0,0 @@
$OpenBSD: patch-hotspot_build_bsd_makefiles_vm_make,v 1.5 2008/12/22 14:56:40 kurt Exp $
--- hotspot/build/bsd/makefiles/vm.make.orig Mon Dec 22 08:43:34 2008
+++ hotspot/build/bsd/makefiles/vm.make Mon Dec 22 08:59:19 2008
@@ -84,6 +84,10 @@ CPPFLAGS = \
${JRE_VERSION} \
${VM_DISTRO}
+ifdef DEFAULT_LIBPATH
+CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
+endif
+
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN/BYFILE)
@@ -93,7 +97,7 @@ CFLAGS += $(CFLAGS/NOEX)
# Extra flags from gnumake's invocation or environment
CFLAGS += $(EXTRA_CFLAGS)
-LIBS += -lm -ldl -lpthread
+LIBS += -lm -pthread
# By default, link the *.o into the library, not the executable.
LINK_INTO$(LINK_INTO) = LIBJVM
@@ -122,32 +126,14 @@ mapfile_reorder : mapfile $(REORDERFILE)
rm -f $@
cat $^ > $@
-STATIC_CXX = true
+STATIC_CXX = false
-ifeq ($(LINK_INTO),AOUT)
- LIBJVM.o =
- LIBJVM_MAPFILE =
- LIBS_VM = $(LIBS)
-else
- LIBJVM.o = $(JVM_OBJ_FILES)
- LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder
- LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
- LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))
-
- # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to
- # get around library dependency and compatibility issues. Must use gcc not
- # g++ to link.
- ifeq ($(STATIC_CXX), true)
- LFLAGS_VM += $(STATIC_LIBGCC)
- LIBS_VM += $(STATIC_STDCXX)
- else
- LIBS_VM += -lstdc++
- endif
-
- LIBS_VM += $(LIBS)
-endif
-
-LINK_VM = $(LINK_LIB.c)
+LIBJVM.o = $(JVM_OBJ_FILES)
+LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder
+LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
+LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))
+LIBS_VM += $(LIBS)
+LINK_VM = $(LINK_LIB.CC)
# rule for building precompiled header
$(PRECOMPILED_HEADER): $(Precompiled_Files)

9
devel/jdk/1.7/patches/patch-hotspot_build_bsd_platform_amd64
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-hotspot_build_bsd_platform_amd64,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/build/bsd/platform_amd64.orig Wed Nov 7 12:41:30 2007
+++ hotspot/build/bsd/platform_amd64 Wed Nov 7 13:18:13 2007
@@ -14,4 +14,4 @@ compiler = gcc
gnu_dis_arch = amd64
-sysdefs = -DLINUX -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64

9
devel/jdk/1.7/patches/patch-hotspot_build_bsd_platform_i486
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-hotspot_build_bsd_platform_i486,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/build/bsd/platform_i486.orig Wed Nov 7 12:41:30 2007
+++ hotspot/build/bsd/platform_i486 Wed Nov 7 13:18:27 2007
@@ -14,4 +14,4 @@ compiler = gcc
gnu_dis_arch = i386
-sysdefs = -DLINUX -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32

9
devel/jdk/1.7/patches/patch-hotspot_build_bsd_platform_sparc
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-hotspot_build_bsd_platform_sparc,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/build/bsd/platform_sparc.orig Wed Nov 7 12:41:30 2007
+++ hotspot/build/bsd/platform_sparc Wed Nov 7 12:41:35 2007
@@ -14,4 +14,4 @@ compiler = gcc
gnu_dis_arch = sparc
-sysdefs = -DLINUX -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC

8
devel/jdk/1.7/patches/patch-hotspot_build_bsd_Makefile → devel/jdk/1.7/patches/patch-hotspot_make_bsd_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_build_bsd_Makefile,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/build/bsd/Makefile.orig Wed Nov 7 12:41:30 2007
+++ hotspot/build/bsd/Makefile Wed Nov 7 12:41:35 2007
@@ -192,7 +192,7 @@ all:
$OpenBSD: patch-hotspot_make_bsd_Makefile,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/Makefile.orig Sat Aug 2 16:12:30 2008
+++ hotspot/make/bsd/Makefile Sat Aug 2 16:15:29 2008
@@ -197,7 +197,7 @@ all:
@echo " $(TARGETS_C1)"
@echo " $(TARGETS_CORE)"

6
devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_defs_make → devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_defs_make
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_build_bsd_makefiles_defs_make,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/build/bsd/makefiles/defs.make.orig Wed Nov 7 12:41:30 2007
+++ hotspot/build/bsd/makefiles/defs.make Wed Nov 7 12:51:17 2007
$OpenBSD: patch-hotspot_make_bsd_makefiles_defs_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/defs.make.orig Sat Aug 2 16:12:30 2008
+++ hotspot/make/bsd/makefiles/defs.make Sat Aug 2 16:15:29 2008
@@ -79,6 +79,31 @@ ifeq ($(ARCH), x86_64)
endif
endif

28
devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_gcc_make → devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_gcc_make
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.4 2008/12/22 13:22:12 kurt Exp $
--- hotspot/build/bsd/makefiles/gcc.make.orig Sat Dec 20 22:26:49 2008
+++ hotspot/build/bsd/makefiles/gcc.make Sat Dec 20 23:52:53 2008
$OpenBSD: patch-hotspot_make_bsd_makefiles_gcc_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/gcc.make.orig Mon Dec 22 21:13:31 2008
+++ hotspot/make/bsd/makefiles/gcc.make Mon Dec 22 23:13:24 2008
@@ -25,9 +25,10 @@
#------------------------------------------------------------------------
# CC, CPP & AS
@ -15,19 +15,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.4 2008/12/22 13:22:12 k
# -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
# prints the numbers (e.g. "2.95", "3.2.1")
@@ -50,19 +51,12 @@ PICFLAG = -fPIC
VM_PICFLAG/LIBJVM = $(PICFLAG)
VM_PICFLAG/AOUT =
-
-ifneq ($(BUILDARCH), i486)
VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-else
-# PIC has significant overhead on x86, build nonpic VM for now.
-# Link JVM at a "good" base location to avoid unnecessary .text patching.
-JVM_BASE_ADDR = 0x06000000
-endif
@@ -55,7 +56,7 @@ VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
CFLAGS += $(VM_PICFLAG)
CFLAGS += -fno-rtti
CFLAGS += -fno-exceptions
@ -36,16 +24,16 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.4 2008/12/22 13:22:12 k
CFLAGS += -fcheck-new
ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
@@ -90,7 +84,7 @@ else
@@ -83,7 +84,7 @@ else
endif
# Compiler warnings are treated as errors
-WARNINGS_ARE_ERRORS = -Werror
+#WARNINGS_ARE_ERRORS = -Werror
# Except for a few acceptable ones
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
@@ -136,7 +130,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME
# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
@@ -138,7 +139,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME
SONAMEFLAG = -Xlinker -soname=SONAME
# Build shared library

6
devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_jsig_make → devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_jsig_make
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_build_bsd_makefiles_jsig_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/build/bsd/makefiles/jsig.make.orig Mon Apr 16 08:42:36 2007
+++ hotspot/build/bsd/makefiles/jsig.make Mon Apr 16 08:42:38 2007
$OpenBSD: patch-hotspot_make_bsd_makefiles_jsig_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/jsig.make.orig Sat Aug 2 16:12:30 2008
+++ hotspot/make/bsd/makefiles/jsig.make Sat Aug 2 16:15:29 2008
@@ -39,12 +39,12 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
# cause problems with interposing. See CR: 6466665
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))

6
devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_jvmg_make → devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_jvmg_make
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_build_bsd_makefiles_jvmg_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/build/bsd/makefiles/jvmg.make.orig Mon Apr 30 09:47:42 2007
+++ hotspot/build/bsd/makefiles/jvmg.make Mon Apr 30 09:49:03 2007
$OpenBSD: patch-hotspot_make_bsd_makefiles_jvmg_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/jvmg.make.orig Sat Aug 2 16:12:30 2008
+++ hotspot/make/bsd/makefiles/jvmg.make Sat Aug 2 16:15:29 2008
@@ -24,6 +24,8 @@
# Sets make macros for making debug version of VM

36
devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_sa_make Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-hotspot_make_bsd_makefiles_sa_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/sa.make.orig Mon Dec 22 14:34:14 2008
+++ hotspot/make/bsd/makefiles/sa.make Mon Dec 22 20:50:40 2008
@@ -31,6 +31,7 @@
include $(GAMMADIR)/make/bsd/makefiles/rules.make
AGENT_DIR = $(GAMMADIR)/agent
+SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
include $(GAMMADIR)/make/sa.files
@@ -42,8 +43,8 @@ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
# gnumake 3.78.1 does not accept the *s that
# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
+AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
+AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
SA_CLASSDIR = $(GENERATED)/saclasses
@@ -51,11 +52,11 @@ SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.sa
SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
-# if $(AGENT_DIR) does not exist, we don't build SA
+# if $(SASRCDIR) does not exist, we don't build SA
# also, we don't build SA on Itanium.
all:
- if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" ] ; then \
+ if [ -d $(SASRCDIR) -a "$(SRCARCH)" != "ia64" ] ; then \
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
fi

6
devel/jdk/1.7/patches/patch-hotspot_build_bsd_makefiles_saproc_make → devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_saproc_make
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_build_bsd_makefiles_saproc_make,v 1.1.1.1 2007/05/08 17:06:18 kurt Exp $
--- hotspot/build/bsd/makefiles/saproc.make.orig Mon Apr 16 08:42:36 2007
+++ hotspot/build/bsd/makefiles/saproc.make Mon Apr 16 08:42:38 2007
$OpenBSD: patch-hotspot_make_bsd_makefiles_saproc_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/saproc.make.orig Sat Aug 2 16:12:30 2008
+++ hotspot/make/bsd/makefiles/saproc.make Sat Aug 2 16:15:29 2008
@@ -43,11 +43,11 @@ SAMAPFILE = $(SASRCDIR)/mapfile
DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)

49
devel/jdk/1.7/patches/patch-hotspot_make_bsd_makefiles_vm_make Normal file
View File

@ -0,0 +1,49 @@
$OpenBSD: patch-hotspot_make_bsd_makefiles_vm_make,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/makefiles/vm.make.orig Mon Dec 22 21:13:31 2008
+++ hotspot/make/bsd/makefiles/vm.make Mon Dec 22 23:29:49 2008
@@ -86,6 +86,10 @@ CPPFLAGS = \
${JRE_VERSION} \
${VM_DISTRO}
+ifdef DEFAULT_LIBPATH
+CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
+endif
+
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN/BYFILE)
@@ -95,7 +99,7 @@ CFLAGS += $(CFLAGS/NOEX)
# Extra flags from gnumake's invocation or environment
CFLAGS += $(EXTRA_CFLAGS)
-LIBS += -lm -ldl -lpthread
+LIBS += -lm -pthread
# By default, link the *.o into the library, not the executable.
LINK_INTO$(LINK_INTO) = LIBJVM
@@ -124,7 +128,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
rm -f $@
cat $^ > $@
-STATIC_CXX = true
+STATIC_CXX = false
ifeq ($(LINK_INTO),AOUT)
LIBJVM.o =
@@ -142,14 +146,14 @@ else
ifeq ($(STATIC_CXX), true)
LFLAGS_VM += $(STATIC_LIBGCC)
LIBS_VM += $(STATIC_STDCXX)
+ LINK_VM = $(LINK_LIB.c)
else
- LIBS_VM += -lstdc++
+ LINK_VM = $(LINK_LIB.CC)
endif
LIBS_VM += $(LIBS)
endif
-LINK_VM = $(LINK_LIB.c)
# rule for building precompiled header
$(PRECOMPILED_HEADER): $(Precompiled_Files)

9
devel/jdk/1.7/patches/patch-hotspot_make_bsd_platform_amd64 Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-hotspot_make_bsd_platform_amd64,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/platform_amd64.orig Fri Aug 8 12:45:41 2008
+++ hotspot/make/bsd/platform_amd64 Fri Aug 8 12:46:04 2008
@@ -12,4 +12,4 @@ lib_arch = amd64
compiler = gcc
-sysdefs = -DLINUX -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64

9
devel/jdk/1.7/patches/patch-hotspot_make_bsd_platform_i486 Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-hotspot_make_bsd_platform_i486,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/platform_i486.orig Fri Aug 8 12:46:25 2008
+++ hotspot/make/bsd/platform_i486 Fri Aug 8 12:46:40 2008
@@ -12,4 +12,4 @@ lib_arch = i386
compiler = gcc
-sysdefs = -DLINUX -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32

9
devel/jdk/1.7/patches/patch-hotspot_make_bsd_platform_sparc Normal file
View File

@ -0,0 +1,9 @@
$OpenBSD: patch-hotspot_make_bsd_platform_sparc,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/bsd/platform_sparc.orig Fri Aug 8 12:46:51 2008
+++ hotspot/make/bsd/platform_sparc Fri Aug 8 12:46:59 2008
@@ -12,4 +12,4 @@ lib_arch = sparc
compiler = gcc
-sysdefs = -DLINUX -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC

8
devel/jdk/1.7/patches/patch-hotspot_make_defs_make
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_make_defs_make,v 1.2 2007/09/06 15:46:18 kurt Exp $
--- hotspot/make/defs.make.orig Thu Aug 30 04:57:10 2007
+++ hotspot/make/defs.make Sun Sep 2 14:06:01 2007
@@ -118,13 +118,20 @@ endif
$OpenBSD: patch-hotspot_make_defs_make,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/make/defs.make.orig Thu Jul 17 03:40:27 2008
+++ hotspot/make/defs.make Sat Aug 2 16:12:52 2008
@@ -119,13 +119,20 @@ endif
# Windows should have OS predefined
ifeq ($(OS),)
OS := $(shell uname -s)

21
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_assembler_x86_64_cpp
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_assembler_x86_64_cpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/cpu/x86/vm/assembler_x86_64.cpp.orig Wed Nov 7 16:56:49 2007
+++ hotspot/src/cpu/x86/vm/assembler_x86_64.cpp Wed Nov 7 16:57:32 2007
@@ -1304,7 +1304,7 @@ void Assembler::movl(Address dst, Register src) {
emit_operand(src, dst);
}
-void Assembler::mov64(Register dst, int64_t imm64) {
+void Assembler::mov64(Register dst, intptr_t imm64) {
InstructionMark im(this);
int encode = prefixq_and_encode(dst->encoding());
emit_byte(0xB8 | encode);
@@ -1331,7 +1331,7 @@ void Assembler::movq(Register dst, Address src) {
emit_operand(dst, src);
}
-void Assembler::mov64(Address dst, int64_t imm32) {
+void Assembler::mov64(Address dst, intptr_t imm32) {
assert(is_simm32(imm32), "lost bits");
InstructionMark im(this);
prefixq(dst);

48
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_assembler_x86_cpp Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_assembler_x86_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/assembler_x86.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/assembler_x86.cpp Sun Dec 28 19:22:14 2008
@@ -5212,15 +5212,15 @@ void MacroAssembler::pushptr(AddressLiteral src) {
void MacroAssembler::reset_last_Java_frame(bool clear_fp,
bool clear_pc) {
// we must set sp to zero to clear frame
- movptr(Address(r15_thread, JavaThread::last_Java_sp_offset()), (int32_t)NULL_WORD);
+ movptr(Address(r15_thread, JavaThread::last_Java_sp_offset()), NULL_WORD);
// must clear fp, so that compiled frames are not confused; it is
// possible that we need it only for debugging
if (clear_fp) {
- movptr(Address(r15_thread, JavaThread::last_Java_fp_offset()), (int32_t)NULL_WORD);
+ movptr(Address(r15_thread, JavaThread::last_Java_fp_offset()), NULL_WORD);
}
if (clear_pc) {
- movptr(Address(r15_thread, JavaThread::last_Java_pc_offset()), (int32_t)NULL_WORD);
+ movptr(Address(r15_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
}
}
@@ -5670,7 +5670,7 @@ void MacroAssembler::call_VM_base(Register oop_result,
// get oop result if there is one and reset the value in the thread
if (oop_result->is_valid()) {
movptr(oop_result, Address(java_thread, JavaThread::vm_result_offset()));
- movptr(Address(java_thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
+ movptr(Address(java_thread, JavaThread::vm_result_offset()), NULL_WORD);
verify_oop(oop_result, "broken oop in call_VM_base");
}
}
@@ -6426,13 +6426,13 @@ void MacroAssembler::reset_last_Java_frame(Register ja
get_thread(java_thread);
}
// we must set sp to zero to clear frame
- movptr(Address(java_thread, JavaThread::last_Java_sp_offset()), (int32_t)NULL_WORD);
+ movptr(Address(java_thread, JavaThread::last_Java_sp_offset()), NULL_WORD);
if (clear_fp) {
- movptr(Address(java_thread, JavaThread::last_Java_fp_offset()), (int32_t)NULL_WORD);
+ movptr(Address(java_thread, JavaThread::last_Java_fp_offset()), NULL_WORD);
}
if (clear_pc)
- movptr(Address(java_thread, JavaThread::last_Java_pc_offset()), (int32_t)NULL_WORD);
+ movptr(Address(java_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
}

12
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_c1_LIRAssembler_x86_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_c1_LIRAssembler_x86_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Sun Dec 28 19:22:14 2008
@@ -779,7 +779,7 @@ void LIR_Assembler::const2mem(LIR_Opr src, LIR_Opr des
case T_OBJECT: // fall through
case T_ARRAY:
if (c->as_jobject() == NULL) {
- __ movptr(as_Address(addr), (int32_t)NULL_WORD);
+ __ movptr(as_Address(addr), NULL_WORD);
} else {
if (is_literal_address(addr)) {
ShouldNotReachHere();

78
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_c1_Runtime1_x86_cpp Normal file
View File

@ -0,0 +1,78 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_c1_Runtime1_x86_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Tue Dec 30 08:16:21 2008
@@ -78,10 +78,10 @@ int StubAssembler::call_RT(Register oop_result1, Regis
movptr(rax, Address(thread, Thread::pending_exception_offset()));
// make sure that the vm_results are cleared
if (oop_result1->is_valid()) {
- movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
+ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
}
if (oop_result2->is_valid()) {
- movptr(Address(thread, JavaThread::vm_result_2_offset()), (int32_t)NULL_WORD);
+ movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD);
}
if (frame_size() == no_frame_size) {
leave();
@@ -96,12 +96,12 @@ int StubAssembler::call_RT(Register oop_result1, Regis
// get oop results if there are any and reset the values in the thread
if (oop_result1->is_valid()) {
movptr(oop_result1, Address(thread, JavaThread::vm_result_offset()));
- movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
+ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
verify_oop(oop_result1);
}
if (oop_result2->is_valid()) {
movptr(oop_result2, Address(thread, JavaThread::vm_result_2_offset()));
- movptr(Address(thread, JavaThread::vm_result_2_offset()), (int32_t)NULL_WORD);
+ movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD);
verify_oop(oop_result2);
}
return call_offset;
@@ -728,8 +728,8 @@ void Runtime1::generate_handle_exception(StubAssembler
// clear exception fields in JavaThread because they are no longer needed
// (fields must be cleared because they are processed by GC otherwise)
- __ movptr(Address(thread, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);
- __ movptr(Address(thread, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(thread, JavaThread::exception_oop_offset()), NULL_WORD);
+ __ movptr(Address(thread, JavaThread::exception_pc_offset()), NULL_WORD);
// pop the stub frame off
__ leave();
@@ -878,7 +878,7 @@ OopMapSet* Runtime1::generate_patching(StubAssembler*
// load and clear pending exception
__ movptr(rax, Address(thread, Thread::pending_exception_offset()));
- __ movptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
// check that there is really a valid exception
__ verify_not_null_oop(rax);
@@ -971,14 +971,14 @@ OopMapSet* Runtime1::generate_code_for(StubID id, Stub
// load pending exception oop into rax,
__ movptr(exception_oop, Address(thread, Thread::pending_exception_offset()));
// clear pending exception
- __ movptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(thread, Thread::pending_exception_offset()), NULL_WORD);
// load issuing PC (the return address for this stub) into rdx
__ movptr(exception_pc, Address(rbp, 1*BytesPerWord));
// make sure that the vm_results are cleared (may be unnecessary)
- __ movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
- __ movptr(Address(thread, JavaThread::vm_result_2_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
+ __ movptr(Address(thread, JavaThread::vm_result_2_offset()), NULL_WORD);
// verify that that there is really a valid exception in rax,
__ verify_not_null_oop(exception_oop);
@@ -1393,7 +1393,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, Stub
__ ret(0);
__ bind(miss);
- __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), 0); // result
+ __ movptr(Address(rsp, (super_off) * VMRegImpl::stack_slot_size), NULL_WORD); // result
__ pop(rax);
__ pop(rcx);
__ pop(rsi);

62
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_cpp Normal file
View File

@ -0,0 +1,62 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp Tue Dec 30 00:12:45 2008
@@ -133,7 +133,7 @@ void InterpreterMacroAssembler::load_earlyret_value(To
+ in_ByteSize(wordSize));
switch (state) {
case atos: movptr(rax, oop_addr);
- movptr(oop_addr, (int32_t)NULL_WORD);
+ movptr(oop_addr, NULL_WORD);
verify_oop(rax, state); break;
case ltos:
movl(rdx, val_addr1); // fall through
@@ -148,8 +148,8 @@ void InterpreterMacroAssembler::load_earlyret_value(To
}
// Clean up tos value in the thread object
movl(tos_addr, (int32_t) ilgl);
- movptr(val_addr, (int32_t)NULL_WORD);
- NOT_LP64(movl(val_addr1, (int32_t)NULL_WORD));
+ movptr(val_addr, NULL_WORD);
+ NOT_LP64(movptr(val_addr1, NULL_WORD));
}
@@ -470,10 +470,10 @@ void InterpreterMacroAssembler::store_ptr_and_tag(int
void InterpreterMacroAssembler::tag_local(frame::Tag tag, int n) {
if (TaggedStackInterpreter) {
if (tag == frame::TagCategory2) {
- movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (int32_t)frame::TagValue);
- movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)frame::TagValue);
+ movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n+1)), (intptr_t)frame::TagValue);
+ movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)frame::TagValue);
} else {
- movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (int32_t)tag);
+ movptr(Address(rdi, Interpreter::local_tag_offset_in_bytes(n)), (intptr_t)tag);
}
}
}
@@ -482,12 +482,12 @@ void InterpreterMacroAssembler::tag_local(frame::Tag t
if (TaggedStackInterpreter) {
if (tag == frame::TagCategory2) {
movptr(Address(rdi, idx, Interpreter::stackElementScale(),
- Interpreter::local_tag_offset_in_bytes(1)), (int32_t)frame::TagValue);
+ Interpreter::local_tag_offset_in_bytes(1)), (intptr_t)frame::TagValue);
movptr(Address(rdi, idx, Interpreter::stackElementScale(),
- Interpreter::local_tag_offset_in_bytes(0)), (int32_t)frame::TagValue);
+ Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)frame::TagValue);
} else {
movptr(Address(rdi, idx, Interpreter::stackElementScale(),
- Interpreter::local_tag_offset_in_bytes(0)), (int32_t)tag);
+ Interpreter::local_tag_offset_in_bytes(0)), (intptr_t)tag);
}
}
}
@@ -944,7 +944,7 @@ void InterpreterMacroAssembler::unlock_object(Register
movptr(obj_reg, Address(lock_reg, BasicObjectLock::obj_offset_in_bytes ()));
// Free entry
- movptr(Address(lock_reg, BasicObjectLock::obj_offset_in_bytes()), (int32_t)NULL_WORD);
+ movptr(Address(lock_reg, BasicObjectLock::obj_offset_in_bytes()), NULL_WORD);
if (UseBiasedLocking) {
biased_locking_exit(obj_reg, header_reg, done);

12
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_hpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_interp_masm_x86_32_hpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp Sun Dec 28 19:22:14 2008
@@ -120,7 +120,7 @@ class InterpreterMacroAssembler: public MacroAssembler
void empty_expression_stack() {
movptr(rsp, Address(rbp, frame::interpreter_frame_monitor_block_top_offset * wordSize));
// NULL last_sp until next java call
- movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
+ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
}
// Tagged stack helpers for swap and dup

24
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp.orig Wed Nov 7 15:23:57 2007
+++ hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp Wed Nov 7 15:24:10 2007
@@ -110,7 +110,7 @@ class SlowSignatureHandler: public NativeSignatureIter
virtual void pass_object() {
// pass address of from
intptr_t from_addr = (intptr_t)(_from + Interpreter::local_offset_in_bytes(0));
- *_to++ = (*(intptr_t*)from_addr == 0) ? NULL : from_addr;
+ *_to++ = (*(intptr_t*)from_addr == 0) ? NULL_WORD : from_addr;
debug_only(verify_tag(frame::TagReference));
_from -= Interpreter::stackElementSize();
}
$OpenBSD: patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp Sun Dec 28 19:22:14 2008
@@ -54,7 +54,7 @@ void InterpreterRuntime::SignatureHandlerGenerator::bo
__ cmpptr(Address(from(), Interpreter::local_offset_in_bytes(from_offset)), (int32_t)NULL_WORD); // do not use temp() to avoid AGI
Label L;
__ jcc(Assembler::notZero, L);
- __ movptr(temp(), ((int32_t)NULL_WORD));
+ __ movptr(temp(), NULL_WORD);
__ bind(L);
__ movptr(Address(to(), to_offset * wordSize), temp());
}

29
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_64_cpp
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_64_cpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp.orig Wed Nov 7 15:24:26 2007
+++ hotspot/src/cpu/x86/vm/interpreterRT_x86_64.cpp Wed Nov 7 15:24:43 2007
@@ -334,10 +334,10 @@ class SlowSignatureHandler
debug_only(verify_tag(frame::TagReference));
_from -= Interpreter::stackElementSize();
if (_num_args < Argument::n_int_register_parameters_c-1) {
- *_reg_args++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
+ *_reg_args++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr;
_num_args++;
} else {
- *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
+ *_to++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr;
}
}
@@ -439,10 +439,10 @@ class SlowSignatureHandler
_from -= Interpreter::stackElementSize();
if (_num_int_args < Argument::n_int_register_parameters_c-1) {
- *_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr;
+ *_int_args++ = (*from_addr == 0) ? NULL_WORD : (intptr_t)from_addr;
_num_int_args++;
} else {
- *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
+ *_to++ = (*from_addr == 0) ? NULL_WORD : (intptr_t) from_addr;
}
}

18
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_runtime_x86_32_cpp Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_runtime_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/runtime_x86_32.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/runtime_x86_32.cpp Sun Dec 28 19:22:14 2008
@@ -129,11 +129,11 @@ void OptoRuntime::generate_exception_blob() {
// Get the exception pc in case we are deoptimized
__ movptr(rdx, Address(rcx, JavaThread::exception_pc_offset()));
#ifdef ASSERT
- __ movptr(Address(rcx, JavaThread::exception_handler_pc_offset()), (int32_t)NULL_WORD);
- __ movptr(Address(rcx, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(rcx, JavaThread::exception_handler_pc_offset()), NULL_WORD);
+ __ movptr(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD);
#endif
// Clear the exception oop so GC no longer processes it as a root.
- __ movptr(Address(rcx, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
__ pop(rcx);

68
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_sharedRuntime_x86_32_cpp Normal file
View File

@ -0,0 +1,68 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_sharedRuntime_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Sun Dec 28 19:22:14 2008
@@ -1793,7 +1793,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroA
// reset handle block
__ movptr(rcx, Address(thread, JavaThread::active_handles_offset()));
- __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
+ __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), NULL_WORD);
// Any exception pending?
__ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
@@ -1865,7 +1865,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroA
// Save pending exception around call to VM (which contains an EXCEPTION_MARK)
__ pushptr(Address(thread, in_bytes(Thread::pending_exception_offset())));
- __ movptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
+ __ movptr(Address(thread, in_bytes(Thread::pending_exception_offset())), NULL_WORD);
// should be a peal
@@ -2431,7 +2431,7 @@ void SharedRuntime::generate_deopt_blob() {
__ get_thread(rdi);
__ movptr(rdx, Address(rdi, JavaThread::exception_pc_offset()));
__ movptr(Address(rbp, wordSize), rdx);
- __ movptr(Address(rdi, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(rdi, JavaThread::exception_pc_offset()), NULL_WORD);
#ifdef ASSERT
// verify that there is really an exception oop in JavaThread
@@ -2489,8 +2489,8 @@ void SharedRuntime::generate_deopt_blob() {
__ jcc(Assembler::notEqual, noException);
__ movptr(rax, Address(rcx, JavaThread::exception_oop_offset()));
__ movptr(rdx, Address(rcx, JavaThread::exception_pc_offset()));
- __ movptr(Address(rcx, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);
- __ movptr(Address(rcx, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(rcx, JavaThread::exception_oop_offset()), NULL_WORD);
+ __ movptr(Address(rcx, JavaThread::exception_pc_offset()), NULL_WORD);
__ verify_oop(rax);
@@ -2582,7 +2582,7 @@ void SharedRuntime::generate_deopt_blob() {
rbx); // Make it walkable
#else /* CC_INTERP */
// This value is corrected by layout_activation_impl
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
+ __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
__ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
#endif /* CC_INTERP */
__ movptr(sp_temp, rsp); // pass to next frame
@@ -2802,7 +2802,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
rbx); // Make it walkable
#else /* CC_INTERP */
// This value is corrected by layout_activation_impl
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
+ __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD );
__ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), rbx); // Make it walkable
#endif /* CC_INTERP */
__ movptr(sp_temp, rsp); // pass to next frame
@@ -3020,7 +3020,7 @@ static RuntimeStub* generate_resolve_blob(address dest
// exception pending => remove activation and forward to exception handler
__ get_thread(thread);
- __ movptr(Address(thread, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
__ movptr(rax, Address(thread, Thread::pending_exception_offset()));
__ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));

12
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_32_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Tue Dec 30 08:17:13 2008
@@ -407,7 +407,7 @@ class StubGenerator: public StubCodeGenerator {
__ get_thread(rcx);
__ pop(rdx);
__ movptr(rax, Address(rcx, Thread::pending_exception_offset()));
- __ movptr(Address(rcx, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(rcx, Thread::pending_exception_offset()), NULL_WORD);
#ifdef ASSERT
// make sure exception is set

48
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_64_cpp Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_stubGenerator_x86_64_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Sun Dec 28 19:22:14 2008
@@ -472,7 +472,7 @@ class StubGenerator: public StubCodeGenerator {
// setup rax & rdx, remove return address & clear pending exception
__ pop(rdx);
__ movptr(rax, Address(r15_thread, Thread::pending_exception_offset()));
- __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int)NULL_WORD);
+ __ movptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
#ifdef ASSERT
// make sure exception is set
@@ -954,9 +954,9 @@ class StubGenerator: public StubCodeGenerator {
__ jcc(Assembler::zero, exit); // if obj is NULL it is OK
// Check if the oop is in the right area of memory
__ movptr(c_rarg2, rax);
- __ movptr(c_rarg3, (int64_t) Universe::verify_oop_mask());
+ __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_mask());
__ andptr(c_rarg2, c_rarg3);
- __ movptr(c_rarg3, (int64_t) Universe::verify_oop_bits());
+ __ movptr(c_rarg3, (intptr_t) Universe::verify_oop_bits());
__ cmpptr(c_rarg2, c_rarg3);
__ jcc(Assembler::notZero, error);
@@ -969,9 +969,9 @@ class StubGenerator: public StubCodeGenerator {
__ jcc(Assembler::zero, error); // if klass is NULL it is broken
// Check if the klass is in the right area of memory
__ mov(c_rarg2, rax);
- __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
+ __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
__ andptr(c_rarg2, c_rarg3);
- __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
+ __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
__ cmpptr(c_rarg2, c_rarg3);
__ jcc(Assembler::notZero, error);
@@ -980,9 +980,9 @@ class StubGenerator: public StubCodeGenerator {
__ testptr(rax, rax);
__ jcc(Assembler::zero, error); // if klass' klass is NULL it is broken
// Check if the klass' klass is in the right area of memory
- __ movptr(c_rarg3, (int64_t) Universe::verify_klass_mask());
+ __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_mask());
__ andptr(rax, c_rarg3);
- __ movptr(c_rarg3, (int64_t) Universe::verify_klass_bits());
+ __ movptr(c_rarg3, (intptr_t) Universe::verify_klass_bits());
__ cmpptr(rax, c_rarg3);
__ jcc(Assembler::notZero, error);

84
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_templateInterpreter_x86_32_cpp Normal file
View File

@ -0,0 +1,84 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_templateInterpreter_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp Tue Dec 30 00:30:18 2008
@@ -110,7 +110,7 @@ address TemplateInterpreterGenerator::generate_excepti
if (message != NULL) {
__ lea(rbx, ExternalAddress((address)message));
} else {
- __ movptr(rbx, (int32_t)NULL_WORD);
+ __ movptr(rbx, NULL_WORD);
}
__ call_VM(rax, CAST_FROM_FN_PTR(address, InterpreterRuntime::create_exception), rax, rbx);
}
@@ -123,7 +123,7 @@ address TemplateInterpreterGenerator::generate_excepti
address TemplateInterpreterGenerator::generate_continuation_for(TosState state) {
address entry = __ pc();
// NULL last_sp until next java call
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
+ __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
__ dispatch_next(state);
return entry;
}
@@ -176,7 +176,7 @@ address TemplateInterpreterGenerator::generate_return_
// Restore stack bottom in case i2c adjusted stack
__ movptr(rsp, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
// and NULL it as marker that rsp is now tos until next java call
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
+ __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
__ restore_bcp();
__ restore_locals();
@@ -211,7 +211,7 @@ address TemplateInterpreterGenerator::generate_deopt_e
// The stack is not extended by deopt but we must NULL last_sp as this
// entry is like a "return".
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
+ __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
__ restore_bcp();
__ restore_locals();
// handle exceptions
@@ -382,7 +382,7 @@ void InterpreterGenerator::generate_counter_overflow(L
// indicating if the counter overflow occurs at a backwards branch (non-NULL bcp).
// The call returns the address of the verified entry point for the method or NULL
// if the compilation did not complete (either went background or bailed out).
- __ movptr(rax, (int32_t)false);
+ __ movptr(rax, (intptr_t)false);
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
__ movptr(rbx, Address(rbp, method_offset)); // restore methodOop
@@ -1028,7 +1028,7 @@ address InterpreterGenerator::generate_native_entry(bo
// reset handle block
__ movptr(t, Address(thread, JavaThread::active_handles_offset()));
- __ movptr(Address(t, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
+ __ movptr(Address(t, JNIHandleBlock::top_offset_in_bytes()), NULL_WORD);
// If result was an oop then unbox and save it in the frame
{ Label L;
@@ -1488,7 +1488,7 @@ void TemplateInterpreterGenerator::generate_throw_exce
// Restore sp to interpreter_frame_last_sp even though we are going
// to empty the expression stack for the exception processing.
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
+ __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
// rax,: exception
// rdx: return address/pc that threw exception
__ restore_bcp(); // rsi points to call/send
@@ -1608,7 +1608,7 @@ void TemplateInterpreterGenerator::generate_throw_exce
__ reset_last_Java_frame(rcx, true, true);
// Restore the last_sp and null it out
__ movptr(rsp, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
- __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
+ __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
__ restore_bcp();
__ restore_locals();
@@ -1636,7 +1636,7 @@ void TemplateInterpreterGenerator::generate_throw_exce
// restore exception
__ get_thread(rcx);
__ movptr(rax, Address(rcx, JavaThread::vm_result_offset()));
- __ movptr(Address(rcx, JavaThread::vm_result_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(rcx, JavaThread::vm_result_offset()), NULL_WORD);
__ verify_oop(rax);
// Inbetween activations - previous activation type unknown yet

40
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_templateTable_x86_32_cpp Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_templateTable_x86_32_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp.orig Fri Dec 19 03:42:04 2008
+++ hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp Tue Dec 30 08:19:28 2008
@@ -137,10 +137,10 @@ static void do_oop_store(InterpreterMacroAssembler* _m
// Do the actual store
// noreg means NULL
if (val == noreg) {
- __ movl(Address(rdx, 0), NULL_WORD);
+ __ movptr(Address(rdx, 0), NULL_WORD);
// No post barrier for NULL
} else {
- __ movl(Address(rdx, 0), val);
+ __ movptr(Address(rdx, 0), val);
__ g1_write_barrier_post(rdx, rax, rcx, rbx, rsi);
}
__ restore_bcp();
@@ -152,9 +152,9 @@ static void do_oop_store(InterpreterMacroAssembler* _m
case BarrierSet::CardTableExtension:
{
if (val == noreg) {
- __ movl(obj, NULL_WORD);
+ __ movptr(obj, NULL_WORD);
} else {
- __ movl(obj, val);
+ __ movptr(obj, val);
// flatten object address if needed
if (!precise || (obj.index() == noreg && obj.disp() == 0)) {
__ store_check(obj.base());
@@ -168,9 +168,9 @@ static void do_oop_store(InterpreterMacroAssembler* _m
case BarrierSet::ModRef:
case BarrierSet::Other:
if (val == noreg) {
- __ movl(obj, NULL_WORD);
+ __ movptr(obj, NULL_WORD);
} else {
- __ movl(obj, val);
+ __ movptr(obj, val);
}
break;
default :

48
devel/jdk/1.7/patches/patch-hotspot_src_cpu_x86_vm_x86_32_ad Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_x86_32_ad,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/cpu/x86/vm/x86_32.ad.orig Fri Dec 19 03:42:05 2008
+++ hotspot/src/cpu/x86/vm/x86_32.ad Sun Dec 28 19:22:15 2008
@@ -3371,7 +3371,7 @@ encode %{
masm.movptr(Address(boxReg, 0), 3) ; // results in ST-before-CAS penalty
masm.get_thread (scrReg) ;
masm.movptr(boxReg, tmpReg); // consider: LEA box, [tmp-2]
- masm.movptr(tmpReg, 0); // consider: xor vs mov
+ masm.movptr(tmpReg, NULL_WORD); // consider: xor vs mov
if (os::is_MP()) { masm.lock(); }
masm.cmpxchgptr(scrReg, Address(boxReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;
} else
@@ -3387,7 +3387,7 @@ encode %{
if ((EmitSync & 64) == 0) {
// Optimistic form: consider XORL tmpReg,tmpReg
- masm.movptr(tmpReg, 0 ) ;
+ masm.movptr(tmpReg, NULL_WORD) ;
} else {
// Can suffer RTS->RTO upgrades on shared or cold $ lines
// Test-And-CAS instead of CAS
@@ -3587,7 +3587,7 @@ encode %{
masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ;
masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ;
masm.jccb (Assembler::notZero, DONE_LABEL) ;
- masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
+ masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
masm.jmpb (DONE_LABEL) ;
} else {
masm.xorptr(boxReg, Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2)) ;
@@ -3596,7 +3596,7 @@ encode %{
masm.movptr(boxReg, Address (tmpReg, ObjectMonitor::EntryList_offset_in_bytes()-2)) ;
masm.orptr(boxReg, Address (tmpReg, ObjectMonitor::cxq_offset_in_bytes()-2)) ;
masm.jccb (Assembler::notZero, CheckSucc) ;
- masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
+ masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
masm.jmpb (DONE_LABEL) ;
}
@@ -3644,7 +3644,7 @@ encode %{
// We currently use (3), although it's likely that switching to (2)
// is correct for the future.
- masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), 0) ;
+ masm.movptr(Address (tmpReg, ObjectMonitor::owner_offset_in_bytes()-2), NULL_WORD) ;
if (os::is_MP()) {
if (VM_Version::supports_sse2() && 1 == FenceInstruction) {
masm.mfence();

16
devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_hpi_bsd_hpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_os_bsd_vm_hpi_bsd_hpp,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os/bsd/vm/hpi_bsd.hpp.orig Wed Nov 7 12:41:29 2007
+++ hotspot/src/os/bsd/vm/hpi_bsd.hpp Wed Nov 7 12:55:54 2007
$OpenBSD: patch-hotspot_src_os_bsd_vm_hpi_bsd_hpp,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/os/bsd/vm/hpi_bsd.hpp.orig Sat Aug 2 16:12:29 2008
+++ hotspot/src/os/bsd/vm/hpi_bsd.hpp Sat Aug 2 16:12:52 2008
@@ -36,26 +36,22 @@
// HPI_FileInterface
@ -45,8 +45,8 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_hpi_bsd_hpp,v 1.2 2008/03/19 18:05:43 kurt
+ INTERRUPTIBLE_RETURN_INT(::send(fd, buf, nBytes, (unsigned int) flags), os::Bsd::clear_interrupted);
}
inline int hpi::timeout(int fd, long timeout) {
@@ -79,11 +75,12 @@ inline int hpi::timeout(int fd, long timeout) {
inline int hpi::raw_send(int fd, char *buf, int nBytes, int flags) {
@@ -83,11 +79,12 @@ inline int hpi::timeout(int fd, long timeout) {
for(;;) {
struct pollfd pfd;
@ -60,7 +60,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_hpi_bsd_hpp,v 1.2 2008/03/19 18:05:43 kurt
if (res == OS_ERR && errno == EINTR) {
@@ -107,7 +104,26 @@ inline int hpi::listen(int fd, int count) {
@@ -111,7 +108,26 @@ inline int hpi::listen(int fd, int count) {
}
inline int hpi::connect(int fd, struct sockaddr *him, int len) {
@ -88,7 +88,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_hpi_bsd_hpp,v 1.2 2008/03/19 18:05:43 kurt
}
inline int hpi::accept(int fd, struct sockaddr *him, int *len) {
@@ -118,26 +134,32 @@ inline int hpi::accept(int fd, struct sockaddr *him, i
@@ -122,26 +138,32 @@ inline int hpi::accept(int fd, struct sockaddr *him, i
// to 64 bits on some platform that we support.
// Bsd doc says this can't return EINTR, unlike accept() on Solaris
@ -127,7 +127,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_hpi_bsd_hpp,v 1.2 2008/03/19 18:05:43 kurt
}
@@ -164,7 +186,7 @@ HPIDECL(bind, "bind", _socket, Bind,
@@ -168,7 +190,7 @@ HPIDECL(bind, "bind", _socket, Bind,
(fd, him, len));
*/
inline int hpi::bind(int fd, struct sockaddr *him, int len){

174
devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Tue Aug 5 21:06:35 2008
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Tue Aug 5 21:10:17 2008
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.7 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Wed Dec 24 10:02:07 2008
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Wed Dec 24 10:02:13 2008
@@ -47,13 +47,26 @@
# include <semaphore.h>
# include <fcntl.h>
@ -48,15 +48,15 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
bool os::Bsd::_is_floating_stack = false;
bool os::Bsd::_is_NPTL = false;
bool os::Bsd::_supports_fast_thread_cpu_time = false;
char * os::Bsd::_glibc_version = NULL;
char * os::Bsd::_libpthread_version = NULL;
const char * os::Bsd::_glibc_version = NULL;
const char * os::Bsd::_libpthread_version = NULL;
+#endif
static jlong initial_time_count=0;
@@ -94,6 +113,76 @@ static pid_t _initial_pid = 0;
static int SR_signum = SIGUSR2;
sigset_t SR_sigset;
@@ -97,6 +116,76 @@ sigset_t SR_sigset;
/* Used to protect dlsym() calls */
static pthread_mutex_t dl_mutex;
+#ifdef _ALLBSD_SOURCE
+// XXXBSD: ported from solaris version
@ -131,7 +131,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
////////////////////////////////////////////////////////////////////////////////
// utility functions
@@ -105,11 +194,16 @@ julong os::available_memory() {
@@ -108,11 +197,16 @@ julong os::available_memory() {
}
julong os::Bsd::available_memory() {
@ -148,7 +148,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
julong os::physical_memory() {
@@ -143,6 +237,7 @@ bool os::have_special_privileges() {
@@ -160,6 +254,7 @@ bool os::have_special_privileges() {
}
@ -156,7 +156,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
#ifndef SYS_gettid
// i386: 224, ia64: 1105, amd64: 186, sparc 143
#ifdef __ia64__
@@ -157,6 +252,7 @@ bool os::have_special_privileges() {
@@ -174,6 +269,7 @@ bool os::have_special_privileges() {
#error define gettid for the arch
#endif
#endif
@ -164,7 +164,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// Cpu architecture string
#if defined(IA64)
@@ -176,6 +272,7 @@ static char cpu_arch[] = "sparc";
@@ -193,6 +289,7 @@ static char cpu_arch[] = "sparc";
#endif
@ -172,10 +172,10 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// pid_t gettid()
//
// Returns the kernel thread id of the currently running thread. Kernel
@@ -202,8 +299,48 @@ static bool unsafe_chroot_detected = false;
static char *unstable_chroot_error = "/proc file system not found.\n"
"Java may be unstable running multithreaded in a chroot "
"environment on Bsd when /proc filesystem is not mounted.";
@@ -219,8 +316,48 @@ static bool unsafe_chroot_detected = false;
static const char *unstable_chroot_error = "/proc file system not found.\n"
"Java may be unstable running multithreaded in a chroot "
"environment on Bsd when /proc filesystem is not mounted.";
+#endif
+#ifdef _ALLBSD_SOURCE
@ -221,7 +221,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
_processor_count = sysconf(_SC_NPROCESSORS_CONF);
if (_processor_count == 1) {
pid_t pid = os::Bsd::gettid();
@@ -219,6 +356,7 @@ void os::Bsd::initialize_system_info() {
@@ -236,6 +373,7 @@ void os::Bsd::initialize_system_info() {
_physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
assert(_processor_count > 0, "bsd error");
}
@ -229,7 +229,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
void os::init_system_properties_values() {
// char arch[12];
@@ -262,7 +400,9 @@ void os::init_system_properties_values() {
@@ -279,7 +417,9 @@ void os::init_system_properties_values() {
* ...
* 7: The default directories, normally /lib and /usr/lib.
*/
@ -239,7 +239,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
#define EXTENSIONS_DIR "/lib/ext"
#define ENDORSED_DIR "/lib/endorsed"
@@ -498,6 +638,7 @@ void os::Bsd::hotspot_sigmask(Thread* thread) {
@@ -515,6 +655,7 @@ void os::Bsd::hotspot_sigmask(Thread* thread) {
}
}
@ -247,7 +247,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
//////////////////////////////////////////////////////////////////////////////
// detecting pthread library
@@ -664,6 +805,7 @@ bool os::Bsd::manually_expand_stack(JavaThread * t, ad
@@ -678,6 +819,7 @@ bool os::Bsd::manually_expand_stack(JavaThread * t, ad
}
return false;
}
@ -255,7 +255,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
//////////////////////////////////////////////////////////////////////////////
// create new thread
@@ -672,6 +814,9 @@ static address highest_vm_reserved_address();
@@ -686,6 +828,9 @@ static address highest_vm_reserved_address();
// check if it's safe to start a new thread
static bool _thread_safety_check(Thread* thread) {
@ -265,7 +265,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack()) {
// Fixed stack BsdThreads (SuSE Bsd/x86, and some versions of Redhat)
// Heap is mmap'ed at lower end of memory space. Thread stacks are
@@ -705,6 +850,7 @@ static bool _thread_safety_check(Thread* thread) {
@@ -719,6 +864,7 @@ static bool _thread_safety_check(Thread* thread) {
// here, that means enough space has been reserved for stack.
return true;
}
@ -273,7 +273,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
// Thread start routine for all newly created threads
@@ -732,6 +878,10 @@ static void *java_start(Thread *thread) {
@@ -746,6 +892,10 @@ static void *java_start(Thread *thread) {
return NULL;
}
@ -284,7 +284,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// thread_id is kernel thread id (similar to Solaris LWP id)
osthread->set_thread_id(os::Bsd::gettid());
@@ -741,6 +891,7 @@ static void *java_start(Thread *thread) {
@@ -755,6 +905,7 @@ static void *java_start(Thread *thread) {
thread->set_lgrp_id(lgrp_id);
}
}
@ -292,7 +292,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// initialize signal mask for this thread
os::Bsd::hotspot_sigmask(thread);
@@ -821,17 +972,22 @@ bool os::create_thread(Thread* thread, ThreadType thr_
@@ -835,17 +986,22 @@ bool os::create_thread(Thread* thread, ThreadType thr_
// let pthread_create() pick the default value.
}
@ -315,7 +315,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
pthread_t tid;
int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
@@ -845,7 +1001,9 @@ bool os::create_thread(Thread* thread, ThreadType thr_
@@ -859,7 +1015,9 @@ bool os::create_thread(Thread* thread, ThreadType thr_
// Need to clean up stuff we've allocated so far
thread->set_osthread(NULL);
delete osthread;
@ -325,7 +325,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
return false;
}
@@ -861,9 +1019,11 @@ bool os::create_thread(Thread* thread, ThreadType thr_
@@ -875,9 +1033,11 @@ bool os::create_thread(Thread* thread, ThreadType thr_
}
}
@ -337,7 +337,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
// Aborted due to thread limit being reached
@@ -901,7 +1061,11 @@ bool os::create_attached_thread(JavaThread* thread) {
@@ -915,7 +1075,11 @@ bool os::create_attached_thread(JavaThread* thread) {
}
// Store pthread info into the OSThread
@ -349,7 +349,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
osthread->set_pthread_id(::pthread_self());
// initialize floating point control register
@@ -912,6 +1076,7 @@ bool os::create_attached_thread(JavaThread* thread) {
@@ -926,6 +1090,7 @@ bool os::create_attached_thread(JavaThread* thread) {
thread->set_osthread(osthread);
@ -357,7 +357,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (UseNUMA) {
int lgrp_id = os::numa_get_group_id();
if (lgrp_id != -1) {
@@ -938,6 +1103,7 @@ bool os::create_attached_thread(JavaThread* thread) {
@@ -952,6 +1117,7 @@ bool os::create_attached_thread(JavaThread* thread) {
os::Bsd::manually_expand_stack(jt, addr);
osthread->clear_expanding_stack();
}
@ -365,7 +365,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// initialize signal mask for this thread
// and save the caller's signal mask
@@ -996,6 +1162,7 @@ extern "C" Thread* get_thread() {
@@ -1010,6 +1176,7 @@ extern "C" Thread* get_thread() {
//////////////////////////////////////////////////////////////////////////////
// initial thread
@ -373,7 +373,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// Check if current thread is the initial thread, similar to Solaris thr_main.
bool os::Bsd::is_initial_thread(void) {
char dummy;
@@ -1226,6 +1393,7 @@ void os::Bsd::capture_initial_stack(size_t max_size) {
@@ -1240,6 +1407,7 @@ void os::Bsd::capture_initial_stack(size_t max_size) {
_initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size());
_initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size;
}
@ -381,7 +381,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
////////////////////////////////////////////////////////////////////////////////
// time support
@@ -1264,7 +1432,18 @@ jlong os::javaTimeMillis() {
@@ -1283,7 +1451,18 @@ jlong os::javaTimeMillis() {
#define CLOCK_MONOTONIC (1)
#endif
@ -400,7 +400,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// we do dlopen's in this particular order due to bug in bsd
// dynamical loader (see 6348968) leading to crash on exit
void* handle = dlopen("librt.so.1", RTLD_LAZY);
@@ -1299,7 +1478,9 @@ void os::Bsd::clock_init() {
@@ -1318,7 +1497,9 @@ void os::Bsd::clock_init() {
}
}
}
@ -410,7 +410,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
#ifndef SYS_clock_getres
#if defined(IA32) || defined(AMD64)
@@ -1338,6 +1519,7 @@ void os::Bsd::fast_thread_clock_init() {
@@ -1357,6 +1538,7 @@ void os::Bsd::fast_thread_clock_init() {
_pthread_getcpuclockid = pthread_getcpuclockid_func;
}
}
@ -418,7 +418,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
jlong os::javaTimeNanos() {
if (Bsd::supports_monotonic_clock()) {
@@ -1525,6 +1707,23 @@ bool os::dll_address_to_function_name(address addr, ch
@@ -1562,6 +1744,23 @@ bool os::dll_address_to_function_name(address addr, ch
}
}
@ -442,7 +442,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
struct _address_to_library_name {
address addr; // input : memory address
size_t buflen; // size of fname
@@ -1599,6 +1798,7 @@ bool os::dll_address_to_library_name(address addr, cha
@@ -1636,6 +1835,7 @@ bool os::dll_address_to_library_name(address addr, cha
return false;
}
}
@ -450,7 +450,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// Loads .dll/.so and
// in case of error it checks if .dll/.so was built for the
@@ -1656,6 +1856,18 @@ void * os::dll_load(const char *filename, char *ebuf,
@@ -1693,6 +1893,18 @@ void * os::dll_load(const char *filename, char *ebuf,
#define EM_486 6 /* Intel 80486 */
#endif
@ -469,7 +469,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
static const arch_t arch_array[]={
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
{EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
@@ -1759,7 +1971,41 @@ bool _print_ascii_file(const char* filename, outputStr
@@ -1806,7 +2018,41 @@ bool _print_ascii_file(const char* filename, outputStr
void os::print_dll_info(outputStream *st) {
st->print_cr("Dynamic libraries:");
@ -511,7 +511,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
char fname[32];
pid_t pid = os::Bsd::gettid();
@@ -1768,6 +2014,7 @@ void os::print_dll_info(outputStream *st) {
@@ -1815,6 +2061,7 @@ void os::print_dll_info(outputStream *st) {
if (!_print_ascii_file(fname, st)) {
st->print("Can not get library information for pid = %d\n", pid);
}
@ -519,7 +519,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
@@ -1800,6 +2047,7 @@ void os::print_os_info(outputStream* st) {
@@ -1847,6 +2094,7 @@ void os::print_os_info(outputStream* st) {
st->print(name.machine);
st->cr();
@ -527,7 +527,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// Print warning if unsafe chroot environment detected
if (unsafe_chroot_detected) {
st->print("WARNING!! ");
@@ -1814,6 +2062,7 @@ void os::print_os_info(outputStream* st) {
@@ -1861,6 +2109,7 @@ void os::print_os_info(outputStream* st) {
st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed");
}
st->cr();
@ -535,7 +535,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// rlimit
st->print("rlimit:");
@@ -1839,6 +2088,7 @@ void os::print_os_info(outputStream* st) {
@@ -1886,6 +2135,7 @@ void os::print_os_info(outputStream* st) {
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@ -543,7 +543,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
st->print(", AS ");
getrlimit(RLIMIT_AS, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
@@ -1851,6 +2101,7 @@ void os::print_os_info(outputStream* st) {
@@ -1898,6 +2148,7 @@ void os::print_os_info(outputStream* st) {
os::loadavg(loadavg, 3);
st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]);
st->cr();
@ -551,7 +551,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
void os::print_memory_info(outputStream* st) {
@@ -1858,18 +2109,22 @@ void os::print_memory_info(outputStream* st) {
@@ -1905,18 +2156,22 @@ void os::print_memory_info(outputStream* st) {
st->print("Memory:");
st->print(" %dk page", os::vm_page_size()>>10);
@ -574,7 +574,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
st->cr();
}
@@ -2209,10 +2464,15 @@ void bsd_wrap_code(char* base, size_t size) {
@@ -2256,10 +2511,15 @@ void bsd_wrap_code(char* base, size_t size) {
// left at the time of mmap(). This could be a potential
// problem.
bool os::commit_memory(char* addr, size_t size) {
@ -590,8 +590,8 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
bool os::commit_memory(char* addr, size_t size, size_t alignment_hint) {
@@ -2243,10 +2503,15 @@ char *os::scan_pages(char *start, char* end, page_info
}
@@ -2403,10 +2663,15 @@ os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_
unsigned long* os::Bsd::_numa_all_nodes;
bool os::uncommit_memory(char* addr, size_t size) {
+#ifdef __OpenBSD__
@ -606,7 +606,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
static address _highest_vm_reserved_address = NULL;
@@ -2336,6 +2601,9 @@ bool os::unguard_memory(char* addr, size_t size) {
@@ -2508,6 +2773,9 @@ bool os::unguard_memory(char* addr, size_t size) {
static size_t _large_page_size = 0;
bool os::large_page_init() {
@ -616,7 +616,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (!UseLargePages) return false;
if (LargePageSizeInBytes) {
@@ -2390,6 +2658,7 @@ bool os::large_page_init() {
@@ -2562,6 +2830,7 @@ bool os::large_page_init() {
// We optimistically assume the support is available. If later it turns out
// not true, VM will automatically switch to use regular page size.
return true;
@ -624,7 +624,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
#ifndef SHM_HUGETLB
@@ -2560,7 +2829,7 @@ char* os::attempt_reserve_memory_at(size_t bytes, char
@@ -2736,7 +3005,7 @@ char* os::attempt_reserve_memory_at(size_t bytes, char
}
size_t os::read(int fd, void *buf, unsigned int nBytes) {
@ -633,7 +633,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
// TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
@@ -2696,9 +2965,28 @@ void os::loop_breaker(int attempts) {
@@ -2872,9 +3141,28 @@ void os::loop_breaker(int attempts) {
// this reason, the code should not be used as default (ThreadPriorityPolicy=0).
// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
@ -662,7 +662,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
4, // 1 MinPriority
3, // 2
2, // 3
@@ -2713,6 +3001,7 @@ int os::java_to_os_priority[MaxPriority + 1] = {
@@ -2889,6 +3177,7 @@ int os::java_to_os_priority[MaxPriority + 1] = {
-5 // 10 MaxPriority
};
@ -670,7 +670,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
static int prio_init() {
if (ThreadPriorityPolicy == 1) {
@@ -2732,8 +3021,17 @@ static int prio_init() {
@@ -2908,8 +3197,17 @@ static int prio_init() {
OSReturn os::set_native_priority(Thread* thread, int newpri) {
if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
@ -688,7 +688,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
@@ -2743,7 +3041,11 @@ OSReturn os::get_native_priority(const Thread* const t
@@ -2919,7 +3217,11 @@ OSReturn os::get_native_priority(const Thread* const t
}
errno = 0;
@ -700,7 +700,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
}
@@ -2853,7 +3155,7 @@ static int SR_initialize() {
@@ -3029,7 +3331,7 @@ static int SR_initialize() {
/* Get signal number to use for suspend/resume */
if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
int sig = ::strtol(s, 0, 10);
@ -709,7 +709,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
SR_signum = sig;
}
}
@@ -3216,6 +3518,7 @@ void os::Bsd::install_signal_handlers() {
@@ -3392,6 +3694,7 @@ void os::Bsd::install_signal_handlers() {
}
}
@ -717,7 +717,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// This is the fastest way to get thread cpu time on Bsd.
// Returns cpu time (user+sys) for any thread, not only for current.
// POSIX compliant clocks are implemented in the kernels 2.6.16+.
@@ -3230,6 +3533,7 @@ jlong os::Bsd::fast_thread_cpu_time(clockid_t clockid)
@@ -3406,6 +3709,7 @@ jlong os::Bsd::fast_thread_cpu_time(clockid_t clockid)
return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
}
@ -725,7 +725,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
/////
// glibc on Bsd platform uses non-documented flag
@@ -3451,13 +3755,13 @@ void os::init(void) {
@@ -3627,13 +3931,13 @@ void os::init(void) {
_initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
@ -741,7 +741,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (Bsd::page_size() == -1) {
fatal1("os_bsd.cpp: os::init: sysconf failed (%s)", strerror(errno));
}
@@ -3482,7 +3786,9 @@ extern "C" {
@@ -3659,7 +3963,9 @@ extern "C" {
// this is called _after_ the global arguments have been parsed
jint os::init_2(void)
{
@ -751,7 +751,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// Allocate a single page and mark it as readable for safepoint polling
address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
@@ -3531,6 +3837,7 @@ jint os::init_2(void)
@@ -3708,6 +4014,7 @@ jint os::init_2(void)
JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
vm_page_size()));
@ -759,15 +759,15 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
Bsd::libpthread_init();
@@ -3539,6 +3846,7 @@ jint os::init_2(void)
@@ -3716,6 +4023,7 @@ jint os::init_2(void)
Bsd::glibc_version(), Bsd::libpthread_version(),
Bsd::is_floating_stack() ? "floating stack" : "fixed stack");
}
+#endif
if (MaxFDLimit) {
// set the number of file descriptors to max. print out error
@@ -3558,8 +3866,10 @@ jint os::init_2(void)
if (UseNUMA) {
if (!Bsd::libnuma_init()) {
@@ -3749,8 +4057,10 @@ jint os::init_2(void)
}
}
@ -778,7 +778,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// Initialize HPI.
jint hpi_result = hpi::initialize();
@@ -3606,11 +3916,15 @@ void os::make_polling_page_readable(void) {
@@ -3798,11 +4108,15 @@ void os::make_polling_page_readable(void) {
};
int os::active_processor_count() {
@ -794,7 +794,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
bool os::distribute_processes(uint length, uint* distribution) {
@@ -3652,6 +3966,9 @@ ExtendedPC os::get_thread_pc(Thread* thread) {
@@ -3844,6 +4158,9 @@ ExtendedPC os::get_thread_pc(Thread* thread) {
int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
{
@ -804,7 +804,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (is_NPTL()) {
return pthread_cond_timedwait(_cond, _mutex, _abstime);
} else {
@@ -3667,6 +3984,7 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond
@@ -3859,6 +4176,7 @@ int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond
#endif // IA64
return status;
}
@ -812,7 +812,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
////////////////////////////////////////////////////////////////////////////////
@@ -3802,17 +4120,17 @@ int os::create_binary_file(const char* path, bool rewr
@@ -3994,17 +4312,17 @@ int os::create_binary_file(const char* path, bool rewr
if (!rewrite_existing) {
oflags |= O_EXCL;
}
@ -833,7 +833,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
// Map a block of memory.
@@ -3862,6 +4180,7 @@ bool os::unmap_memory(char* addr, size_t bytes) {
@@ -4054,6 +4372,7 @@ bool os::unmap_memory(char* addr, size_t bytes) {
return munmap(addr, bytes) == 0;
}
@ -841,7 +841,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
static clockid_t thread_cpu_clockid(Thread* thread) {
@@ -3873,6 +4192,7 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
@@ -4065,6 +4384,7 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
return clockid;
}
@ -849,7 +849,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
// are used by JVM M&M and JVMTI to get user+sys or user CPU time
@@ -3882,39 +4202,48 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
@@ -4074,39 +4394,48 @@ static clockid_t thread_cpu_clockid(Thread* thread) {
// the fast estimate available on the platform.
jlong os::current_thread_cpu_time() {
@ -898,7 +898,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
//
// -1 on error.
//
@@ -4003,6 +4332,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool
@@ -4195,6 +4524,7 @@ static jlong slow_thread_cpu_time(Thread *thread, bool
return (jlong)user_time * (1000000000 / clock_tics_per_sec);
}
}
@ -906,7 +906,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits
@@ -4019,7 +4349,11 @@ void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr
@@ -4211,7 +4541,11 @@ void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr
}
bool os::is_thread_cpu_time_supported() {
@ -918,7 +918,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
}
// System loadavg support. Returns -1 if load average cannot be obtained.
@@ -4152,7 +4486,7 @@ jdk_pthread_sigmask(int how , const sigset_t* newmask,
@@ -4344,7 +4678,7 @@ jdk_pthread_sigmask(int how , const sigset_t* newmask,
// abstime will be the absolute timeout time
// TODO: replace compute_abstime() with unpackTime()
@ -927,7 +927,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (millis < 0) millis = 0;
struct timeval now;
int status = gettimeofday(&now, NULL);
@@ -4204,7 +4538,7 @@ void os::PlatformEvent::park() { // AKA "down()"
@@ -4396,7 +4730,7 @@ void os::PlatformEvent::park() { // AKA "down()"
status = pthread_cond_wait(_cond, _mutex);
// for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
// Treat this the same as if the wait was interrupted
@ -936,7 +936,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
assert_status(status == 0 || status == EINTR, status, "cond_wait");
}
-- _nParked ;
@@ -4262,10 +4596,10 @@ int os::PlatformEvent::park(jlong millis) {
@@ -4454,10 +4788,10 @@ int os::PlatformEvent::park(jlong millis) {
pthread_cond_init (_cond, NULL) ;
}
assert_status(status == 0 || status == EINTR ||
@ -949,7 +949,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// We consume and ignore EINTR and spurious wakeups.
}
--_nParked ;
@@ -4357,7 +4691,7 @@ void os::PlatformEvent::unpark() {
@@ -4549,7 +4883,7 @@ void os::PlatformEvent::unpark() {
* years from "now".
*/
@ -958,7 +958,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
assert (time > 0, "convertTime");
struct timeval now;
@@ -4416,7 +4750,7 @@ void Parker::park(bool isAbsolute, jlong time) {
@@ -4608,7 +4942,7 @@ void Parker::park(bool isAbsolute, jlong time) {
}
// Next, demultiplex/decode time arguments
@ -967,7 +967,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (time < 0) { // don't wait at all
return;
}
@@ -4469,7 +4803,7 @@ void Parker::park(bool isAbsolute, jlong time) {
@@ -4661,7 +4995,7 @@ void Parker::park(bool isAbsolute, jlong time) {
}
}
assert_status(status == 0 || status == EINTR ||
@ -976,7 +976,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
status, "cond_timedwait");
#ifdef ASSERT
@@ -4513,14 +4847,6 @@ void Parker::unpark() {
@@ -4705,28 +5039,19 @@ void Parker::unpark() {
extern char** environ;
@ -991,7 +991,13 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
// Run the specified command in a separate process. Return its exit value,
// or -1 on failure (e.g. can't fork a new process).
// Unlike system(), this function can be called from signal handler. It
@@ -4537,8 +4863,7 @@ int os::fork_and_exec(char* cmd) {
// doesn't block SIGINT et al.
int os::fork_and_exec(char* cmd) {
- const char * argv[4] = {"sh", "-c", cmd, NULL};
+ char * const argv[4] = {"sh", "-c", cmd, NULL};
// fork() in BsdThreads/NPTL is not async-safe. It needs to run
// pthread_atfork handlers and reset pthread library. All we need is a
// separate process to execve. Make a direct syscall to fork process.
// On IA64 there's no fork syscall, we have to use fork() and hope for
// the best...
@ -1001,12 +1007,12 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.6 2008/10/22 16:02:24 kurt
if (pid < 0) {
// fork failed
@@ -4554,8 +4879,7 @@ int os::fork_and_exec(char* cmd) {
@@ -4742,8 +5067,7 @@ int os::fork_and_exec(char* cmd) {
// in the new process, so make a system call directly.
// IA64 should use normal execve() from glibc to match the glibc fork()
// above.
- NOT_IA64(syscall(__NR_execve, "/bin/sh", argv, environ);)
- IA64_ONLY(execve("/bin/sh", argv, environ);)
- IA64_ONLY(execve("/bin/sh", (char* const*)argv, environ);)
+ execve("/bin/sh", argv, environ);
// execve failed

35
devel/jdk/1.7/patches/patch-hotspot_src_os_bsd_vm_os_bsd_hpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.hpp.orig Wed Nov 7 12:41:29 2007
+++ hotspot/src/os/bsd/vm/os_bsd.hpp Wed Nov 7 12:41:35 2007
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.4 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.hpp.orig Wed Dec 24 10:02:07 2008
+++ hotspot/src/os/bsd/vm/os_bsd.hpp Wed Dec 24 10:04:07 2008
@@ -47,6 +47,7 @@ class Bsd {
static int sigflags[MAXSIGNUM];
@ -9,13 +9,15 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.3 2008/03/19 18:05:43 kurt
static int (*_pthread_getcpuclockid)(pthread_t, clockid_t *);
static address _initial_thread_stack_bottom;
@@ -58,42 +59,78 @@ class Bsd {
@@ -58,6 +59,7 @@ class Bsd {
static bool _is_floating_stack;
static bool _is_NPTL;
static bool _supports_fast_thread_cpu_time;
+#endif
protected:
static GrowableArray<int>* _cpu_to_node;
@@ -65,38 +67,73 @@ class Bsd {
static julong _physical_memory;
static pthread_t _main_thread;
@ -29,8 +31,8 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.3 2008/03/19 18:05:43 kurt
static void initialize_system_info();
+#ifndef _ALLBSD_SOURCE
static void set_glibc_version(char *s) { _glibc_version = s; }
static void set_libpthread_version(char *s) { _libpthread_version = s; }
static void set_glibc_version(const char *s) { _glibc_version = s; }
static void set_libpthread_version(const char *s) { _libpthread_version = s; }
+#endif
static bool supports_variable_stack_size();
@ -41,8 +43,9 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.3 2008/03/19 18:05:43 kurt
static void set_is_floating_stack() { _is_floating_stack = true; }
+#endif
static void rebuild_cpu_to_node_map();
static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
public:
+#ifdef _ALLBSD_SOURCE
+//XXXBSD: ported from solaris version
+ enum {
@ -88,23 +91,23 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.3 2008/03/19 18:05:43 kurt
static bool is_initial_thread(void);
static int page_size(void) { return _page_size; }
@@ -130,6 +167,7 @@ class Bsd {
@@ -133,6 +170,7 @@ class Bsd {
static struct sigaction *get_chained_signal_action(int sig);
static bool chained_handler(int sig, siginfo_t* siginfo, void* context);
+#ifndef _ALLBSD_SOURCE
// GNU libc and libpthread version strings
static char *glibc_version() { return _glibc_version; }
static char *libpthread_version() { return _libpthread_version; }
@@ -143,6 +181,7 @@ class Bsd {
static const char *glibc_version() { return _glibc_version; }
static const char *libpthread_version() { return _libpthread_version; }
@@ -146,6 +184,7 @@ class Bsd {
static bool is_floating_stack() { return _is_floating_stack; }
static void libpthread_init();
+#endif
static bool libnuma_init();
// Minimum stack size a thread can be created with (allowing
// the VM to completely create the thread and enter user code)
@@ -152,17 +191,21 @@ class Bsd {
@@ -156,17 +195,21 @@ class Bsd {
static size_t default_stack_size(os::ThreadType thr_type);
static size_t default_guard_size(os::ThreadType thr_type);
@ -126,7 +129,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.3 2008/03/19 18:05:43 kurt
static bool supports_monotonic_clock() {
return _clock_gettime != NULL;
@@ -172,6 +215,7 @@ class Bsd {
@@ -176,6 +219,7 @@ class Bsd {
return _clock_gettime ? _clock_gettime(clock_id, tp) : -1;
}
@ -134,7 +137,7 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_hpp,v 1.3 2008/03/19 18:05:43 kurt
static int pthread_getcpuclockid(pthread_t tid, clockid_t *clock_id) {
return _pthread_getcpuclockid ? _pthread_getcpuclockid(tid, clock_id) : -1;
}
@@ -181,6 +225,7 @@ class Bsd {
@@ -185,6 +229,7 @@ class Bsd {
}
static jlong fast_thread_cpu_time(clockid_t clockid);

15
devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_assembler_bsd_x86_64_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_assembler_bsd_x86_64_cpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86_64.cpp.orig Wed Nov 7 13:30:38 2007
+++ hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86_64.cpp Wed Nov 7 13:31:11 2007
@@ -69,5 +69,11 @@ void MacroAssembler::get_thread(Register thread) {
// NOTE: since the bsd kernel resides at the low end of
// user address space, no null pointer check is needed.
bool MacroAssembler::needs_explicit_null_check(int offset) {
+#ifdef _ALLBSD_SOURCE
+ //XXXBSD: need to verify this. can page at 0 get mmaped?
+ bool offset_in_first_page = 0 <= offset && offset < os::vm_page_size();
+ return !offset_in_first_page;
+#else
return offset < 0 || offset >= 0x100000;
+#endif
}

151
devel/jdk/1.7/patches/patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig Wed Nov 7 17:07:05 2007
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Wed Nov 7 17:08:03 2007
@@ -44,23 +44,109 @@
$OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig Wed Dec 24 13:41:51 2008
+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Sun Dec 28 17:28:37 2008
@@ -44,23 +44,158 @@
# include <sys/wait.h>
# include <pwd.h>
# include <poll.h>
+#ifndef __OpenBSD__
# include <ucontext.h>
# include <fpu_control.h>
-# include <fpu_control.h>
+#endif
+#ifdef _ALLBSD_SOURCE
+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
+# include <pthread_np.h>
+#endif
+
@ -71,6 +71,56 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
+# endif
+#endif
+
+#ifdef __APPLE__
+# if __DARWIN_UNIX03 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+ // 10.5 UNIX03 member name prefixes
+ #define DU3_PREFIX(s, m) __ ## s.__ ## m
+# else
+ #define DU3_PREFIX(s, m) s ## . ## m
+# endif
+
+# ifdef AMD64
+# define context_pc context_rip
+# define context_sp context_rsp
+# define context_fp context_rbp
+# define context_rip uc_mcontext->DU3_PREFIX(ss,rip)
+# define context_rsp uc_mcontext->DU3_PREFIX(ss,rsp)
+# define context_rax uc_mcontext->DU3_PREFIX(ss,rax)
+# define context_rbx uc_mcontext->DU3_PREFIX(ss,rbx)
+# define context_rcx uc_mcontext->DU3_PREFIX(ss,rcx)
+# define context_rdx uc_mcontext->DU3_PREFIX(ss,rdx)
+# define context_rbp uc_mcontext->DU3_PREFIX(ss,rbp)
+# define context_rsi uc_mcontext->DU3_PREFIX(ss,rsi)
+# define context_rdi uc_mcontext->DU3_PREFIX(ss,rdi)
+# define context_r8 uc_mcontext->DU3_PREFIX(ss,r8)
+# define context_r9 uc_mcontext->DU3_PREFIX(ss,r9)
+# define context_r10 uc_mcontext->DU3_PREFIX(ss,r10)
+# define context_r11 uc_mcontext->DU3_PREFIX(ss,r11)
+# define context_r12 uc_mcontext->DU3_PREFIX(ss,r12)
+# define context_r13 uc_mcontext->DU3_PREFIX(ss,r13)
+# define context_r14 uc_mcontext->DU3_PREFIX(ss,r14)
+# define context_r15 uc_mcontext->DU3_PREFIX(ss,r15)
+# define context_flags uc_mcontext->DU3_PREFIX(ss,rflags)
+# define context_trapno uc_mcontext->DU3_PREFIX(es,trapno)
+# define context_err uc_mcontext->DU3_PREFIX(es,err)
+# else
+# define context_pc context_eip
+# define context_sp context_esp
+# define context_fp context_ebp
+# define context_eip uc_mcontext->DU3_PREFIX(ss,eip)
+# define context_esp uc_mcontext->DU3_PREFIX(ss,esp)
+# define context_eax uc_mcontext->DU3_PREFIX(ss,eax)
+# define context_ebx uc_mcontext->DU3_PREFIX(ss,ebx)
+# define context_ecx uc_mcontext->DU3_PREFIX(ss,ecx)
+# define context_edx uc_mcontext->DU3_PREFIX(ss,edx)
+# define context_ebp uc_mcontext->DU3_PREFIX(ss,ebp)
+# define context_esi uc_mcontext->DU3_PREFIX(ss,esi)
+# define context_edi uc_mcontext->DU3_PREFIX(ss,edi)
+# define context_eflags uc_mcontext->DU3_PREFIX(ss,eflags)
+# define context_trapno uc_mcontext->DU3_PREFIX(es,trapno)
+# endif
+#endif
+
+#ifdef __OpenBSD__
+# define context_trapno sc_trapno
+# ifdef AMD64
@ -115,9 +165,9 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
+#endif
+
address os::current_stack_pointer() {
register void *esp __asm__ (SPELL_REG_SP);
return (address) esp;
@@ -79,15 +165,15 @@ void os::initialize_thread() {
#ifdef SPARC_WORKS
register void *esp;
@@ -85,15 +220,15 @@ void os::initialize_thread() {
}
address os::Bsd::ucontext_get_pc(ucontext_t * uc) {
@ -136,7 +186,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
}
// For Forte Analyzer AsyncGetCallTrace profiling support - thread
@@ -249,18 +335,18 @@ JVM_handle_bsd_signal(int sig,
@@ -245,18 +380,18 @@ JVM_handle_bsd_signal(int sig,
pc = (address) os::Bsd::ucontext_get_pc(uc);
if (pc == (address) Fetch32PFI) {
@ -158,7 +208,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
address addr = (address) info->si_addr;
// check if fault address is within thread stack
@@ -282,6 +368,7 @@ JVM_handle_bsd_signal(int sig,
@@ -278,6 +413,7 @@ JVM_handle_bsd_signal(int sig,
// to handle_unexpected_exception way down below.
thread->disable_stack_red_zone();
tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
@ -166,7 +216,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
} else {
// Accessing stack address below sp may cause SEGV if current
// thread has MAP_GROWSDOWN stack. This should only happen when
@@ -297,6 +384,7 @@ JVM_handle_bsd_signal(int sig,
@@ -293,6 +429,7 @@ JVM_handle_bsd_signal(int sig,
} else {
fatal("recursive segv. expanding stack.");
}
@ -174,16 +224,58 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
}
}
}
@@ -305,7 +393,7 @@ JVM_handle_bsd_signal(int sig,
@@ -301,9 +438,16 @@ JVM_handle_bsd_signal(int sig,
// Java thread running in Java code => find exception handler if any
// a fault inside compiled code, the interpreter, or a stub
- if (sig == SIGSEGV && os::is_poll_address((address)info->si_addr)) {
+ if ((sig == SIGSEGV || sig == SIGBUS) && os::is_poll_address((address)info->si_addr)) {
stub = SharedRuntime::get_poll_stub(pc);
+#if defined(__APPLE__) && !defined(AMD64)
+ // 32-bit Darwin reports a SIGBUS for nearly all memory access exceptions.
+ // Catching SIGBUS here prevents the implicit SIGBUS NULL check below from
+ // being called, so only do so if the implicit NULL check is not necessary.
+ } else if (sig == SIGBUS && MacroAssembler::needs_explicit_null_check((int)info->si_addr)) {
+#else
} else if (sig == SIGBUS /* && info->si_code == BUS_OBJERR */) {
+#endif
// BugId 4454115: A read from a MappedByteBuffer can fault
@@ -355,7 +443,7 @@ JVM_handle_bsd_signal(int sig,
// here if the underlying file has been truncated.
// Do not crash the VM in such a case.
@@ -324,9 +468,31 @@ JVM_handle_bsd_signal(int sig,
pc,
SharedRuntime::
IMPLICIT_DIVIDE_BY_ZERO);
+#ifdef __APPLE__
+ } else if (sig == SIGFPE && info->si_code == FPE_NOOP) {
+ int op = pc[0];
+
+ // Skip REX
+ if ((pc[0] & 0xf0) == 0x40) {
+ op = pc[1];
+ } else {
+ op = pc[0];
+ }
+
+ // Check for IDIV
+ if (op == 0xF7) {
+ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime:: IMPLICIT_DIVIDE_BY_ZERO);
+ } else {
+ // TODO: handle more cases if we are using other x86 instructions
+ // that can generate SIGFPE signal.
+ tty->print_cr("unknown opcode 0x%X with SIGFPE.", op);
+ fatal("please update this code.");
+ }
+#endif /* __APPLE__ */
+
#else
if (sig == SIGFPE /* && info->si_code == FPE_INTDIV */) {
- // HACK: si_code does not work on bsd 2.2.12-20!!!
+ // HACK: si_code does not work on linux 2.2.12-20!!!
int op = pc[0];
if (op == 0xDB) {
// FIST
@@ -351,7 +517,7 @@ JVM_handle_bsd_signal(int sig,
fatal("please update this code.");
}
#endif // AMD64
@ -192,7 +284,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
!MacroAssembler::needs_explicit_null_check((intptr_t)info->si_addr)) {
// Determination of interpreter/vtable stub/compiled code null exception
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
@@ -379,7 +467,7 @@ JVM_handle_bsd_signal(int sig,
@@ -375,7 +541,7 @@ JVM_handle_bsd_signal(int sig,
// process of write protecting the memory serialization page.
// It write enables the page immediately after protecting it
// so we can just return to retry the write.
@ -201,7 +293,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
os::is_memory_serialize_page(thread, (address) info->si_addr)) {
// Block current thread until the memory serialize page permission restored.
os::block_on_serialize_page_trap();
@@ -400,7 +488,7 @@ JVM_handle_bsd_signal(int sig,
@@ -396,7 +562,7 @@ JVM_handle_bsd_signal(int sig,
// Furthermore, a false-positive should be harmless.
if (UnguardOnExecutionViolation > 0 &&
(sig == SIGSEGV || sig == SIGBUS) &&
@ -210,7 +302,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
int page_size = os::vm_page_size();
address addr = (address) info->si_addr;
address pc = os::Bsd::ucontext_get_pc(uc);
@@ -469,7 +557,7 @@ JVM_handle_bsd_signal(int sig,
@@ -465,7 +631,7 @@ JVM_handle_bsd_signal(int sig,
// save all thread context in case we need to restore it
if (thread != NULL) thread->set_saved_exception_pc(pc);
@ -219,7 +311,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
return true;
}
@@ -499,13 +587,24 @@ JVM_handle_bsd_signal(int sig,
@@ -495,13 +661,24 @@ JVM_handle_bsd_signal(int sig,
ShouldNotReachHere();
}
@ -244,7 +336,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
int os::Bsd::get_fpu_control_word(void) {
#ifdef AMD64
return 0;
@@ -521,11 +620,12 @@ void os::Bsd::set_fpu_control_word(int fpu_control) {
@@ -517,11 +694,12 @@ void os::Bsd::set_fpu_control_word(int fpu_control) {
_FPU_SETCW(fpu_control);
#endif // !AMD64
}
@ -258,9 +350,9 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
return true;
#else
struct utsname uts;
@@ -577,6 +677,9 @@ size_t os::Bsd::min_stack_allowed = (48 DEBUG_ONLY(+
@@ -575,6 +753,9 @@ size_t os::Bsd::min_stack_allowed = (48 DEBUG_ONLY(+
#define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
#endif
+#ifdef _ALLBSD_SOURCE
+bool os::Bsd::supports_variable_stack_size() { return true; }
@ -268,19 +360,24 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
// Test if pthread library can support variable thread stack size. BsdThreads
// in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads
// in floating stack mode and NPTL support variable stack size.
@@ -609,6 +712,7 @@ bool os::Bsd::supports_variable_stack_size() {
return (GET_GS() != 0);
@@ -611,6 +792,7 @@ bool os::Bsd::supports_variable_stack_size() {
#endif
}
}
+#endif
#endif // AMD64
// return default stack size for thr_type
@@ -662,6 +766,36 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
@@ -664,6 +846,41 @@ size_t os::Bsd::default_guard_size(os::ThreadType thr_
// pthread_attr_getstack()
static void current_stack_region(address * bottom, size_t * size) {
+#ifdef __OpenBSD__
+#ifdef __APPLE__
+ pthread_t self = pthread_self();
+ void *stacktop = pthread_get_stackaddr_np(self);
+ *size = pthread_get_stacksize_np(self);
+ *bottom = (address) stacktop - *size;
+#elif defined(__OpenBSD__)
+ stack_t ss;
+ int rslt = pthread_stackseg_np(pthread_self(), &ss);
+
@ -313,7 +410,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
if (os::Bsd::is_initial_thread()) {
// initial thread needs special handling because pthread_getattr_np()
// may return bogus value.
@@ -688,6 +822,7 @@ static void current_stack_region(address * bottom, siz
@@ -690,6 +907,7 @@ static void current_stack_region(address * bottom, siz
pthread_attr_destroy(&attr);
}
@ -321,7 +418,7 @@ $OpenBSD: patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp,v 1.1 2008/03/19 18
assert(os::current_stack_pointer() >= *bottom &&
os::current_stack_pointer() < *bottom + *size, "just checking");
}
@@ -716,46 +851,44 @@ void os::print_context(outputStream *st, void *context
@@ -718,46 +936,44 @@ void os::print_context(outputStream *st, void *context
ucontext_t *uc = (ucontext_t*)context;
st->print_cr("Registers:");
#ifdef AMD64

8
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_adlc_adlc_hpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_src_share_vm_adlc_adlc_hpp,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/adlc/adlc.hpp.orig Tue Oct 30 05:00:38 2007
+++ hotspot/src/share/vm/adlc/adlc.hpp Wed Nov 7 12:41:35 2007
@@ -73,9 +73,9 @@ typedef unsigned int uintptr_t;
$OpenBSD: patch-hotspot_src_share_vm_adlc_adlc_hpp,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/adlc/adlc.hpp.orig Thu Jul 17 03:40:31 2008
+++ hotspot/src/share/vm/adlc/adlc.hpp Sat Aug 2 16:12:52 2008
@@ -69,9 +69,9 @@ typedef unsigned int uintptr_t;
#endif
#endif // _WIN32

8
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew,v 1.1 2007/07/13 22:52:35 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew.orig Thu Jul 5 12:45:57 2007
+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew Thu Jul 5 12:46:06 2007
@@ -39,7 +39,7 @@ parCardTableModRefBS.cpp cardTableRS.hp
$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew.orig Thu Sep 11 03:40:57 2008
+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew Fri Sep 12 17:05:53 2008
@@ -40,7 +40,7 @@ parCardTableModRefBS.cpp cardTableRS.hp
parCardTableModRefBS.cpp java.hpp
parCardTableModRefBS.cpp mutexLocker.hpp
parCardTableModRefBS.cpp sharedHeap.hpp

12
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_compiler2
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.4 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/includeDB_compiler2.orig Tue Oct 30 05:00:39 2007
+++ hotspot/src/share/vm/includeDB_compiler2 Wed Nov 7 12:41:35 2007
$OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.5 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/includeDB_compiler2.orig Thu Nov 20 03:41:04 2008
+++ hotspot/src/share/vm/includeDB_compiler2 Tue Dec 23 07:16:15 2008
@@ -140,6 +140,7 @@ c2_globals_<os_family>.hpp globalDefiniti
c2_globals_<os_family>.hpp macros.hpp
@ -17,7 +17,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.4 2008/03/19 18:05:
callGenerator.hpp type.hpp
callnode.cpp callnode.hpp
@@ -477,6 +479,7 @@ graphKit.hpp cfgnode.hpp
@@ -480,6 +482,7 @@ graphKit.hpp cfgnode.hpp
graphKit.hpp ciEnv.hpp
graphKit.hpp compile.hpp
graphKit.hpp deoptimization.hpp
@ -25,7 +25,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.4 2008/03/19 18:05:
graphKit.hpp phaseX.hpp
graphKit.hpp type.hpp
@@ -521,6 +524,7 @@ indexSet.cpp regmask.hpp
@@ -525,6 +528,7 @@ indexSet.cpp regmask.hpp
indexSet.hpp allocation.hpp
indexSet.hpp compile.hpp
@ -33,7 +33,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.4 2008/03/19 18:05:
indexSet.hpp regmask.hpp
indexSet.hpp resourceArea.hpp
@@ -833,6 +837,7 @@ parseHelper.cpp systemDictiona
@@ -839,6 +843,7 @@ parseHelper.cpp systemDictiona
phase.cpp compile.hpp
phase.cpp compileBroker.hpp
phase.cpp nmethod.hpp

22
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_includeDB_core
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.5 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/includeDB_core.orig Tue Oct 30 05:00:39 2007
+++ hotspot/src/share/vm/includeDB_core Wed Nov 7 12:41:35 2007
@@ -476,7 +476,7 @@ cardTableModRefBS.cpp cardTableRS.hp
$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.6 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/includeDB_core.orig Fri Dec 19 03:42:10 2008
+++ hotspot/src/share/vm/includeDB_core Wed Dec 24 10:02:13 2008
@@ -473,7 +473,7 @@ cardTableModRefBS.cpp cardTableRS.hp
cardTableModRefBS.cpp java.hpp
cardTableModRefBS.cpp mutexLocker.hpp
cardTableModRefBS.cpp sharedHeap.hpp
@ -10,7 +10,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.5 2008/03/19 18:05:43 ku
cardTableModRefBS.cpp universe.hpp
cardTableModRefBS.cpp virtualspace.hpp
@@ -1027,15 +1027,14 @@ compactPermGen.hpp permGen.hpp
@@ -1036,15 +1036,14 @@ compactPermGen.hpp permGen.hpp
compactingPermGenGen.cpp compactingPermGenGen.hpp
compactingPermGenGen.cpp filemap.hpp
compactingPermGenGen.cpp genOopClosures.inline.hpp
@ -27,16 +27,16 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.5 2008/03/19 18:05:43 ku
compilationPolicy.cpp compilationPolicy.hpp
compilationPolicy.cpp compiledIC.hpp
@@ -1772,7 +1771,7 @@ generation.hpp watermark.hpp
@@ -1810,7 +1809,7 @@ generation.hpp watermark.hpp
generation.inline.hpp genCollectedHeap.hpp
generation.inline.hpp generation.hpp
-generation.inline.hpp space.hpp
+generation.inline.hpp space.inline.hpp
generationSpec.cpp compactPermGen.hpp
generationSpec.cpp defNewGeneration.hpp
@@ -2484,6 +2483,7 @@ klass.hpp specialized_oo
genOopClosures.hpp oop.hpp
@@ -2533,6 +2532,7 @@ klass.hpp specialized_oo
klass.inline.hpp klass.hpp
klass.inline.hpp markOop.hpp
@ -44,7 +44,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.5 2008/03/19 18:05:43 ku
klassKlass.cpp collectedHeap.hpp
klassKlass.cpp collectedHeap.inline.hpp
@@ -3685,6 +3685,7 @@ space.hpp blockOffsetTab
@@ -3752,6 +3752,7 @@ space.hpp blockOffsetTab
space.hpp cardTableModRefBS.hpp
space.hpp iterator.hpp
space.hpp markOop.hpp
@ -52,7 +52,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.5 2008/03/19 18:05:43 ku
space.hpp memRegion.hpp
space.hpp mutexLocker.hpp
space.hpp os_<os_family>.inline.hpp
@@ -3887,6 +3888,7 @@ synchronizer.cpp vmSymbols.hpp
@@ -3963,6 +3964,7 @@ synchronizer.cpp vmSymbols.hpp
synchronizer.hpp handles.hpp
synchronizer.hpp markOop.hpp

17
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_opto_macro_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-hotspot_src_share_vm_opto_macro_cpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/opto/macro.cpp.orig Wed Dec 24 10:12:36 2008
+++ hotspot/src/share/vm/opto/macro.cpp Wed Dec 24 10:13:01 2008
@@ -1724,6 +1724,13 @@ void PhaseMacroExpand::expand_lock_node(LockNode *lock
if (klass_node == NULL) {
Node* k_adr = basic_plus_adr(obj, oopDesc::klass_offset_in_bytes());
klass_node = transform_later( LoadKlassNode::make(_igvn, mem, k_adr, _igvn.type(k_adr)->is_ptr()) );
+#ifdef _LP64
+ if (UseCompressedOops && klass_node->is_DecodeN()) {
+ assert(klass_node->in(1)->Opcode() == Op_LoadNKlass, "sanity");
+ klass_node->in(1)->init_req(0, ctrl);
+ } else
+#endif
+ klass_node->init_req(0, ctrl);
}
Node *proto_node = make_load(ctrl, mem, klass_node, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), TypeX_X, TypeX_X->basic_type());

8
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_globals_hpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_src_share_vm_runtime_globals_hpp,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/runtime/globals.hpp.orig Tue Oct 30 05:00:51 2007
+++ hotspot/src/share/vm/runtime/globals.hpp Wed Nov 7 12:41:35 2007
@@ -291,7 +291,7 @@ class CommandLineFlags {
$OpenBSD: patch-hotspot_src_share_vm_runtime_globals_hpp,v 1.4 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/runtime/globals.hpp.orig Thu Nov 20 03:41:06 2008
+++ hotspot/src/share/vm/runtime/globals.hpp Tue Dec 23 07:16:15 2008
@@ -312,7 +312,7 @@ class CommandLineFlags {
/* UseMembar is theoretically a temp flag used for memory barrier \
* removal testing. It was supposed to be removed before FCS but has \
* been re-added (see 6401008) */ \

8
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_os_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_src_share_vm_runtime_os_cpp,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/runtime/os.cpp.orig Tue Oct 30 05:00:52 2007
+++ hotspot/src/share/vm/runtime/os.cpp Wed Nov 7 15:26:54 2007
@@ -152,7 +152,11 @@ char* os::iso8601_time(char* buffer, size_t buffer_len
$OpenBSD: patch-hotspot_src_share_vm_runtime_os_cpp,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/runtime/os.cpp.orig Thu Jul 17 03:40:34 2008
+++ hotspot/src/share/vm/runtime/os.cpp Sat Aug 2 16:12:52 2008
@@ -81,7 +81,11 @@ char* os::iso8601_time(char* buffer, size_t buffer_len
}
// Save the results of localtime
const struct tm time_struct = *time_struct_temp;

8
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_runtime_vm_version_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.4 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/runtime/vm_version.cpp.orig Tue Oct 30 05:00:53 2007
+++ hotspot/src/share/vm/runtime/vm_version.cpp Wed Nov 7 12:41:35 2007
@@ -138,7 +138,8 @@ const char* Abstract_VM_Version::vm_release() {
$OpenBSD: patch-hotspot_src_share_vm_runtime_vm_version_cpp,v 1.5 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/runtime/vm_version.cpp.orig Thu Jul 17 03:40:35 2008
+++ hotspot/src/share/vm/runtime/vm_version.cpp Sat Aug 2 16:12:52 2008
@@ -140,7 +140,8 @@ const char* Abstract_VM_Version::vm_release() {
#define OS LINUX_ONLY("linux") \
WINDOWS_ONLY("windows") \

28
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.2 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig Tue Oct 30 05:00:54 2007
+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Wed Nov 7 13:11:35 2007
$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig Fri Dec 19 03:42:12 2008
+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp Sun Dec 28 19:25:16 2008
@@ -71,12 +71,14 @@
# include <sys/procfs.h>
# endif
@ -18,16 +18,28 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_gcc_hpp,v 1.2 2
// 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
// When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
@@ -112,7 +114,7 @@
// pointer is stored as integer value. On some platforms, sizeof(intptr_t) >
// sizeof(void*), so here we want something which is integer type, but has the
// same size as a pointer.
@@ -107,22 +109,22 @@
#endif
// NULL vs NULL_WORD:
-// On Linux NULL is defined as a special type '__null'. Assigning __null to
+// With gcc NULL is defined as a special type '__null'. Assigning __null to
// integer variable will cause gcc warning. Use NULL_WORD in places where a
-// pointer is stored as integer value. On some platforms, sizeof(intptr_t) >
-// sizeof(void*), so here we want something which is integer type, but has the
-// same size as a pointer.
-#ifdef LINUX
+// pointer is stored as integer value. On some platforms the datatype of
+// intptr_t != int, so here we want something which is the same size as a
+// pointer.
+#ifdef __GNUG__
#ifdef _LP64
#define NULL_WORD 0L
#else
@@ -122,7 +124,7 @@
- #define NULL_WORD 0
+ #define NULL_WORD ((intptr_t)0)
#endif
#else
#define NULL_WORD NULL
#endif

12
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions_sparcWorks_hpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions_sparcWorks_hpp,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp.orig Mon Dec 22 18:05:06 2008
+++ hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp Mon Dec 22 18:05:25 2008
@@ -115,7 +115,7 @@
#ifdef _LP64
#define NULL_WORD 0L
#else
- #define NULL_WORD 0
+ #define NULL_WORD ((intptr_t)0)
#endif
#else
#define NULL_WORD NULL

10
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_macros_hpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.5 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/utilities/macros.hpp.orig Tue Oct 30 05:00:54 2007
+++ hotspot/src/share/vm/utilities/macros.hpp Wed Nov 7 12:41:35 2007
@@ -144,6 +144,14 @@
#define NOT_WINDOWS(code) code
$OpenBSD: patch-hotspot_src_share_vm_utilities_macros_hpp,v 1.6 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/macros.hpp.orig Fri Dec 19 03:42:12 2008
+++ hotspot/src/share/vm/utilities/macros.hpp Wed Dec 24 10:02:13 2008
@@ -154,6 +154,14 @@
#define X86_ONLY(code)
#endif
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)

17
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_ostream_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-hotspot_src_share_vm_utilities_ostream_cpp,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/utilities/ostream.cpp.orig Mon Mar 3 11:40:44 2008
+++ hotspot/src/share/vm/utilities/ostream.cpp Mon Mar 3 12:25:16 2008
@@ -777,7 +777,7 @@ bufferedStream::~bufferedStream() {
$OpenBSD: patch-hotspot_src_share_vm_utilities_ostream_cpp,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/ostream.cpp.orig Thu Nov 20 03:41:06 2008
+++ hotspot/src/share/vm/utilities/ostream.cpp Tue Dec 23 07:16:15 2008
@@ -821,7 +821,7 @@ bufferedStream::~bufferedStream() {
#ifndef PRODUCT
@ -10,12 +10,3 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_ostream_cpp,v 1.1 2008/03/19 18:0
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
@@ -829,7 +829,7 @@ bool networkStream::connect(const char *ip, short port
server.sin_port = htons(port);
server.sin_addr.s_addr = inet_addr(ip);
- if (server.sin_addr.s_addr == (unsigned long)-1) {
+ if (server.sin_addr.s_addr == (in_addr_t)-1) {
#ifdef _WINDOWS
struct hostent* host = hpi::get_host_by_name((char*)ip);
#else

10
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_utilities_vmError_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.3 2008/03/19 18:05:43 kurt Exp $
--- hotspot/src/share/vm/utilities/vmError.cpp.orig Tue Oct 30 05:00:54 2007
+++ hotspot/src/share/vm/utilities/vmError.cpp Wed Nov 7 13:12:15 2007
$OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.4 2009/01/04 23:25:16 kurt Exp $
--- hotspot/src/share/vm/utilities/vmError.cpp.orig Thu Jul 17 03:40:35 2008
+++ hotspot/src/share/vm/utilities/vmError.cpp Sat Aug 2 16:12:53 2008
@@ -31,7 +31,7 @@ const char *env_list[] = {
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
@ -26,8 +26,8 @@ $OpenBSD: patch-hotspot_src_share_vm_utilities_vmError_cpp,v 1.3 2008/03/19 18:0
+#endif
// If the crash is in native code, encourage user to submit a bug to the
// provider of that code.
if (thread && thread->is_Java_thread()) {
@@ -790,7 +797,7 @@ void VMError::report_and_die() {
if (thread && thread->is_Java_thread() &&
@@ -792,7 +799,7 @@ void VMError::report_and_die() {
const char* ptr = OnError;
while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
out.print_raw ("# Executing ");

10
devel/jdk/1.7/patches/patch-jdk_make_com_sun_java_pack_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_com_sun_java_pack_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/com/sun/java/pack/Makefile.orig Tue Oct 30 05:04:20 2007
+++ jdk/make/com/sun/java/pack/Makefile Wed Nov 7 17:55:03 2007
$OpenBSD: patch-jdk_make_com_sun_java_pack_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/com/sun/java/pack/Makefile.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/com/sun/java/pack/Makefile Wed Aug 13 13:39:36 2008
@@ -61,6 +61,7 @@ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
@ -20,8 +20,8 @@ $OpenBSD: patch-jdk_make_com_sun_java_pack_Makefile,v 1.1 2008/03/19 18:05:45 ku
else
OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
OTHER_LDLIBS += $(JVMLIB)
@@ -102,7 +107,11 @@ ifeq ($(PLATFORM), windows)
COMPILER_WARNINGS_FATAL=false
@@ -99,7 +104,11 @@ ifeq ($(PLATFORM), windows)
RES = $(OBJDIR)/$(PGRM).res
else
LDOUTPUT = -o #Have a space
+ifeq ($(PLATFORM), bsd)

8
devel/jdk/1.7/patches/patch-jdk_make_com_sun_security_auth_module_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_com_sun_security_auth_module_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/com/sun/security/auth/module/Makefile.orig Tue Oct 30 05:04:21 2007
+++ jdk/make/com/sun/security/auth/module/Makefile Wed Nov 7 17:55:08 2007
@@ -70,7 +70,7 @@ ifeq ($(PLATFORM), solaris)
$OpenBSD: patch-jdk_make_com_sun_security_auth_module_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/com/sun/security/auth/module/Makefile.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/com/sun/security/auth/module/Makefile Wed Aug 13 13:39:36 2008
@@ -67,7 +67,7 @@ ifeq ($(PLATFORM), solaris)
include FILES_c_solaris.gmk
endif # solaris

26
devel/jdk/1.7/patches/patch-jdk_make_common_Defs-bsd_gmk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp $
--- jdk/make/common/Defs-bsd.gmk.orig Sat Dec 20 22:26:51 2008
+++ jdk/make/common/Defs-bsd.gmk Sat Dec 20 23:03:00 2008
$OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/Defs-bsd.gmk.orig Mon Dec 22 21:13:32 2008
+++ jdk/make/common/Defs-bsd.gmk Mon Dec 22 23:14:44 2008
@@ -43,12 +43,6 @@
# Get shared JDK settings
include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
@ -12,7 +12,7 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp
-CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g'
-
ifndef PLATFORM_SRC
PLATFORM_SRC = $(JDK_TOPDIR)/src/solaris
PLATFORM_SRC = $(BUILDDIR)/../src/solaris
endif # PLATFORM_SRC
@@ -61,7 +55,7 @@ ifndef OPENJDK
endif
@ -23,8 +23,8 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp
PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
# suffix used for make dependencies files.
@@ -178,7 +172,7 @@ ifeq ($(FASTDEBUG), true)
CXXFLAGS_DBG += $(CC_LOWER_OPT)
@@ -169,7 +163,7 @@ ifeq ($(FASTDEBUG), true)
CXXFLAGS_DBG += $(CC_OPT/LOWER)
endif
-CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -DLINUX $(VERSION_DEFINES) \
@ -32,9 +32,9 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp
-D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
ifeq ($(ARCH_DATA_MODEL), 64)
@@ -188,27 +182,6 @@ endif
CPPFLAGS_OPT =
CPPFLAGS_DBG = -DDEBUG
@@ -182,27 +176,6 @@ ifneq ($(PRODUCT), java)
CPPFLAGS_DBG += -DLOGGING
endif
-ifdef LIBRARY
- # Libraries need to locate other libraries at runtime, and you can tell
@ -60,7 +60,7 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp
#
# -L paths for finding and -ljava
#
@@ -246,15 +219,6 @@ endif
@@ -240,15 +213,6 @@ endif
LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker
#
@ -76,7 +76,7 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp
# Path and option to link against the VM, if you have to. Note that
# there are libraries that link against only -ljava, but they do get
# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas
@@ -280,7 +244,9 @@ override HAVE_ALTZONE = false
@@ -274,7 +238,9 @@ override HAVE_ALTZONE = false
override HAVE_FILIOH = false
override HAVE_GETHRTIME = false
override HAVE_GETHRVTIME = false
@ -86,7 +86,7 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp
override LEX_LIBRARY = -lfl
ifeq ($(STATIC_CXX),true)
override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
@@ -291,13 +257,9 @@ override LIBPOSIX4 =
@@ -285,13 +251,9 @@ override LIBPOSIX4 =
override LIBSOCKET =
override LIBTHREAD =
override MOOT_PRIORITIES = true
@ -101,7 +101,7 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
override THREADS_FLAG = native
@@ -317,6 +279,14 @@ override USE_EXECNAME = true
@@ -311,6 +273,14 @@ override USE_EXECNAME = true
# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
# DPS (Displayable PostScript) is available on Solaris machines
HAVE_DPS = no

10
devel/jdk/1.7/patches/patch-jdk_make_common_Defs_gmk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/Defs.gmk.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/common/Defs.gmk Sun Mar 2 15:08:40 2008
@@ -213,6 +213,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
$OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/Defs.gmk.orig Thu Jul 17 03:43:08 2008
+++ jdk/make/common/Defs.gmk Sat Aug 2 16:12:53 2008
@@ -207,6 +207,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
ifdef ALT_FREETYPE_LIB_PATH
FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
@ -9,7 +9,7 @@ $OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
else
ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
@@ -275,6 +276,10 @@ ifdef PROGRAM
@@ -269,6 +270,10 @@ ifdef PROGRAM
ifeq ($(PLATFORM), linux)
LDLIBS_COMMON = -ldl

16
devel/jdk/1.7/patches/patch-jdk_make_common_Release_gmk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_common_Release_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/Release.gmk.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/common/Release.gmk Sun Mar 2 11:07:36 2008
@@ -147,14 +147,13 @@ JRE_MAN_PAGES = \
$OpenBSD: patch-jdk_make_common_Release_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/Release.gmk.orig Thu Sep 11 03:44:06 2008
+++ jdk/make/common/Release.gmk Fri Sep 12 17:05:54 2008
@@ -145,14 +145,13 @@ JRE_MAN_PAGES = \
tnameserv.1 \
unpack200.1
@ -17,7 +17,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
extcheck.1 \
idlj.1 \
jar.1 \
@@ -193,6 +192,11 @@ ifeq ($(PLATFORM), linux)
@@ -191,6 +190,11 @@ ifeq ($(PLATFORM), linux)
JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
endif # linux
@ -29,7 +29,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
define copy-man-pages
$(MKDIR) -p $1/man/man1
for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
@@ -325,7 +329,13 @@ ifndef OPENJDK
@@ -323,7 +327,13 @@ ifndef OPENJDK
SOURCE_DIRS += $(CLOSED_SRC)/share/classes
endif
@ -43,7 +43,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
#
# Specific files and directories that will be filtered out from above areas.
#
@@ -990,7 +1000,7 @@ initial-image-jdk:: initial-image-jdk-setup \
@@ -992,7 +1002,7 @@ initial-image-jdk:: initial-image-jdk-setup \
@# generated by the more efficient solaris/windows method of copying files.
@# So for Linux, make use of the -T option (like Solaris' -I option) of
@# obtaining the list of files from a file. MKS tar has no such option.
@ -52,7 +52,7 @@ $OpenBSD: patch-jdk_make_common_Release_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
for d in $(SOURCE_DIRS); do \
$(RM) $(ABS_TEMPDIR)/src-files.list; \
($(CD) $$d && \
@@ -1003,7 +1013,7 @@ initial-image-jdk:: initial-image-jdk-setup \
@@ -1005,7 +1015,7 @@ initial-image-jdk:: initial-image-jdk-setup \
done ; \
) ; \
if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \

59
devel/jdk/1.7/patches/patch-jdk_make_common_internal_BinaryPlugs_gmk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/internal/BinaryPlugs.gmk.orig Tue Mar 18 15:47:00 2008
+++ jdk/make/common/internal/BinaryPlugs.gmk Tue Mar 18 15:47:09 2008
$OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/internal/BinaryPlugs.gmk.orig Thu Sep 11 03:44:06 2008
+++ jdk/make/common/internal/BinaryPlugs.gmk Fri Sep 12 17:05:54 2008
@@ -51,8 +51,6 @@ PLUG_JMF_CLASS_NAMES = \
com/sun/jmx/snmp/SnmpDataTypeEnums.class \
com/sun/jmx/snmp/SnmpDefinitions.class \
@ -29,32 +29,22 @@ $OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.1 2008/03/19 18:05:
PLUG_SOUND_CLASS_NAMES = \
com/sun/media/sound/AbstractPlayer.class \
@@ -130,9 +120,6 @@ PLUG_AWT_CLASS_NAMES = \
java/awt/color/CMMException.class \
java/awt/color/ColorSpace.class \
java/awt/color/ICC_ColorSpace.class \
-java/awt/color/ICC_Profile\$$1.class \
-java/awt/color/ICC_Profile\$$2.class \
-java/awt/color/ICC_Profile\$$3.class \
java/awt/color/ICC_Profile.class \
java/awt/color/ICC_ProfileGray.class \
java/awt/color/ICC_ProfileRGB.class \
@@ -160,10 +147,12 @@ java/awt/image/renderable/RenderableImageOp.class \
java/awt/image/renderable/RenderableImageProducer.class \
java/awt/image/renderable/RenderedImageFactory.class
@@ -126,10 +116,12 @@ com/sun/media/sound/SimpleInputDeviceProvider\$$1.clas
com/sun/media/sound/SimpleInputDeviceProvider\$$InputDeviceInfo.class \
com/sun/media/sound/SimpleInputDeviceProvider.class
+PLUG_GNU_CLASS_NAMES = gnu
+
# Class list temp files (used by both import and export of plugs)
PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
-PLUG_CLASS_AREAS = jmf sound awt
+PLUG_CLASS_AREAS = jmf sound awt gnu
-PLUG_CLASS_AREAS = jmf sound
+PLUG_CLASS_AREAS = jmf sound gnu
PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
# Create jargs file command
@@ -191,6 +180,11 @@ $(PLUG_TEMPDIR)/awt.clist:
@for i in $(PLUG_AWT_CLASS_NAMES) ; do \
@@ -152,6 +144,11 @@ $(PLUG_TEMPDIR)/sound.clist:
@for i in $(PLUG_SOUND_CLASS_NAMES) ; do \
$(ECHO) "$$i" >> $@ ; \
done
+$(PLUG_TEMPDIR)/gnu.clist:
@ -65,31 +55,19 @@ $OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.1 2008/03/19 18:05:
$(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
@$(prep-target)
$(CAT) $(PLUG_CLISTS) > $@
@@ -200,6 +194,8 @@ $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.cli
@@ -159,6 +156,8 @@ $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
$(plug-create-jargs)
$(PLUG_TEMPDIR)/awt.jargs: $(PLUG_TEMPDIR)/awt.clist
$(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist
$(plug-create-jargs)
+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
+ $(plug-create-jargs)
$(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
$(plug-create-jargs)
@@ -224,9 +220,9 @@ endef # import-binary-plug-file
# Import classes command
define import-binary-plug-classes
-@$(MKDIR) -p $(CLASSDESTDIR)
+$(MKDIR) -p $(CLASSDESTDIR)
@$(CAT) $1 | $(SED) -e 's/^/PLUG IMPORT: /'
-($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) @$1)
+($(CD) $(CLASSDESTDIR) && $(BOOT_JAR_CMD) xf $(PLUG_IMPORT_JARFILE) `$(CAT) $1`)
endef # import-binary-plug-classes
# Import specific area classes (the classes are always created)
@@ -237,13 +233,16 @@ import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFIL
@@ -195,12 +194,15 @@ import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE)
$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist
$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist)
import-binary-plug-awt-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/awt.clist
$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/awt.clist)
+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
@ -97,14 +75,13 @@ $OpenBSD: patch-jdk_make_common_internal_BinaryPlugs_gmk,v 1.1 2008/03/19 18:05:
import-binary-plug-jar: \
import-binary-plug-jmf-classes \
import-binary-plug-sound-classes \
- import-binary-plug-awt-classes
+ import-binary-plug-awt-classes \
- import-binary-plug-sound-classes
+ import-binary-plug-sound-classes \
+ import-binary-plug-gnu-classes
# Import native libraries
@@ -266,14 +265,12 @@ import-binary-plugs-completed:
@@ -223,14 +225,12 @@ import-binary-plugs-completed:
# Import lib files (only if they don't exist already)

8
devel/jdk/1.7/patches/patch-jdk_make_common_shared_Compiler-gcc_gmk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_common_shared_Compiler-gcc_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/shared/Compiler-gcc.gmk.orig Tue Oct 30 05:04:22 2007
+++ jdk/make/common/shared/Compiler-gcc.gmk Wed Nov 7 14:50:53 2007
@@ -55,20 +55,24 @@ ifeq ($(PLATFORM), windows)
$OpenBSD: patch-jdk_make_common_shared_Compiler-gcc_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Compiler-gcc.gmk.orig Thu Jul 17 03:43:08 2008
+++ jdk/make/common/shared/Compiler-gcc.gmk Sat Aug 2 16:12:53 2008
@@ -53,20 +53,24 @@ ifeq ($(PLATFORM), windows)
endif

15
devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs-bsd_gmk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_common_shared_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/shared/Defs-bsd.gmk.orig Wed Nov 7 14:40:30 2007
+++ jdk/make/common/shared/Defs-bsd.gmk Wed Nov 7 14:53:08 2007
$OpenBSD: patch-jdk_make_common_shared_Defs-bsd_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Defs-bsd.gmk.orig Mon Dec 22 14:34:15 2008
+++ jdk/make/common/shared/Defs-bsd.gmk Mon Dec 22 16:25:06 2008
@@ -54,7 +54,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && p
endef
@ -10,6 +10,15 @@ $OpenBSD: patch-jdk_make_common_shared_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:45 ku
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
@@ -107,7 +107,7 @@ endif
ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
else
- DEVTOOLS_PATH =/usr/bin/
+ DEVTOOLS_PATH =/usr/local/bin/
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
@@ -121,15 +121,7 @@ endif
BUILD_HEADLESS = true
LIBM=-lm

43
devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs-utils_gmk Normal file
View File

@ -0,0 +1,43 @@
$OpenBSD: patch-jdk_make_common_shared_Defs-utils_gmk,v 1.1 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Defs-utils.gmk.orig Mon Dec 22 16:16:45 2008
+++ jdk/make/common/shared/Defs-utils.gmk Mon Dec 22 16:20:56 2008
@@ -53,6 +53,13 @@ ifeq ($(PLATFORM),linux)
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
endif
+ifeq ($(PLATFORM),bsd)
+ UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
+ UTILS_USR_BIN_PATH=$(USRBIN_PATH)
+ UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
+ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+endif
+
ifeq ($(PLATFORM),solaris)
UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
@@ -191,6 +198,25 @@ ifeq ($(PLATFORM),linux)
NM = $(UTILS_USR_BIN_PATH)nm
STRIP = $(UTILS_USR_BIN_PATH)strip
YACC = $(UTILS_USR_BIN_PATH)yacc
+endif
+
+# BSD Specific
+ifeq ($(PLATFORM),bsd)
+BASENAME = $(UTILS_USR_BIN_PATH)basename
+EGREP = $(UTILS_USR_BIN_PATH)egrep
+EXPR = $(UTILS_COMMAND_PATH)expr
+FMT = $(UTILS_USR_BIN_PATH)fmt
+GREP = $(UTILS_USR_BIN_PATH)grep
+GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
+ID = $(UTILS_USR_BIN_PATH)id
+MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
+SED = $(UTILS_USR_BIN_PATH)sed
+SORT = $(UTILS_USR_BIN_PATH)sort
+TOUCH = $(UTILS_USR_BIN_PATH)touch
+TEST = $(UTILS_COMMAND_PATH)test
+TRUE = $(UTILS_USR_BIN_PATH)true
+UNAME = $(UTILS_USR_BIN_PATH)uname
+UNZIP = $(UTILS_DEVTOOL_PATH)unzip
endif
# Solaris specific

44
devel/jdk/1.7/patches/patch-jdk_make_common_shared_Platform_gmk
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.2 2008/03/21 02:46:43 kurt Exp $
--- jdk/make/common/shared/Platform.gmk.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/common/shared/Platform.gmk Thu Mar 20 09:06:34 2008
@@ -275,6 +275,73 @@ ifeq ($(SYSTEM_UNAME), Linux)
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
$OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Platform.gmk.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/common/shared/Platform.gmk Wed Aug 13 13:42:11 2008
@@ -272,6 +272,73 @@ ifeq ($(SYSTEM_UNAME), Linux)
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
endif
+ifeq ($(SYSTEM_UNAME), FreeBSD)
@ -75,25 +75,25 @@ $OpenBSD: patch-jdk_make_common_shared_Platform_gmk,v 1.2 2008/03/21 02:46:43 ku
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
@@ -390,7 +457,7 @@ endif
@@ -451,7 +518,7 @@ endif
# build machines and adjustments will be made to prevent excessing
# system swapping during the build.
# If we don't know, assume 512. Subtract 128 from MB for VM MAX.
-# Don't set VM max over 1024-128=896.
+# Don't set VM max over 864-128=736.
ifneq ($(MB_OF_MEMORY),)
LOW_MEMORY_MACHINE := $(shell \
if [ $(MB_OF_MEMORY) -le 512 ] ; then \
@@ -399,10 +466,10 @@ ifneq ($(MB_OF_MEMORY),)
echo "false"; \
fi)
MAX_VM_MEMORY := $(shell \
- if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
+ if [ $(MB_OF_MEMORY) -le 864 ] ; then \
expr $(MB_OF_MEMORY) '-' 128 ; \
else \
- echo "896"; \
+ echo "736"; \
fi)
MIN_VM_MEMORY := $(shell \
if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
ifeq ($(JDK_HAS_MEM_INFO),)
JDK_HAS_MEM_INFO=true
export JDK_HAS_MEM_INFO
@@ -463,10 +530,10 @@ ifeq ($(JDK_HAS_MEM_INFO),)
echo "false"; \
fi)
MAX_VM_MEMORY := $(shell \
- if [ $(MB_OF_MEMORY) -le 1024 ] ; then \
+ if [ $(MB_OF_MEMORY) -le 864 ] ; then \
expr $(MB_OF_MEMORY) '-' 128 2> $(DEV_NULL) ; \
else \
- echo "896"; \
+ echo "736"; \
fi)
MIN_VM_MEMORY := $(shell \
if [ $(MAX_VM_MEMORY) -le 128 ] ; then \

8
devel/jdk/1.7/patches/patch-jdk_make_common_shared_Sanity_gmk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_common_shared_Sanity_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/common/shared/Sanity.gmk.orig Tue Oct 30 05:04:22 2007
+++ jdk/make/common/shared/Sanity.gmk Wed Nov 7 14:51:33 2007
@@ -95,6 +95,11 @@ ifeq ($(PLATFORM), windows)
$OpenBSD: patch-jdk_make_common_shared_Sanity_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/common/shared/Sanity.gmk.orig Thu Jul 17 03:43:08 2008
+++ jdk/make/common/shared/Sanity.gmk Sat Aug 2 16:12:53 2008
@@ -96,6 +96,11 @@ ifeq ($(PLATFORM), windows)
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif

10
devel/jdk/1.7/patches/patch-jdk_make_java_java_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_java_java_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/java/Makefile.orig Tue Oct 30 05:04:22 2007
+++ jdk/make/java/java/Makefile Wed Nov 7 18:04:59 2007
@@ -167,8 +167,10 @@ OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util
$OpenBSD: patch-jdk_make_java_java_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/java/Makefile.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/java/java/Makefile Wed Aug 13 13:39:37 2008
@@ -165,8 +165,10 @@ OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util
# Is the altzone extern documented in ctime(3C) available?
#
ifneq ($(PLATFORM), windows)
@ -12,7 +12,7 @@ $OpenBSD: patch-jdk_make_java_java_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
ifeq ($(HAVE_ALTZONE),true)
OTHER_CPPFLAGS += -DHAVE_ALTZONE
@@ -205,8 +207,13 @@ ifeq ($(PLATFORM),windows)
@@ -203,8 +205,13 @@ ifeq ($(PLATFORM),windows)
OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
-libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
else

10
devel/jdk/1.7/patches/patch-jdk_make_java_jli_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.2 2008/12/22 13:22:12 kurt Exp $
--- jdk/make/java/jli/Makefile.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/java/jli/Makefile Sun Dec 21 22:10:42 2008
$OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/jli/Makefile.orig Thu Oct 23 03:44:05 2008
+++ jdk/make/java/jli/Makefile Mon Dec 22 23:24:39 2008
@@ -44,8 +44,10 @@ MS_RUNTIME_STATIC = true
include $(BUILDDIR)/common/Defs.gmk
@ -45,7 +45,7 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.2 2008/12/22 13:22:12 kurt Exp $
ifeq ($(USE_PTHREADS),true)
LDLIBS += -lpthread
endif # USE_PTHREADS
@@ -121,7 +129,11 @@ endif
@@ -123,7 +131,11 @@ endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
@ -57,7 +57,7 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.2 2008/12/22 13:22:12 kurt Exp $
#
# Library to compile.
@@ -159,7 +171,28 @@ library:: $(STATIC_LIBRARY)
@@ -161,7 +173,28 @@ library:: $(STATIC_LIBRARY)
endif # PLATFORM

10
devel/jdk/1.7/patches/patch-jdk_make_java_net_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_java_net_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/net/Makefile.orig Tue Oct 30 05:04:23 2007
+++ jdk/make/java/net/Makefile Wed Nov 7 18:01:59 2007
$OpenBSD: patch-jdk_make_java_net_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/net/Makefile.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/java/net/Makefile Wed Aug 13 13:39:37 2008
@@ -92,6 +92,12 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@ -13,8 +13,8 @@ $OpenBSD: patch-jdk_make_java_net_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
+else
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = ws2_32.lib $(JVMLIB)
# Will not compile at warning level 3 if warnings are fatal
@@ -102,6 +108,7 @@ endif
else
@@ -100,6 +106,7 @@ endif
ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += -lpthread
endif

56
devel/jdk/1.7/patches/patch-jdk_make_java_nio_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.2 2008/06/12 18:45:20 kurt Exp $
--- jdk/make/java/nio/Makefile.orig Thu Jun 12 11:40:29 2008
+++ jdk/make/java/nio/Makefile Thu Jun 12 11:40:35 2008
$OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/nio/Makefile.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/java/nio/Makefile Wed Aug 13 13:39:37 2008
@@ -82,7 +82,7 @@ FILES_export += \
sun/nio/ch/WindowsSelectorImpl.java
endif # PLATFORM = windows
@ -22,8 +22,8 @@ $OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.2 2008/06/12 18:45:20 kurt Exp $
ifeq ($(PLATFORM),windows)
OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
-libpath:$(LIBDIR) java.lib \
@@ -137,6 +142,9 @@ ifeq ($(PLATFORM), linux)
COMPILER_WARNINGS_FATAL=true
@@ -136,6 +141,9 @@ endif
ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
endif
+ifeq ($(PLATFORM), bsd)
@ -32,51 +32,13 @@ $OpenBSD: patch-jdk_make_java_nio_Makefile,v 1.2 2008/06/12 18:45:20 kurt Exp $
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
@@ -159,6 +167,9 @@ endif
@@ -157,6 +165,9 @@ FILES_m = mapfile-solaris
endif
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
endif
+endif
+ifeq ($(PLATFORM), bsd)
+FILES_m = mapfile-bsd
+endif
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@@ -191,7 +202,7 @@ sources: $(SPP) $(FILES_genout)
GEN_BUFFER_SH = genBuffer.sh
-GEN_BUFFER_CMD = SPP="$(SPP_CMD)" NAWK=$(NAWK) SED=$(SED) \
+GEN_BUFFER_CMD = SPP="$(SPP_CMD)" NAWK=$(NAWK) SED=$(SED) SH=$(SH) \
$(SH) $(GEN_BUFFER_SH)
# Public abstract buffer classes
@@ -582,7 +593,7 @@ $(BUF_GEN)/ByteBufferAsDoubleBuffer%L.java: $(BUF_SRC)
GEN_CODER_SH = genCoder.sh
-GEN_CODER_CMD = SPP="$(SPP_CMD)" SED=$(SED) NAWK=$(NAWK) $(SH) $(GEN_CODER_SH)
+GEN_CODER_CMD = SPP="$(SPP_CMD)" SED=$(SED) NAWK=$(NAWK) SH=$(SH) $(SH) $(GEN_CODER_SH)
$(CS_GEN)/CharsetDecoder.java: $(CS_SRC)/Charset-X-Coder.java $(GEN_CODER_SH)
$(prep-target)
@@ -602,7 +613,7 @@ $(CS_GEN)/CharsetEncoder.java: $(CS_SRC)/Charset-X-Cod
GEN_EX_SH = genExceptions.sh
-GEN_EX_CMD = NAWK=$(NAWK) $(SHELL) $(GEN_EX_SH)
+GEN_EX_CMD = NAWK=$(NAWK) SH=$(SH) $(SH) $(GEN_EX_SH)
$(CH_GEN)/%Exception.java: genExceptions.sh $(CH_SRC)/exceptions
$(prep-target)
@@ -635,8 +646,8 @@ $(SCS_GEN)/StandardCharsets.java: genCharsetProvider.s
$(HASHER_JARFILE) $(SCS_SRC)/standard-charsets
$(prep-target)
@$(RM) $@.temp
- NAWK=$(NAWK) TEMPDIR=$(TEMPDIR) \
+ NAWK=$(NAWK) TEMPDIR=$(TEMPDIR) SH=$(SH) \
HASHER="$(BOOT_JAVA_CMD) -jar $(HASHER_JARFILE)" \
- $(SHELL) -e genCharsetProvider.sh $(SCS_SRC)/standard-charsets $(SCS_GEN)
+ $(SH) -e genCharsetProvider.sh $(SCS_SRC)/standard-charsets $(SCS_GEN)
.PHONY: sources

12
devel/jdk/1.7/patches/patch-jdk_make_java_nio_genCharsetProvider_sh
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-jdk_make_java_nio_genCharsetProvider_sh,v 1.1 2008/06/12 18:45:20 kurt Exp $
--- jdk/make/java/nio/genCharsetProvider.sh.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/java/nio/genCharsetProvider.sh Thu Jun 12 11:40:35 2008
@@ -48,7 +48,7 @@ echo '-->' $OUT
# Header
#
-$SHELL addNotices.sh "$COPYRIGHT_YEARS" > $OUT
+$SH ./addNotices.sh "$COPYRIGHT_YEARS" > $OUT
cat <<__END__ >>$OUT

12
devel/jdk/1.7/patches/patch-jdk_make_java_nio_genExceptions_sh
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-jdk_make_java_nio_genExceptions_sh,v 1.1 2008/06/12 18:45:20 kurt Exp $
--- jdk/make/java/nio/genExceptions.sh.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/java/nio/genExceptions.sh Thu Jun 12 11:40:35 2008
@@ -41,7 +41,7 @@ gen() {
echo '-->' $DST/$ID.java
out=$DST/${ID}.java
- $SHELL addNotices.sh "$COPYRIGHT_YEARS" > $out
+ $SH ./addNotices.sh "$COPYRIGHT_YEARS" > $out
cat >>$out <<__END__

8
devel/jdk/1.7/patches/patch-jdk_make_java_npt_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_java_npt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/npt/Makefile.orig Tue Oct 30 05:04:23 2007
+++ jdk/make/java/npt/Makefile Wed Nov 7 18:01:59 2007
@@ -70,6 +70,13 @@ ifeq ($(PLATFORM), windows)
$OpenBSD: patch-jdk_make_java_npt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/npt/Makefile.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/java/npt/Makefile Wed Aug 13 13:39:37 2008
@@ -65,6 +65,13 @@ ifeq ($(PLATFORM), windows)
OTHER_LCF += -export:nptInitialize -export:nptTerminate
endif

24
devel/jdk/1.7/patches/patch-jdk_make_java_redist_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_java_redist_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/redist/Makefile.orig Tue Oct 30 05:04:23 2007
+++ jdk/make/java/redist/Makefile Wed Nov 7 18:01:59 2007
$OpenBSD: patch-jdk_make_java_redist_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/redist/Makefile.orig Thu Oct 23 03:44:05 2008
+++ jdk/make/java/redist/Makefile Mon Dec 22 14:34:19 2008
@@ -85,6 +85,11 @@ ifeq ($(SA_EXISTS), false)
INCLUDE_SA := false
endif
@ -13,21 +13,3 @@ $OpenBSD: patch-jdk_make_java_redist_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp
ifeq ($(INCLUDE_SA), true)
IMPORT_LIST += $(LIBDIR)/sa-jdi.jar \
$(LIB_LOCATION)/$(SALIB_NAME)
@@ -309,7 +314,7 @@ $(LIBDIR)/fonts/%.ttf: $(CLOSED_SRC)/share/lib/fonts/%
$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
$(install-file)
-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
# The oblique fonts are only needed/wanted on Linux.
@@ -323,7 +328,7 @@ $(LIBDIR)/oblique-fonts/%.ttf: $(CLOSED_SRC)/share/lib
$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
$(install-file)
-endif # linux
+endif # linux || bsd
endif # !OPENJDK
# Import internal files (ones that are stashed in this source tree)

8
devel/jdk/1.7/patches/patch-jdk_make_java_sun_nio_FILES_java_gmk
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_java_sun_nio_FILES_java_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/sun_nio/FILES_java.gmk.orig Tue Oct 30 05:04:23 2007
+++ jdk/make/java/sun_nio/FILES_java.gmk Wed Nov 7 18:01:59 2007
@@ -130,6 +130,8 @@ FILES_java += \
$OpenBSD: patch-jdk_make_java_sun_nio_FILES_java_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/sun_nio/FILES_java.gmk.orig Thu Jul 17 03:43:08 2008
+++ jdk/make/java/sun_nio/FILES_java.gmk Sat Aug 2 16:12:53 2008
@@ -131,6 +131,8 @@ FILES_java += \
sun/io/CharToByteCp1257.java \
sun/io/ByteToCharKOI8_R.java \
sun/io/CharToByteKOI8_R.java \

8
devel/jdk/1.7/patches/patch-jdk_make_java_zip_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_java_zip_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/java/zip/Makefile.orig Tue Oct 30 05:04:24 2007
+++ jdk/make/java/zip/Makefile Wed Nov 7 18:01:59 2007
@@ -72,16 +72,24 @@ else
$OpenBSD: patch-jdk_make_java_zip_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/java/zip/Makefile.orig Mon Aug 4 03:43:01 2008
+++ jdk/make/java/zip/Makefile Wed Aug 13 13:39:37 2008
@@ -69,16 +69,24 @@ else
CPPFLAGS += -UDEBUG
endif

8
devel/jdk/1.7/patches/patch-jdk_make_jpda_transport_socket_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_jpda_transport_socket_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/jpda/transport/socket/Makefile.orig Tue Oct 30 05:04:24 2007
+++ jdk/make/jpda/transport/socket/Makefile Wed Nov 7 18:08:26 2007
@@ -45,6 +45,11 @@ ifeq ($(PLATFORM), linux)
$OpenBSD: patch-jdk_make_jpda_transport_socket_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/jpda/transport/socket/Makefile.orig Mon Aug 4 03:43:02 2008
+++ jdk/make/jpda/transport/socket/Makefile Wed Aug 13 13:39:37 2008
@@ -40,6 +40,11 @@ ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
endif

16
devel/jdk/1.7/patches/patch-jdk_make_sun_awt_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/sun/awt/Makefile.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/sun/awt/Makefile Mon Mar 3 17:25:04 2008
@@ -128,6 +128,13 @@ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
$OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/awt/Makefile.orig Thu Sep 11 03:44:07 2008
+++ jdk/make/sun/awt/Makefile Fri Sep 12 17:05:55 2008
@@ -123,6 +123,13 @@ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
endif
@ -15,7 +15,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
FILES_c += initIDs.c
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
@@ -240,7 +247,7 @@ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font
@@ -235,7 +242,7 @@ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
endif # PLATFORM
@ -24,7 +24,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
@@ -389,6 +396,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
@@ -384,6 +391,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
endif # PLATFORM
@ -44,7 +44,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
@@ -481,6 +501,9 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
@@ -476,6 +496,9 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
-I$(OPENWIN_HOME)/include/X11/extensions \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/font
endif
@ -54,7 +54,7 @@ $OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
@@ -502,7 +525,13 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
@@ -497,7 +520,13 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)

50
devel/jdk/1.7/patches/patch-jdk_make_sun_awt_mawt_gmk
View File

@ -1,34 +1,16 @@
$OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/sun/awt/mawt.gmk.orig Tue Oct 30 05:04:26 2007
+++ jdk/make/sun/awt/mawt.gmk Wed Nov 7 18:13:36 2007
@@ -139,7 +139,7 @@ CFLAGS += -DMOTIF_VERSION=$(MOTIF_VERSION)
ifeq ($(STATIC_MOTIF),true)
LIBXM = $(MOTIF_LIB)/libXm.a -lXp -lXmu
- ifeq ($(PLATFORM), linux)
+ ifneq (,$(findstring $(PLATFORM), linux bsd))
ifeq ($(ARCH_DATA_MODEL), 64)
LIBXT = -lXt
else
@@ -154,7 +154,7 @@ ifeq ($(STATIC_MOTIF),true)
endif
else
LIBXM = -L$(MOTIF_LIB) -lXm -lXp
- ifeq ($(PLATFORM), linux)
+ ifneq (,$(findstring $(PLATFORM), linux bsd))
LIBXT = -lXt
LIBSM =
LIBICE =
@@ -172,7 +172,7 @@ ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS = $(LIBXM) -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
$OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/awt/mawt.gmk.orig Thu Oct 23 03:44:06 2008
+++ jdk/make/sun/awt/mawt.gmk Mon Dec 22 16:54:06 2008
@@ -167,7 +167,7 @@ ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
OTHER_CFLAGS += -DMOTIF_VERSION=2
# XXX what is this define below? Isn't it motif-related?
OTHER_CFLAGS += -DXMSTRINGDEFINES=1
@@ -183,8 +183,12 @@ endif
@@ -178,8 +178,12 @@ endif
# !HEADLESS
OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \
@ -42,23 +24,7 @@ $OpenBSD: patch-jdk_make_sun_awt_mawt_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
#
# Sun CC with -Xa misdefines __STDC__ to 0 (zero).
# The following will force checking of X11 prototypes.
@@ -196,15 +200,6 @@ endif
#
# Other extra flags needed for compiling.
#
-CPPFLAGS += -I$(CUPS_HEADERS_PATH)
-
-ifndef HEADLESS
-CPPFLAGS += -I$(MOTIF_DIR)/include \
- -I$(OPENWIN_HOME)/include
-LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
-
-endif # !HEADLESS
-
CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
@@ -227,10 +222,24 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
@@ -221,10 +225,24 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)

10
devel/jdk/1.7/patches/patch-jdk_make_sun_font_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_sun_font_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/sun/font/Makefile.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/sun/font/Makefile Sun Mar 2 15:09:35 2008
@@ -177,6 +177,10 @@ else # PLATFORM
$OpenBSD: patch-jdk_make_sun_font_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/font/Makefile.orig Thu Sep 11 03:44:07 2008
+++ jdk/make/sun/font/Makefile Fri Sep 12 17:05:56 2008
@@ -170,6 +170,10 @@ else # PLATFORM
# Libraries to link, and other C flags.
#
@ -12,7 +12,7 @@ $OpenBSD: patch-jdk_make_sun_font_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
ifeq ($(PLATFORM), solaris)
# Note that on Solaris, fontmanager is built against the headless library.
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless
@@ -186,6 +190,7 @@ else # PLATFORM is linux
@@ -179,6 +183,7 @@ else # PLATFORM is linux
ifeq ("$(CC_VER_MAJOR)", "3")
OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
endif

8
devel/jdk/1.7/patches/patch-jdk_make_sun_image_generic_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_sun_image_generic_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/sun/image/generic/Makefile.orig Tue Oct 30 05:04:26 2007
+++ jdk/make/sun/image/generic/Makefile Wed Nov 7 18:13:36 2007
@@ -69,5 +69,9 @@ CPPFLAGS += \
$OpenBSD: patch-jdk_make_sun_image_generic_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/image/generic/Makefile.orig Thu Sep 11 03:44:07 2008
+++ jdk/make/sun/image/generic/Makefile Fri Sep 12 17:05:56 2008
@@ -68,5 +68,9 @@ CPPFLAGS += \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES

14
devel/jdk/1.7/patches/patch-jdk_make_sun_jawt_Makefile
View File

@ -1,27 +1,25 @@
$OpenBSD: patch-jdk_make_sun_jawt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/sun/jawt/Makefile.orig Tue Oct 30 05:04:27 2007
+++ jdk/make/sun/jawt/Makefile Wed Nov 7 18:13:36 2007
@@ -92,9 +92,7 @@ else # PLATFORM
$OpenBSD: patch-jdk_make_sun_jawt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/jawt/Makefile.orig Thu Oct 23 03:44:06 2008
+++ jdk/make/sun/jawt/Makefile Mon Dec 22 16:55:56 2008
@@ -92,8 +92,7 @@ else # PLATFORM
#
# Other extra flags needed for compiling.
#
-CPPFLAGS += -I$(OPENWIN_HOME)/include \
- -I$(MOTIF_DIR)/include \
- -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(SHARE_SRC)/native/$(PKGDIR)/image \
-I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
-I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
@@ -108,6 +106,8 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
@@ -107,6 +106,7 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
-I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
-I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
+ -I$(OPENWIN_HOME)/include \
+ -I$(MOTIF_DIR)/include \
$(EVENT_MODEL)
#
# Libraries to link in.
@@ -116,7 +116,7 @@ ifeq ($(PLATFORM), solaris)
@@ -115,7 +115,7 @@ ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
endif # PLATFORM

8
devel/jdk/1.7/patches/patch-jdk_make_sun_security_pkcs11_Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_make_sun_security_pkcs11_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/sun/security/pkcs11/Makefile.orig Tue Oct 30 05:04:28 2007
+++ jdk/make/sun/security/pkcs11/Makefile Wed Nov 7 18:13:36 2007
@@ -138,7 +138,7 @@ include $(BUILDDIR)/common/Library.gmk
$OpenBSD: patch-jdk_make_sun_security_pkcs11_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/security/pkcs11/Makefile.orig Thu Jul 17 03:43:09 2008
+++ jdk/make/sun/security/pkcs11/Makefile Sat Aug 2 16:12:53 2008
@@ -155,7 +155,7 @@ include $(BUILDDIR)/common/Library.gmk
#
# Libraries to link
#

6
devel/jdk/1.7/patches/patch-jdk_make_sun_splashscreen_FILES_c_gmk
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_sun_splashscreen_FILES_c_gmk,v 1.1 2008/12/22 13:22:12 kurt Exp $
--- jdk/make/sun/splashscreen/FILES_c.gmk.orig Sun Dec 21 22:11:05 2008
+++ jdk/make/sun/splashscreen/FILES_c.gmk Sun Dec 21 22:11:53 2008
$OpenBSD: patch-jdk_make_sun_splashscreen_FILES_c_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/splashscreen/FILES_c.gmk.orig Mon Dec 22 23:26:23 2008
+++ jdk/make/sun/splashscreen/FILES_c.gmk Mon Dec 22 23:42:49 2008
@@ -49,20 +49,6 @@ FILES_c = \
dgif_lib.c \
gif_err.c \

10
devel/jdk/1.7/patches/patch-jdk_make_sun_splashscreen_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.2 2008/12/22 13:22:12 kurt Exp $
--- jdk/make/sun/splashscreen/Makefile.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/sun/splashscreen/Makefile Sun Dec 21 22:13:22 2008
$OpenBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.3 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/splashscreen/Makefile.orig Thu Oct 23 03:44:06 2008
+++ jdk/make/sun/splashscreen/Makefile Mon Dec 22 23:25:34 2008
@@ -61,10 +61,25 @@ JAVALIB=
CFLAGS += -DSPLASHSCREEN
@ -29,7 +29,7 @@ $OpenBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.2 2008/12/22 13:22:12 kur
else # PLATFORM
CFLAGS += -DWITH_WIN32
OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
@@ -77,11 +92,10 @@ endif # PLATFORM
@@ -77,13 +92,12 @@ endif # PLATFORM
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib
@ -43,3 +43,5 @@ $OpenBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.2 2008/12/22 13:22:12 kur
-CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
ifeq ($(PLATFORM), linux)
ifeq ($(ARCH_DATA_MODEL), 64)

6
devel/jdk/1.7/patches/patch-jdk_make_sun_xawt_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_make_sun_xawt_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/sun/xawt/Makefile.orig Sat Dec 1 00:00:00 2007
+++ jdk/make/sun/xawt/Makefile Thu Feb 28 16:11:43 2008
$OpenBSD: patch-jdk_make_sun_xawt_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/sun/xawt/Makefile.orig Thu Oct 23 03:44:06 2008
+++ jdk/make/sun/xawt/Makefile Mon Dec 22 16:59:00 2008
@@ -53,6 +53,11 @@ LDFLAGS += -lpthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif

18
devel/jdk/1.7/patches/patch-jdk_make_tools_freetypecheck_Makefile
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-jdk_make_tools_freetypecheck_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/make/tools/freetypecheck/Makefile.orig Tue Feb 26 18:56:57 2008
+++ jdk/make/tools/freetypecheck/Makefile Tue Feb 26 18:59:30 2008
@@ -53,8 +53,12 @@ else
#add runtime lib search path to ensure test will be runnable
$OpenBSD: patch-jdk_make_tools_freetypecheck_Makefile,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/make/tools/freetypecheck/Makefile.orig Thu Jul 17 03:43:10 2008
+++ jdk/make/tools/freetypecheck/Makefile Fri Aug 8 12:25:51 2008
@@ -44,8 +44,12 @@ else
# Add runtime lib search path to ensure test will be runnable
ifeq ($(PLATFORM), solaris)
FT_OPTIONS += -R $(FT_LIB) -lfreetype
FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype
- else #linux
+ else
+ ifeq ($(PLATFORM), bsd)
+ FT_OPTIONS += -lfreetype -lz
+ FT_LD_OPTIONS += -lfreetype -lz
+ else # linux
FT_OPTIONS += -Wl,-rpath -Wl,$(FT_LIB) -lfreetype
FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
+ endif
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)

27
devel/jdk/1.7/patches/patch-jdk_src_share_classes_java_lang_ClassLoader_java
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-jdk_src_share_classes_java_lang_ClassLoader_java,v 1.1 2008/03/19 18:05:45 kurt Exp $
--- jdk/src/share/classes/java/lang/ClassLoader.java.orig Tue Oct 30 05:01:08 2007
+++ jdk/src/share/classes/java/lang/ClassLoader.java Wed Nov 7 18:53:13 2007
$OpenBSD: patch-jdk_src_share_classes_java_lang_ClassLoader_java,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/src/share/classes/java/lang/ClassLoader.java.orig Thu Jul 17 03:43:19 2008
+++ jdk/src/share/classes/java/lang/ClassLoader.java Fri Aug 8 16:13:51 2008
@@ -27,6 +27,7 @@ package java.lang;
import java.io.InputStream;
import java.io.IOException;
@ -9,7 +9,7 @@ $OpenBSD: patch-jdk_src_share_classes_java_lang_ClassLoader_java,v 1.1 2008/03/1
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
@@ -47,6 +48,7 @@ import java.util.Set;
@@ -48,6 +49,7 @@ import java.util.Set;
import java.util.Stack;
import java.util.Map;
import java.util.Vector;
@ -17,13 +17,13 @@ $OpenBSD: patch-jdk_src_share_classes_java_lang_ClassLoader_java,v 1.1 2008/03/1
import sun.misc.ClassFileTransformer;
import sun.misc.CompoundEnumeration;
import sun.misc.Resource;
@@ -1699,18 +1701,43 @@ public abstract class ClassLoader {
@@ -1706,18 +1708,42 @@ public abstract class ClassLoader {
}
private static boolean loadLibrary0(Class fromClass, final File file) {
- Boolean exists = (Boolean)
+ File libfile = (File)
AccessController.doPrivileged(new PrivilegedAction() {
- boolean exists = AccessController.doPrivileged(
+ File libfile = (File) AccessController.doPrivileged(
new PrivilegedAction<Object>() {
+ class LibraryFileFilter implements FilenameFilter {
+ String lib_name;
+ LibraryFileFilter(String lib_name) { this.lib_name = lib_name; }
@ -36,7 +36,10 @@ $OpenBSD: patch-jdk_src_share_classes_java_lang_ClassLoader_java,v 1.1 2008/03/1
+ }
+
public Object run() {
- return new Boolean(file.exists());
- return file.exists() ? Boolean.TRUE : null;
- }})
- != null;
- if (!exists) {
+ if (file.exists())
+ return file;
+ // if file is unversioned, check for a versioned one in same dir
@ -52,16 +55,14 @@ $OpenBSD: patch-jdk_src_share_classes_java_lang_ClassLoader_java,v 1.1 2008/03/1
+ }
+ }
+ return null;
}
});
- if (!exists.booleanValue()) {
+ }});
+ if (libfile == null) {
return false;
}
String name;
try {
- name = file.getCanonicalPath();
+ name = libfile.getCanonicalPath();
+ name = libfile.getCanonicalPath();
} catch (IOException e) {
return false;
}

10
devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_awt_FontConfiguration_java
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_src_share_classes_sun_awt_FontConfiguration_java,v 1.1 2008/03/19 18:05:46 kurt Exp $
--- jdk/src/share/classes/sun/awt/FontConfiguration.java.orig Tue Oct 30 05:02:38 2007
+++ jdk/src/share/classes/sun/awt/FontConfiguration.java Wed Nov 7 18:55:44 2007
@@ -1073,7 +1073,7 @@ public abstract class FontConfiguration {
$OpenBSD: patch-jdk_src_share_classes_sun_awt_FontConfiguration_java,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/src/share/classes/sun/awt/FontConfiguration.java.orig Thu Sep 11 03:44:31 2008
+++ jdk/src/share/classes/sun/awt/FontConfiguration.java Fri Sep 12 17:05:57 2008
@@ -1121,7 +1121,7 @@ public abstract class FontConfiguration {
*/
HashMap<String, Boolean> existsMap;
public boolean needToSearchForFile(String fileName) {
@ -10,7 +10,7 @@ $OpenBSD: patch-jdk_src_share_classes_sun_awt_FontConfiguration_java,v 1.1 2008/
return false;
} else if (existsMap == null) {
existsMap = new HashMap<String, Boolean>();
@@ -1309,7 +1309,7 @@ public abstract class FontConfiguration {
@@ -1357,7 +1357,7 @@ public abstract class FontConfiguration {
+ "<filename."
+ getString(table_componentFontNameIDs[ii])
+ "> entry is missing!!!");

82
devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_awt_image_SunWritableRaster_java
View File

@ -1,82 +0,0 @@
$OpenBSD: patch-jdk_src_share_classes_sun_awt_image_SunWritableRaster_java,v 1.1 2008/03/21 02:46:43 kurt Exp $
--- jdk/src/share/classes/sun/awt/image/SunWritableRaster.java.orig Thu Mar 20 14:05:33 2008
+++ jdk/src/share/classes/sun/awt/image/SunWritableRaster.java Thu Mar 20 14:09:26 2008
@@ -56,50 +56,44 @@ public class SunWritableRaster extends WritableRaster
public StateTrackableDelegate getTrackable(DataBuffer db);
}
+/*
public static void setDataStealer(DataStealer ds) {
if (stealer != null) {
throw new InternalError("Attempt to set DataStealer twice");
}
stealer = ds;
}
+*/
public static byte[] stealData(DataBufferByte dbb, int bank) {
- return stealer.getData(dbb, bank);
+ return dbb.getData(bank);
}
public static short[] stealData(DataBufferUShort dbus, int bank) {
- return stealer.getData(dbus, bank);
+ return dbus.getData(bank);
}
public static int[] stealData(DataBufferInt dbi, int bank) {
- return stealer.getData(dbi, bank);
+ return dbi.getData(bank);
}
public static StateTrackableDelegate stealTrackable(DataBuffer db) {
- return stealer.getTrackable(db);
+ return StateTrackableDelegate.UNTRACKABLE_DELEGATE;
}
public static void markDirty(DataBuffer db) {
- stealer.getTrackable(db).markDirty();
}
public static void markDirty(WritableRaster wr) {
- if (wr instanceof SunWritableRaster) {
- ((SunWritableRaster) wr).markDirty();
- } else {
- markDirty(wr.getDataBuffer());
- }
}
public static void markDirty(Image img) {
- SurfaceData.getPrimarySurfaceData(img).markDirty();
}
private StateTrackableDelegate theTrackable;
public SunWritableRaster(SampleModel sampleModel, Point origin) {
super(sampleModel, origin);
- theTrackable = stealTrackable(dataBuffer);
}
public SunWritableRaster(SampleModel sampleModel,
@@ -107,7 +101,6 @@ public class SunWritableRaster extends WritableRaster
Point origin)
{
super(sampleModel, dataBuffer, origin);
- theTrackable = stealTrackable(dataBuffer);
}
public SunWritableRaster(SampleModel sampleModel,
@@ -117,13 +110,11 @@ public class SunWritableRaster extends WritableRaster
WritableRaster parent)
{
super(sampleModel, dataBuffer, aRegion, sampleModelTranslate, parent);
- theTrackable = stealTrackable(dataBuffer);
}
/**
* Mark the TrackableDelegate of the associated DataBuffer dirty.
*/
public final void markDirty() {
- theTrackable.markDirty();
}
}

8
devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_font_FontManager_java
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jdk_src_share_classes_sun_font_FontManager_java,v 1.1 2008/03/19 18:05:46 kurt Exp $
--- jdk/src/share/classes/sun/font/FontManager.java.orig Tue Oct 30 05:02:41 2007
+++ jdk/src/share/classes/sun/font/FontManager.java Wed Nov 7 18:16:18 2007
@@ -3696,7 +3696,7 @@ public final class FontManager {
$OpenBSD: patch-jdk_src_share_classes_sun_font_FontManager_java,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/src/share/classes/sun/font/FontManager.java.orig Thu Sep 11 03:44:32 2008
+++ jdk/src/share/classes/sun/font/FontManager.java Fri Sep 12 17:05:57 2008
@@ -3779,7 +3779,7 @@ public final class FontManager {
boolean.class, int.class};
try {

16
devel/jdk/1.7/patches/patch-jdk_src_share_classes_sun_java2d_SunGraphicsEnvironment_java
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-jdk_src_share_classes_sun_java2d_SunGraphicsEnvironment_java,v 1.1 2008/03/19 18:05:46 kurt Exp $
--- jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java.orig Tue Oct 30 05:02:49 2007
+++ jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java Wed Nov 7 18:56:38 2007
@@ -76,7 +76,7 @@ import sun.font.NativeFont;
$OpenBSD: patch-jdk_src_share_classes_sun_java2d_SunGraphicsEnvironment_java,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java.orig Thu Sep 11 03:44:33 2008
+++ jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java Fri Sep 12 17:05:58 2008
@@ -77,7 +77,7 @@ import sun.font.NativeFont;
public abstract class SunGraphicsEnvironment extends GraphicsEnvironment
implements FontSupport, DisplayChangedListener {
- public static boolean isLinux;
+ public static boolean isLinuxOrBSD;
public static boolean isSolaris;
public static boolean isOpenSolaris;
public static boolean isWindows;
public static boolean noType1Font;
@@ -164,7 +164,13 @@ public abstract class SunGraphicsEnvironment extends G
@@ -166,7 +166,13 @@ public abstract class SunGraphicsEnvironment extends G
public Object run() {
String osName = System.getProperty("os.name");
if ("Linux".equals(osName)) {
@ -24,8 +24,8 @@ $OpenBSD: patch-jdk_src_share_classes_sun_java2d_SunGraphicsEnvironment_java,v 1
+ isLinuxOrBSD = true;
} else if ("SunOS".equals(osName)) {
isSolaris = true;
} else if ("Windows".equals(osName)) {
@@ -227,8 +233,8 @@ public abstract class SunGraphicsEnvironment extends G
String version = System.getProperty("os.version", "0.0");
@@ -242,8 +248,8 @@ public abstract class SunGraphicsEnvironment extends G
* Pass "true" to registerFonts method as on-screen these
* JRE fonts always go through the T2K rasteriser.
*/

Some files were not shown because too many files have changed in this diff Show More