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

Various minor corrections:

Browse Source 
- Remove some patches no longer needed
- Sync some corba and jdk makefiles with bsd-port repo
- Another datatype correction in hotspot
- Use proper scoping for clock_get* from bsd-port repo
- Use includeDB corrections from Coleen Phillimore @ Sun
instead of my own ones. From hotspot-dev list.
This commit is contained in:
kurt 2009-01-16 16:49:29 +00:00
parent 4def6dd506
commit 3c269147e5
18 changed files with 264 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/jdk/1.7/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2009/01/04 23:25:15 kurt Exp $
# $OpenBSD: Makefile,v 1.25 2009/01/16 16:49:29 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= i386 amd64
@ -10,8 +10,8 @@ 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}
PKGNAME-jre= jre-${V}${B}
PKGNAME-main= jdk-${V}${B}p0
PKGNAME-jre= jre-${V}${B}p0
CATEGORIES= devel/jdk java

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

@ -1,11 +0,0 @@
$OpenBSD: patch-corba_make_com_sun_corba_minclude_com_sun_corba_se_spi_orb_jmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orb.jmk.orig Sat Mar 1 16:55:44 2008
+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_spi_orb.jmk Sat Mar 1 16:57:27 2008
@@ -24,6 +24,7 @@
#
com_sun_corba_se_spi_orb_java = \
+ com/sun/corba/se/org/omg/CORBA/ORB.java \
com/sun/corba/se/spi/orb/DataCollector.java \
com/sun/corba/se/spi/orb/ORBConfigurator.java \
com/sun/corba/se/spi/orb/ORBData.java \

33
devel/jdk/1.7/patches/patch-corba_make_common_Defs_gmk
View File

@ -1,7 +1,32 @@
$OpenBSD: patch-corba_make_common_Defs_gmk,v 1.1 2008/03/19 18:05:43 kurt Exp $
--- corba/make/common/Defs.gmk.orig Thu Nov 8 11:46:42 2007
+++ corba/make/common/Defs.gmk Thu Nov 8 11:47:38 2007
@@ -97,6 +97,9 @@ ifdef PROGRAM
$OpenBSD: patch-corba_make_common_Defs_gmk,v 1.2 2009/01/16 16:49:29 kurt Exp $
--- corba/make/common/Defs.gmk.orig Fri Dec 19 03:41:17 2008
+++ corba/make/common/Defs.gmk Sun Jan 11 21:40:13 2009
@@ -53,6 +53,24 @@ endif
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
+ifneq ($(PLATFORM), windows)
+ ifdef ALT_X11_PATH
+ X11_PATH = $(ALT_X11_PATH)
+ else
+ X11_PATH = /usr/X11R6
+ endif
+
+ ifdef ALT_PACKAGE_PATH
+ PACKAGE_PATH = $(ALT_PACKAGE_PATH)
+ else
+ ifeq ($(PLATFORM), linux)
+ PACKAGE_PATH = /usr
+ else
+ PACKAGE_PATH = /usr/local
+ endif
+ endif
+endif
+
#
# Get platform definitions
#
@@ -97,6 +115,9 @@ ifdef PROGRAM
LDLIBS_COMMON = -ldl
endif

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

@ -1,12 +1,12 @@
$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
$OpenBSD: patch-corba_make_common_shared_Defs-bsd_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- corba/make/common/shared/Defs-bsd.gmk.orig Sun Jan 11 21:36:06 2009
+++ corba/make/common/shared/Defs-bsd.gmk Sun Jan 11 21:41:48 2009
@@ -54,7 +54,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && p
endef
# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/opt/java
+USRJDKINSTANCES_PATH =/usr/lock
+USRJDKINSTANCES_PATH =$(PACKAGE_PATH)
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
@ -15,7 +15,7 @@ $OpenBSD: patch-corba_make_common_shared_Defs-bsd_gmk,v 1.2 2009/01/04 23:25:16
DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
else
- DEVTOOLS_PATH =/usr/bin/
+ DEVTOOLS_PATH =/usr/local/bin/
+ DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.

61
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.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
$OpenBSD: patch-corba_make_common_shared_Defs-utils_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- corba/make/common/shared/Defs-utils.gmk.orig Fri Dec 19 03:41:17 2008
+++ corba/make/common/shared/Defs-utils.gmk Wed Jan 14 12:26:56 2009
@@ -53,6 +53,13 @@ ifeq ($(PLATFORM),linux)
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
endif
@ -15,29 +15,36 @@ $OpenBSD: patch-corba_make_common_shared_Defs-utils_gmk,v 1.2 2009/01/04 23:25:1
ifeq ($(PLATFORM),solaris)
UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
@@ -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
+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
@@ -199,3 +206,32 @@ ifeq ($(PLATFORM),solaris)
ECHO = /usr/bin/echo
endif
# Solaris specific
+# 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
+ TEST = $(UTILS_COMMAND_PATH)test
+ TOUCH = $(UTILS_USR_BIN_PATH)touch
+ TRUE = $(UTILS_USR_BIN_PATH)true
+ UNAME = $(UTILS_USR_BIN_PATH)uname
+ # BSD OS_VENDOR specific
+ ifeq ($(OS_VENDOR), Apple)
+ NAWK = $(UTILS_USR_BIN_PATH)awk
+ UNZIPSFX = $(UTILS_USR_BIN_PATH)unzipsfx
+ ZIPEXE = $(UTILS_USR_BIN_PATH)zip
+ else
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+ ifneq ($(OS_VENDOR), OpenBSD)
+ CPIO = $(UTILS_USR_BIN_PATH)cpio
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif

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

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp,v 1.2 2009/01/04 23:25:16 kurt Exp $
$OpenBSD: patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp,v 1.3 2009/01/16 16:49:29 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
+++ hotspot/src/cpu/x86/vm/interpreterRT_x86_32.cpp Wed Jan 14 12:04:27 2009
@@ -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;
@ -10,3 +10,12 @@ $OpenBSD: patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_32_cpp,v 1.2 2009/01/04
__ bind(L);
__ movptr(Address(to(), to_offset * wordSize), temp());
}
@@ -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();
}

12
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.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
$OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.8 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig Wed Jan 14 13:01:37 2009
+++ hotspot/src/os/bsd/vm/os_bsd.cpp Wed Jan 14 13:03:52 2009
@@ -47,13 +47,26 @@
# include <semaphore.h>
# include <fcntl.h>
@ -389,10 +389,10 @@ $OpenBSD: patch-hotspot_src_os_bsd_vm_os_bsd_cpp,v 1.7 2009/01/04 23:25:16 kurt
void os::Bsd::clock_init() {
+ struct timespec res;
+ struct timespec tp;
+ if (clock_getres(CLOCK_MONOTONIC, &res) == 0 &&
+ clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+ if (::clock_getres(CLOCK_MONOTONIC, &res) == 0 &&
+ ::clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+ // yes, monotonic clock is supported
+ _clock_gettime = clock_gettime;
+ _clock_gettime = ::clock_gettime;
+ }
+}
+#else

11
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_concurrentMarkSweep Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_concurrentMarkSweep,v 1.1 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.orig Fri Dec 19 03:42:09 2008
+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep Wed Jan 14 11:45:05 2009
@@ -28,6 +28,7 @@ binaryTreeDictionary.cpp allocationStat
binaryTreeDictionary.cpp binaryTreeDictionary.hpp
binaryTreeDictionary.cpp globals.hpp
binaryTreeDictionary.cpp ostream.hpp
+binaryTreeDictionary.cpp space.inline.hpp
binaryTreeDictionary.cpp spaceDecorator.hpp
binaryTreeDictionary.hpp freeBlockDictionary.hpp

28
devel/jdk/1.7/patches/patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_g1 Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_g1,v 1.1 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_g1.orig Fri Dec 19 03:42:09 2008
+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_g1 Wed Jan 14 11:45:05 2009
@@ -34,6 +34,7 @@ cardTableRS.cpp g1SATBCardTableModRefBS.hpp
collectionSetChooser.cpp g1CollectedHeap.hpp
collectionSetChooser.cpp g1CollectorPolicy.hpp
collectionSetChooser.cpp collectionSetChooser.hpp
+collectionSetChooser.cpp space.inline.hpp
collectionSetChooser.hpp heapRegion.hpp
collectionSetChooser.hpp growableArray.hpp
@@ -44,6 +45,7 @@ concurrentG1Refine.cpp concurrentG1RefineThread.hpp
concurrentG1Refine.cpp copy.hpp
concurrentG1Refine.cpp g1CollectedHeap.hpp
concurrentG1Refine.cpp g1RemSet.hpp
+concurrentG1Refine.cpp space.inline.hpp
concurrentG1Refine.hpp globalDefinitions.hpp
@@ -264,7 +266,7 @@ heapRegion.cpp heapRegionSeq.
heapRegion.cpp iterator.hpp
heapRegion.cpp oop.inline.hpp
-heapRegion.hpp space.hpp
+heapRegion.hpp space.inline.hpp
heapRegion.hpp spaceDecorator.hpp
heapRegion.hpp g1BlockOffsetTable.inline.hpp
heapRegion.hpp watermark.hpp

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

@ -1,7 +1,16 @@
$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
$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parNew,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew.orig Fri Dec 19 03:42:09 2008
+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parNew Wed Jan 14 11:45:05 2009
@@ -29,6 +29,8 @@ asParNewGeneration.cpp asParNewGenera
asParNewGeneration.cpp cmsAdaptiveSizePolicy.hpp
asParNewGeneration.cpp cmsGCAdaptivePolicyCounters.hpp
asParNewGeneration.cpp defNewGeneration.inline.hpp
+asParNewGeneration.cpp markOop.inline.hpp
+asParNewGeneration.cpp markSweep.inline.hpp
asParNewGeneration.cpp oop.pcgc.inline.hpp
asParNewGeneration.cpp parNewGeneration.hpp
asParNewGeneration.cpp referencePolicy.hpp
@@ -40,7 +42,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_gc_implementation_includeDB_gc_parallelScavenge Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_share_vm_gc_implementation_includeDB_gc_parallelScavenge,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.orig Fri Dec 19 03:42:09 2008
+++ hotspot/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge Wed Jan 14 11:45:05 2009
@@ -306,6 +306,8 @@ psPermGen.cpp parallelScaven
psPermGen.cpp psMarkSweepDecorator.hpp
psPermGen.cpp psParallelCompact.hpp
psPermGen.cpp psPermGen.hpp
+psPermGen.cpp markOop.inline.hpp
+psPermGen.cpp markSweep.inline.hpp
psPermGen.hpp psOldGen.hpp

32
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.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
$OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.6 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/includeDB_compiler2.orig Fri Dec 19 03:42:10 2008
+++ hotspot/src/share/vm/includeDB_compiler2 Wed Jan 14 11:45:05 2009
@@ -140,6 +140,7 @@ c2_globals_<os_family>.hpp globalDefiniti
c2_globals_<os_family>.hpp macros.hpp
@ -9,31 +9,7 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_compiler2,v 1.5 2009/01/04 23:25:
c2compiler.cpp ad_<arch_model>.hpp
c2compiler.cpp c2compiler.hpp
@@ -161,6 +162,7 @@ callGenerator.cpp subnode.hpp
callGenerator.hpp callnode.hpp
callGenerator.hpp compile.hpp
callGenerator.hpp deoptimization.hpp
+callGenerator.hpp node.hpp
callGenerator.hpp type.hpp
callnode.cpp callnode.hpp
@@ -480,6 +482,7 @@ graphKit.hpp cfgnode.hpp
graphKit.hpp ciEnv.hpp
graphKit.hpp compile.hpp
graphKit.hpp deoptimization.hpp
+graphKit.hpp node.hpp
graphKit.hpp phaseX.hpp
graphKit.hpp type.hpp
@@ -525,6 +528,7 @@ indexSet.cpp regmask.hpp
indexSet.hpp allocation.hpp
indexSet.hpp compile.hpp
+indexSet.hpp node.hpp
indexSet.hpp regmask.hpp
indexSet.hpp resourceArea.hpp
@@ -839,6 +843,7 @@ parseHelper.cpp systemDictiona
@@ -839,6 +840,7 @@ parseHelper.cpp systemDictiona
phase.cpp compile.hpp
phase.cpp compileBroker.hpp
phase.cpp nmethod.hpp

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

@ -1,6 +1,6 @@
$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.6 2009/01/04 23:25:16 kurt Exp $
$OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.7 2009/01/16 16:49:29 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
+++ hotspot/src/share/vm/includeDB_core Fri Jan 16 09:38:20 2009
@@ -473,7 +473,7 @@ cardTableModRefBS.cpp cardTableRS.hp
cardTableModRefBS.cpp java.hpp
cardTableModRefBS.cpp mutexLocker.hpp
@ -10,53 +10,20 @@ $OpenBSD: patch-hotspot_src_share_vm_includeDB_core,v 1.6 2009/01/04 23:25:16 ku
cardTableModRefBS.cpp universe.hpp
cardTableModRefBS.cpp virtualspace.hpp
@@ -1036,15 +1036,14 @@ compactPermGen.hpp permGen.hpp
compactingPermGenGen.cpp compactingPermGenGen.hpp
compactingPermGenGen.cpp filemap.hpp
compactingPermGenGen.cpp genOopClosures.inline.hpp
-compactingPermGenGen.cpp generation.inline.hpp
compactingPermGenGen.cpp generationSpec.hpp
compactingPermGenGen.cpp java.hpp
compactingPermGenGen.cpp oop.inline.hpp
compactingPermGenGen.cpp symbolTable.hpp
compactingPermGenGen.cpp systemDictionary.hpp
@@ -2014,7 +2014,7 @@ instanceKlass.cpp verifier.hpp
instanceKlass.cpp vmSymbols.hpp
+compactingPermGenGen.hpp generation.inline.hpp
compactingPermGenGen.hpp generationCounters.hpp
-compactingPermGenGen.hpp space.hpp
instanceKlass.hpp accessFlags.hpp
-instanceKlass.hpp bitMap.hpp
+instanceKlass.hpp bitMap.inline.hpp
instanceKlass.hpp constMethodOop.hpp
instanceKlass.hpp constantPoolOop.hpp
instanceKlass.hpp handles.hpp
@@ -3771,6 +3771,7 @@ spaceDecorator.hpp space.hpp
compilationPolicy.cpp compilationPolicy.hpp
compilationPolicy.cpp compiledIC.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
genOopClosures.hpp oop.hpp
@@ -2533,6 +2532,7 @@ klass.hpp specialized_oo
klass.inline.hpp klass.hpp
klass.inline.hpp markOop.hpp
+klass.inline.hpp markOop.inline.hpp
klassKlass.cpp collectedHeap.hpp
klassKlass.cpp collectedHeap.inline.hpp
@@ -3752,6 +3752,7 @@ space.hpp blockOffsetTab
space.hpp cardTableModRefBS.hpp
space.hpp iterator.hpp
space.hpp markOop.hpp
+space.hpp markOop.inline.hpp
space.hpp memRegion.hpp
space.hpp mutexLocker.hpp
space.hpp os_<os_family>.inline.hpp
@@ -3963,6 +3964,7 @@ synchronizer.cpp vmSymbols.hpp
synchronizer.hpp handles.hpp
synchronizer.hpp markOop.hpp
+synchronizer.hpp markOop.inline.hpp
synchronizer.hpp perfData.hpp
synchronizer.hpp top.hpp
spaceDecorator.cpp copy.hpp
spaceDecorator.cpp spaceDecorator.hpp
+spaceDecorator.cpp space.inline.hpp
specialized_oop_closures.cpp ostream.hpp
specialized_oop_closures.cpp specialized_oop_closures.hpp

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

@ -0,0 +1,12 @@
$OpenBSD: patch-hotspot_src_share_vm_includeDB_features,v 1.1 2009/01/16 16:49:29 kurt Exp $
--- hotspot/src/share/vm/includeDB_features.orig Fri Dec 19 03:42:10 2008
+++ hotspot/src/share/vm/includeDB_features Wed Jan 14 11:45:05 2009
@@ -59,6 +59,8 @@ dump.cpp vm_operations.
dump_<arch_model>.cpp assembler_<arch>.inline.hpp
dump_<arch_model>.cpp compactingPermGenGen.hpp
+dump_<arch_model>.cpp generation.inline.hpp
+dump_<arch_model>.cpp space.inline.hpp
forte.cpp collectedHeap.inline.hpp
forte.cpp debugInfoRec.hpp

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

@ -1,7 +1,32 @@
$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 \
$OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- jdk/make/common/Defs.gmk.orig Fri Dec 19 03:45:14 2008
+++ jdk/make/common/Defs.gmk Sun Jan 11 21:46:07 2009
@@ -172,6 +172,24 @@ ifdef OPENJDK
endif
endif # OPENJDK
+ifneq ($(PLATFORM), windows)
+ ifdef ALT_X11_PATH
+ X11_PATH = $(ALT_X11_PATH)
+ else
+ X11_PATH = /usr/X11R6
+ endif
+
+ ifdef ALT_PACKAGE_PATH
+ PACKAGE_PATH = $(ALT_PACKAGE_PATH)
+ else
+ ifeq ($(PLATFORM), linux)
+ PACKAGE_PATH = /usr
+ else
+ PACKAGE_PATH = /usr/local
+ endif
+ endif
+endif
+
#
# Get platform definitions
#
@@ -207,6 +225,7 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
ifdef ALT_FREETYPE_LIB_PATH
FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
@ -9,7 +34,7 @@ $OpenBSD: patch-jdk_make_common_Defs_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
else
ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
@@ -269,6 +270,10 @@ ifdef PROGRAM
@@ -269,6 +288,10 @@ ifdef PROGRAM
ifeq ($(PLATFORM), linux)
LDLIBS_COMMON = -ldl

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

@ -1,12 +1,12 @@
$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
$OpenBSD: patch-jdk_make_common_shared_Defs-bsd_gmk,v 1.3 2009/01/16 16:49:29 kurt Exp $
--- jdk/make/common/shared/Defs-bsd.gmk.orig Sun Jan 11 21:36:06 2009
+++ jdk/make/common/shared/Defs-bsd.gmk Sun Jan 11 21:45:39 2009
@@ -54,7 +54,7 @@ $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && p
endef
# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/opt/java
+USRJDKINSTANCES_PATH =/usr/local
+USRJDKINSTANCES_PATH = $(PACKAGE_PATH)
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
@ -15,11 +15,11 @@ $OpenBSD: patch-jdk_make_common_shared_Defs-bsd_gmk,v 1.2 2009/01/04 23:25:16 ku
DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
else
- DEVTOOLS_PATH =/usr/bin/
+ DEVTOOLS_PATH =/usr/local/bin/
+ DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
@@ -121,15 +121,7 @@ endif
@@ -121,15 +121,11 @@ endif
BUILD_HEADLESS = true
LIBM=-lm
@ -27,12 +27,14 @@ $OpenBSD: patch-jdk_make_common_shared_Defs-bsd_gmk,v 1.2 2009/01/04 23:25:16 ku
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_GCC29_COMPILER_PATH)" "undefined"
- GCC29_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC29_COMPILER_PATH))
-else
+ifeq ($(OS_VENDOR), Apple)
+ _CUPS_HEADERS_PATH=/usr/include
else
- GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/
-endif
+ _CUPS_HEADERS_PATH=$(PACKAGE_PATH)/include
endif
-
-_CUPS_HEADERS_PATH=/usr/include
+_CUPS_HEADERS_PATH=/usr/local/include
# Import JDK images allow for partial builds, components not built are
# imported (or copied from) these import areas when needed.

71
devel/jdk/1.7/patches/patch-jdk_make_common_shared_Defs-utils_gmk
View File

@ -1,8 +1,8 @@
$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)
$OpenBSD: patch-jdk_make_common_shared_Defs-utils_gmk,v 1.2 2009/01/16 16:49:29 kurt Exp $
--- jdk/make/common/shared/Defs-utils.gmk.orig Fri Dec 19 03:45:14 2008
+++ jdk/make/common/shared/Defs-utils.gmk Wed Jan 14 12:26:34 2009
@@ -67,6 +67,13 @@ ifeq ($(PLATFORM),windows)
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
+ifeq ($(PLATFORM),bsd)
@ -12,32 +12,39 @@ $OpenBSD: patch-jdk_make_common_shared_Defs-utils_gmk,v 1.1 2009/01/04 23:25:16
+ 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
# Utilities
ADB = $(UTILS_COMMAND_PATH)adb
AR = $(UTILS_CCS_BIN_PATH)ar
@@ -201,3 +208,32 @@ ifeq ($(PLATFORM),solaris)
ECHO = /usr/bin/echo
endif
# Solaris specific
+# 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
+ TEST = $(UTILS_COMMAND_PATH)test
+ TOUCH = $(UTILS_USR_BIN_PATH)touch
+ TRUE = $(UTILS_USR_BIN_PATH)true
+ UNAME = $(UTILS_USR_BIN_PATH)uname
+ # BSD OS_VENDOR specific
+ ifeq ($(OS_VENDOR), Apple)
+ NAWK = $(UTILS_USR_BIN_PATH)awk
+ UNZIPSFX = $(UTILS_USR_BIN_PATH)unzipsfx
+ ZIPEXE = $(UTILS_USR_BIN_PATH)zip
+ else
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+ ifneq ($(OS_VENDOR), OpenBSD)
+ CPIO = $(UTILS_USR_BIN_PATH)cpio
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif

11
devel/jdk/1.7/patches/patch-make_Defs-internal_gmk
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-make_Defs-internal_gmk,v 1.2 2009/01/04 23:25:16 kurt Exp $
--- make/Defs-internal.gmk.orig Thu Sep 11 03:40:08 2008
+++ make/Defs-internal.gmk Fri Sep 12 17:45:13 2008
@@ -215,7 +215,6 @@ endif
# Common make arguments (supplied to all component builds)
COMMON_BUILD_ARGUMENTS = \
- JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \
EXTERNALSANITYCONTROL=true \
TARGET_CLASS_VERSION=$(TARGET_CLASS_VERSION) \