Move OpenJDK to the Genode world repository
This reverts commit 58fb5ed722.
fixes #3060
This commit is contained in:
Sebastian Sumpf
Christian Helmuth
parent
d3dbdae395
commit
8015dbe8b7
|
|
@ -1,7 +0,0 @@
|
|||
JDK_BASE = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
|
||||
INC_DIR += $(JDK_BASE)/share/native/libjli \
|
||||
$(JDK_BASE)/share/native/include \
|
||||
$(JDK_BASE)/unix/native/include \
|
||||
$(JDK_BASE)/unix/native/libjli
|
||||
|
||||
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
LIBS = libc
|
||||
SHARED_LIB = yes
|
||||
JDK_BASE = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
|
||||
JDK_GENERATED = $(call select_from_ports,jdk_generated)/src/app/jdk
|
||||
JAVA_BASE = $(JDK_BASE)/share/native/libjava
|
||||
VERIFY_BASE = $(JDK_BASE)/share/native/libverify
|
||||
|
||||
CC_OLEVEL = -O0
|
||||
|
||||
SRC_C = $(notdir $(wildcard $(JAVA_BASE)/*.c))
|
||||
SRC_C += unix/native/libjava/canonicalize_md.c \
|
||||
unix/native/libjava/FileDescriptor_md.c \
|
||||
unix/native/libjava/FileInputStream_md.c \
|
||||
unix/native/libjava/FileOutputStream_md.c \
|
||||
unix/native/libjava/io_util_md.c \
|
||||
unix/native/libjava/java_props_md.c \
|
||||
unix/native/libjava/jdk_util_md.c \
|
||||
unix/native/libjava/jni_util_md.c \
|
||||
unix/native/libjava/ProcessEnvironment_md.c \
|
||||
unix/native/libjava/RandomAccessFile_md.c \
|
||||
unix/native/libjava/TimeZone_md.c \
|
||||
unix/native/libjava/UnixFileSystem_md.c
|
||||
|
||||
SRC_C += check_format.c check_code.c
|
||||
SRC_C += math_genode.c
|
||||
|
||||
|
||||
include $(REP_DIR)/lib/mk/jdk_version.inc
|
||||
|
||||
CC_C_OPT = $(JDK_VERSION)
|
||||
CC_C_OPT += -D_ALLBSD_SOURCE -D__GENODE__
|
||||
CC_OPT_unix/native/libjava/TimeZone_md = -D__linux__
|
||||
|
||||
INC_DIR += $(REP_DIR)/src/app/jdk/lib/include \
|
||||
$(JDK_GENERATED)/include/java.base \
|
||||
$(JDK_BASE)/share/native/include \
|
||||
$(JDK_BASE)/share/native/libfdlibm \
|
||||
$(JDK_BASE)/share/native/libjava \
|
||||
$(JDK_BASE)/unix/native/include \
|
||||
$(JDK_BASE)/unix/native/libjava
|
||||
|
||||
vpath %.c $(JAVA_BASE)
|
||||
vpath %.c $(VERIFY_BASE)
|
||||
vpath %.c $(JDK_BASE)
|
||||
vpath %.c $(REP_DIR)/src/app/jdk/lib/java
|
||||
|
||||
# vi: set ft=make :
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
JDK_VERSION = -DVERSION_SPECIFICATION='"9"' -DVERSION_SHORT='"9-internal"' \
|
||||
-DVERSION_MAJOR=9 -DVERSION_MINOR=0 -DVERSION_SECURITY=0 \
|
||||
-DVERSION_BUILD=0 -DVERSION_PATCH=0 \
|
||||
-DVERSION_STRING='"9-genode.openjdk"'
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
LIBS = libc
|
||||
SHARED_LIB = yes
|
||||
JDK_BASE = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
|
||||
JDK_GENERATED = $(call select_from_ports,jdk_generated)/src/app/jdk
|
||||
|
||||
CC_CXX_WARN_STRICT =
|
||||
|
||||
SRC_CC = endian.cpp \
|
||||
imageDecompressor.cpp \
|
||||
imageFile.cpp \
|
||||
jimage.cpp \
|
||||
NativeImageBuffer.cpp \
|
||||
osSupport_unix.cpp
|
||||
|
||||
INC_DIR += $(JDK_BASE)/share/native/include \
|
||||
$(JDK_BASE)/share/native/libjava \
|
||||
$(JDK_BASE)/share/native/libjimage \
|
||||
$(JDK_BASE)/unix/native/include \
|
||||
$(JDK_BASE)/unix/native/libjava \
|
||||
$(JDK_GENERATED)/include/java.base
|
||||
|
||||
vpath %.cpp $(JDK_BASE)/share/native/libjimage
|
||||
vpath %.cpp $(JDK_BASE)/unix/native/libjimage
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
LIBS = libc zlib
|
||||
SHARED_LIB = yes
|
||||
JDK_BASE = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
|
||||
|
||||
CC_OLEVEL = -O0
|
||||
|
||||
SRC_C = args.c \
|
||||
java.c \
|
||||
java_md_common.c \
|
||||
java_md_solinux.c \
|
||||
jli_util.c \
|
||||
parse_manifest.c \
|
||||
splashscreen_stubs.c \
|
||||
wildcard.c
|
||||
|
||||
|
||||
INC_DIR += $(JDK_BASE)/share/native/include \
|
||||
$(JDK_BASE)/share/native/libjli \
|
||||
$(JDK_BASE)/unix/native/include \
|
||||
$(JDK_BASE)/unix/native/libjli
|
||||
|
||||
CC_C_OPT = -D__linux__ -D__GENODE__ -Dlseek64=lseek
|
||||
|
||||
vpath %.c $(JDK_BASE)/share/native/libjli
|
||||
vpath %.c $(JDK_BASE)/unix/native/libjli
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
LIBS = libc
|
||||
SHARED_LIB = yes
|
||||
JDK_BASE = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
|
||||
JDK_GENERATED = $(call select_from_ports,jdk_generated)/src/app/jdk
|
||||
|
||||
SRC_C = bsd_close.c \
|
||||
net_util.c \
|
||||
net_util_md.c \
|
||||
InetAddress.c \
|
||||
Inet4Address.c \
|
||||
Inet4AddressImpl.c \
|
||||
Inet6Address.c \
|
||||
InetAddressImplFactory.c \
|
||||
PlainSocketImpl.c
|
||||
|
||||
INC_DIR += $(JDK_GENERATED)/include/java.base \
|
||||
$(JDK_BASE)/share/native/include \
|
||||
$(JDK_BASE)/share/native/libjava \
|
||||
$(JDK_BASE)/share/native/libnet \
|
||||
$(JDK_BASE)/share/native/libnio \
|
||||
$(JDK_BASE)/share/native/libnio/ch \
|
||||
$(JDK_BASE)/unix/native/include \
|
||||
$(JDK_BASE)/unix/native/libjava \
|
||||
$(JDK_BASE)/unix/native/libnet \
|
||||
$(JDK_BASE)/unix/native/libnio
|
||||
|
||||
CC_C_OPT = -D_ALLBSD_SOURCE -include netinet/in.h
|
||||
CC_OPT_net_util_md += -include sys/socket.h
|
||||
|
||||
vpath %.c $(JDK_BASE)/unix/native/libnet
|
||||
vpath %.c $(JDK_BASE)/share/native/libnet
|
||||
vpath %.c $(JDK_BASE)/macosx/native/libnet
|
||||
|
|
@ -1,610 +0,0 @@
|
|||
#/build/jdk/openjdk-jdk9-jdk9/build/linux-x86_64-normal-zero-release/hotspot/variant-zero/gensrc/jvmtifiles/bytecodeInterpreterWithChecks.cpp
|
||||
# /build/jdk/openjdk-jdk9-jdk9/build/linux-x86_64-normal-zero-release/hotspot/variant-zero/gensrc/jvmtifiles/jvmtiEnter.cpp
|
||||
# /build/jdk/openjdk-jdk9-jdk9/build/linux-x86_64-normal-zero-release/hotspot/variant-zero/gensrc/jvmtifiles/jvmtiEnterTrace.cpp
|
||||
|
||||
LIBS = stdcxx jzip jimage nio jnet ffi
|
||||
SHARED_LIB = yes
|
||||
HOTSPOT_BASE = $(call select_from_ports,jdk)/src/app/jdk/hotspot/src
|
||||
JDK_GENERATED = $(call select_from_ports,jdk_generated)/src/app/jdk
|
||||
|
||||
CC_CXX_WARN_STRICT =
|
||||
|
||||
include $(REP_DIR)/lib/mk/jdk_version.inc
|
||||
|
||||
CC_OPT += -fpermissive -Wno-comment -Wno-reorder -Wno-switch -Wno-unused-variable \
|
||||
-Wno-delete-non-virtual-dtor -Wno-unused-function -Wno-format \
|
||||
-Wno-unused-local-typedefs -Wno-unused-but-set-variable \
|
||||
-Wno-parentheses
|
||||
|
||||
CC_OPT += -D__GENODE__
|
||||
|
||||
CC_OPT += -DINCLUDE_SUFFIX_OS=_bsd -DTARGET_COMPILER_gcc -D_ALLBSD_SOURCE -DUSE_LIBRARY_BASED_TLS_ONLY \
|
||||
-DVM_LITTLE_ENDIAN -DINCLUDE_SUFFIX_CPU=_zero -DZERO -DCC_INTERP -DTARGET_ARCH_zero \
|
||||
-DINCLUDE_JVMCI=0 -DRELEASE -DPRODUCT
|
||||
|
||||
|
||||
INC_DIR += $(JDK_GENERATED)/include \
|
||||
$(REP_DIR)/src/app/jdk/lib/include \
|
||||
$(HOTSPOT_BASE)/os \
|
||||
$(HOTSPOT_BASE)/os/bsd/vm \
|
||||
$(HOTSPOT_BASE)/os/posix/vm \
|
||||
$(HOTSPOT_BASE)/os_cpu/bsd_zero/vm \
|
||||
$(HOTSPOT_BASE)/cpu/zero/vm \
|
||||
$(HOTSPOT_BASE)/share/vm \
|
||||
$(HOTSPOT_BASE)/share/vm/precompiled \
|
||||
$(HOTSPOT_BASE)/share/vm/prims
|
||||
|
||||
#
|
||||
# Genode specific
|
||||
#
|
||||
SRC_CC += dummies.cpp
|
||||
|
||||
|
||||
#
|
||||
# Generated
|
||||
#
|
||||
SRC_CC += jvmtiEnter.cpp jvmtiEnterTrace.cpp
|
||||
|
||||
|
||||
#
|
||||
# Hotspot
|
||||
#
|
||||
SRC_CC += cpu/zero/vm/abstractInterpreter_zero.cpp \
|
||||
cpu/zero/vm/assembler_zero.cpp \
|
||||
cpu/zero/vm/bytecodeInterpreter_zero.cpp \
|
||||
cpu/zero/vm/compiledIC_zero.cpp \
|
||||
cpu/zero/vm/cppInterpreterGenerator_zero.cpp \
|
||||
cpu/zero/vm/cppInterpreter_zero.cpp \
|
||||
cpu/zero/vm/debug_zero.cpp \
|
||||
cpu/zero/vm/depChecker_zero.cpp \
|
||||
cpu/zero/vm/disassembler_zero.cpp \
|
||||
cpu/zero/vm/frame_zero.cpp \
|
||||
cpu/zero/vm/icache_zero.cpp \
|
||||
cpu/zero/vm/icBuffer_zero.cpp \
|
||||
cpu/zero/vm/interpreterRT_zero.cpp \
|
||||
cpu/zero/vm/jniFastGetField_zero.cpp \
|
||||
cpu/zero/vm/metaspaceShared_zero.cpp \
|
||||
cpu/zero/vm/methodHandles_zero.cpp \
|
||||
cpu/zero/vm/nativeInst_zero.cpp \
|
||||
cpu/zero/vm/register_zero.cpp \
|
||||
cpu/zero/vm/relocInfo_zero.cpp \
|
||||
cpu/zero/vm/sharedRuntime_zero.cpp \
|
||||
cpu/zero/vm/stack_zero.cpp \
|
||||
cpu/zero/vm/stubGenerator_zero.cpp \
|
||||
cpu/zero/vm/stubRoutines_zero.cpp \
|
||||
cpu/zero/vm/vmreg_zero.cpp \
|
||||
cpu/zero/vm/vm_version_zero.cpp \
|
||||
cpu/zero/vm/vtableStubs_zero.cpp \
|
||||
os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp \
|
||||
os_cpu/bsd_zero/vm/os_bsd_zero.cpp \
|
||||
os_cpu/bsd_zero/vm/thread_bsd_zero.cpp \
|
||||
os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp \
|
||||
os/bsd/vm/attachListener_bsd.cpp \
|
||||
os/bsd/vm/decoder_machO.cpp \
|
||||
os/bsd/vm/jvm_bsd.cpp \
|
||||
os/bsd/vm/os_bsd.cpp \
|
||||
os/bsd/vm/osThread_bsd.cpp \
|
||||
os/bsd/vm/perfMemory_bsd.cpp \
|
||||
os/bsd/vm/stubRoutines_bsd.cpp \
|
||||
os/bsd/vm/threadCritical_bsd.cpp \
|
||||
os/linux/vm/decoder_linux.cpp \
|
||||
os/posix/vm/os_posix.cpp \
|
||||
os/posix/vm/threadLocalStorage_posix.cpp \
|
||||
os/posix/vm/vmError_posix.cpp \
|
||||
share/vm/asm/assembler.cpp \
|
||||
share/vm/asm/codeBuffer.cpp \
|
||||
share/vm/asm/register.cpp \
|
||||
share/vm/ci/ciArray.cpp \
|
||||
share/vm/ci/ciArrayKlass.cpp \
|
||||
share/vm/ci/ciBaseObject.cpp \
|
||||
share/vm/ci/ciCallSite.cpp \
|
||||
share/vm/ci/ciConstant.cpp \
|
||||
share/vm/ci/ciConstantPoolCache.cpp \
|
||||
share/vm/ci/ciEnv.cpp \
|
||||
share/vm/ci/ciExceptionHandler.cpp \
|
||||
share/vm/ci/ciField.cpp \
|
||||
share/vm/ci/ciFlags.cpp \
|
||||
share/vm/ci/ciInstance.cpp \
|
||||
share/vm/ci/ciInstanceKlass.cpp \
|
||||
share/vm/ci/ciKlass.cpp \
|
||||
share/vm/ci/ciMemberName.cpp \
|
||||
share/vm/ci/ciMetadata.cpp \
|
||||
share/vm/ci/ciMethodBlocks.cpp \
|
||||
share/vm/ci/ciMethod.cpp \
|
||||
share/vm/ci/ciMethodData.cpp \
|
||||
share/vm/ci/ciMethodHandle.cpp \
|
||||
share/vm/ci/ciNullObject.cpp \
|
||||
share/vm/ci/ciObjArray.cpp \
|
||||
share/vm/ci/ciObjArrayKlass.cpp \
|
||||
share/vm/ci/ciObject.cpp \
|
||||
share/vm/ci/ciObjectFactory.cpp \
|
||||
share/vm/ci/ciReplay.cpp \
|
||||
share/vm/ci/ciSignature.cpp \
|
||||
share/vm/ci/ciStreams.cpp \
|
||||
share/vm/ci/ciSymbol.cpp \
|
||||
share/vm/ci/ciTypeArray.cpp \
|
||||
share/vm/ci/ciTypeArrayKlass.cpp \
|
||||
share/vm/ci/ciType.cpp \
|
||||
share/vm/ci/ciUtilities.cpp \
|
||||
share/vm/classfile/altHashing.cpp \
|
||||
share/vm/classfile/bytecodeAssembler.cpp \
|
||||
share/vm/classfile/classFileError.cpp \
|
||||
share/vm/classfile/classFileParser.cpp \
|
||||
share/vm/classfile/classFileStream.cpp \
|
||||
share/vm/classfile/classListParser.cpp \
|
||||
share/vm/classfile/classLoader.cpp \
|
||||
share/vm/classfile/classLoaderData.cpp \
|
||||
share/vm/classfile/classLoaderExt.cpp \
|
||||
share/vm/classfile/classLoaderStats.cpp \
|
||||
share/vm/classfile/compactHashtable.cpp \
|
||||
share/vm/classfile/defaultMethods.cpp \
|
||||
share/vm/classfile/dictionary.cpp \
|
||||
share/vm/classfile/javaAssertions.cpp \
|
||||
share/vm/classfile/javaClasses.cpp \
|
||||
share/vm/classfile/klassFactory.cpp \
|
||||
share/vm/classfile/loaderConstraints.cpp \
|
||||
share/vm/classfile/metadataOnStackMark.cpp \
|
||||
share/vm/classfile/moduleEntry.cpp \
|
||||
share/vm/classfile/modules.cpp \
|
||||
share/vm/classfile/packageEntry.cpp \
|
||||
share/vm/classfile/placeholders.cpp \
|
||||
share/vm/classfile/resolutionErrors.cpp \
|
||||
share/vm/classfile/sharedPathsMiscInfo.cpp \
|
||||
share/vm/classfile/stackMapFrame.cpp \
|
||||
share/vm/classfile/stackMapTable.cpp \
|
||||
share/vm/classfile/stringTable.cpp \
|
||||
share/vm/classfile/symbolTable.cpp \
|
||||
share/vm/classfile/systemDictionary.cpp \
|
||||
share/vm/classfile/verificationType.cpp \
|
||||
share/vm/classfile/verifier.cpp \
|
||||
share/vm/classfile/vmSymbols.cpp \
|
||||
share/vm/code/codeBlob.cpp \
|
||||
share/vm/code/codeCache.cpp \
|
||||
share/vm/code/compiledIC.cpp \
|
||||
share/vm/code/compiledMethod.cpp \
|
||||
share/vm/code/compressedStream.cpp \
|
||||
share/vm/code/debugInfo.cpp \
|
||||
share/vm/code/debugInfoRec.cpp \
|
||||
share/vm/code/dependencies.cpp \
|
||||
share/vm/code/dependencyContext.cpp \
|
||||
share/vm/code/exceptionHandlerTable.cpp \
|
||||
share/vm/code/icBuffer.cpp \
|
||||
share/vm/code/location.cpp \
|
||||
share/vm/code/nmethod.cpp \
|
||||
share/vm/code/oopRecorder.cpp \
|
||||
share/vm/code/pcDesc.cpp \
|
||||
share/vm/code/relocInfo.cpp \
|
||||
share/vm/code/relocInfo_ext.cpp \
|
||||
share/vm/code/scopeDesc.cpp \
|
||||
share/vm/code/stubs.cpp \
|
||||
share/vm/code/vmreg.cpp \
|
||||
share/vm/code/vtableStubs.cpp \
|
||||
share/vm/compiler/abstractCompiler.cpp \
|
||||
share/vm/compiler/compileBroker.cpp \
|
||||
share/vm/compiler/compileLog.cpp \
|
||||
share/vm/compiler/compilerDefinitions.cpp \
|
||||
share/vm/compiler/compilerDirectives.cpp \
|
||||
share/vm/compiler/compilerOracle.cpp \
|
||||
share/vm/compiler/compileTask.cpp \
|
||||
share/vm/compiler/directivesParser.cpp \
|
||||
share/vm/compiler/disassembler.cpp \
|
||||
share/vm/compiler/methodLiveness.cpp \
|
||||
share/vm/compiler/methodMatcher.cpp \
|
||||
share/vm/compiler/oopMap.cpp \
|
||||
share/vm/gc/cms/adaptiveFreeList.cpp \
|
||||
share/vm/gc/cms/allocationStats.cpp \
|
||||
share/vm/gc/cms/cmsCollectorPolicy.cpp \
|
||||
share/vm/gc/cms/cmsLockVerifier.cpp \
|
||||
share/vm/gc/cms/cmsOopClosures.cpp \
|
||||
share/vm/gc/cms/compactibleFreeListSpace.cpp \
|
||||
share/vm/gc/cms/concurrentMarkSweepGeneration.cpp \
|
||||
share/vm/gc/cms/concurrentMarkSweepThread.cpp \
|
||||
share/vm/gc/cms/freeChunk.cpp \
|
||||
share/vm/gc/cms/gSpaceCounters.cpp \
|
||||
share/vm/gc/cms/parCardTableModRefBS.cpp \
|
||||
share/vm/gc/cms/parNewGeneration.cpp \
|
||||
share/vm/gc/cms/parOopClosures.cpp \
|
||||
share/vm/gc/cms/promotionInfo.cpp \
|
||||
share/vm/gc/cms/vmCMSOperations.cpp \
|
||||
share/vm/gc/cms/yieldingWorkgroup.cpp \
|
||||
share/vm/gc/g1/collectionSetChooser.cpp \
|
||||
share/vm/gc/g1/concurrentG1Refine.cpp \
|
||||
share/vm/gc/g1/concurrentG1RefineThread.cpp \
|
||||
share/vm/gc/g1/concurrentMarkThread.cpp \
|
||||
share/vm/gc/g1/dirtyCardQueue.cpp \
|
||||
share/vm/gc/g1/g1Allocator.cpp \
|
||||
share/vm/gc/g1/g1Allocator_ext.cpp \
|
||||
share/vm/gc/g1/g1AllocRegion.cpp \
|
||||
share/vm/gc/g1/g1Analytics.cpp \
|
||||
share/vm/gc/g1/g1BiasedArray.cpp \
|
||||
share/vm/gc/g1/g1BlockOffsetTable.cpp \
|
||||
share/vm/gc/g1/g1CardCounts.cpp \
|
||||
share/vm/gc/g1/g1CardLiveData.cpp \
|
||||
share/vm/gc/g1/g1CodeBlobClosure.cpp \
|
||||
share/vm/gc/g1/g1CodeCacheRemSet.cpp \
|
||||
share/vm/gc/g1/g1CollectedHeap.cpp \
|
||||
share/vm/gc/g1/g1CollectedHeap_ext.cpp \
|
||||
share/vm/gc/g1/g1CollectionSet.cpp \
|
||||
share/vm/gc/g1/g1CollectorPolicy.cpp \
|
||||
share/vm/gc/g1/g1ConcurrentMark.cpp \
|
||||
share/vm/gc/g1/g1ConcurrentMarkObjArrayProcessor.cpp \
|
||||
share/vm/gc/g1/g1DefaultPolicy.cpp \
|
||||
share/vm/gc/g1/g1EvacFailure.cpp \
|
||||
share/vm/gc/g1/g1EvacStats.cpp \
|
||||
share/vm/gc/g1/g1FromCardCache.cpp \
|
||||
share/vm/gc/g1/g1GCPhaseTimes.cpp \
|
||||
share/vm/gc/g1/g1_globals.cpp \
|
||||
share/vm/gc/g1/g1HeapSizingPolicy.cpp \
|
||||
share/vm/gc/g1/g1HeapSizingPolicy_ext.cpp \
|
||||
share/vm/gc/g1/g1HeapTransition.cpp \
|
||||
share/vm/gc/g1/g1HeapVerifier.cpp \
|
||||
share/vm/gc/g1/g1HotCardCache.cpp \
|
||||
share/vm/gc/g1/g1IHOPControl.cpp \
|
||||
share/vm/gc/g1/g1MarkSweep.cpp \
|
||||
share/vm/gc/g1/g1MarkSweep_ext.cpp \
|
||||
share/vm/gc/g1/g1MMUTracker.cpp \
|
||||
share/vm/gc/g1/g1MonitoringSupport.cpp \
|
||||
share/vm/gc/g1/g1OopClosures.cpp \
|
||||
share/vm/gc/g1/g1PageBasedVirtualSpace.cpp \
|
||||
share/vm/gc/g1/g1ParScanThreadState.cpp \
|
||||
share/vm/gc/g1/g1ParScanThreadState_ext.cpp \
|
||||
share/vm/gc/g1/g1RegionToSpaceMapper.cpp \
|
||||
share/vm/gc/g1/g1RemSet.cpp \
|
||||
share/vm/gc/g1/g1RemSetSummary.cpp \
|
||||
share/vm/gc/g1/g1RootClosures.cpp \
|
||||
share/vm/gc/g1/g1RootClosures_ext.cpp \
|
||||
share/vm/gc/g1/g1RootProcessor.cpp \
|
||||
share/vm/gc/g1/g1SATBCardTableModRefBS.cpp \
|
||||
share/vm/gc/g1/g1StringDedup.cpp \
|
||||
share/vm/gc/g1/g1StringDedupQueue.cpp \
|
||||
share/vm/gc/g1/g1StringDedupStat.cpp \
|
||||
share/vm/gc/g1/g1StringDedupTable.cpp \
|
||||
share/vm/gc/g1/g1StringDedupThread.cpp \
|
||||
share/vm/gc/g1/g1SurvivorRegions.cpp \
|
||||
share/vm/gc/g1/g1YoungGenSizer.cpp \
|
||||
share/vm/gc/g1/g1YoungRemSetSamplingThread.cpp \
|
||||
share/vm/gc/g1/heapRegion.cpp \
|
||||
share/vm/gc/g1/heapRegionManager.cpp \
|
||||
share/vm/gc/g1/heapRegionRemSet.cpp \
|
||||
share/vm/gc/g1/heapRegionSet.cpp \
|
||||
share/vm/gc/g1/heapRegionTracer.cpp \
|
||||
share/vm/gc/g1/heapRegionType.cpp \
|
||||
share/vm/gc/g1/hSpaceCounters.cpp \
|
||||
share/vm/gc/g1/ptrQueue.cpp \
|
||||
share/vm/gc/g1/satbMarkQueue.cpp \
|
||||
share/vm/gc/g1/sparsePRT.cpp \
|
||||
share/vm/gc/g1/survRateGroup.cpp \
|
||||
share/vm/gc/g1/suspendibleThreadSet.cpp \
|
||||
share/vm/gc/g1/vm_operations_g1.cpp \
|
||||
share/vm/gc/g1/workerDataArray.cpp \
|
||||
share/vm/gc/parallel/adjoiningGenerations.cpp \
|
||||
share/vm/gc/parallel/adjoiningVirtualSpaces.cpp \
|
||||
share/vm/gc/parallel/asPSOldGen.cpp \
|
||||
share/vm/gc/parallel/asPSYoungGen.cpp \
|
||||
share/vm/gc/parallel/cardTableExtension.cpp \
|
||||
share/vm/gc/parallel/gcAdaptivePolicyCounters.cpp \
|
||||
share/vm/gc/parallel/gcTaskManager.cpp \
|
||||
share/vm/gc/parallel/gcTaskThread.cpp \
|
||||
share/vm/gc/parallel/generationSizer.cpp \
|
||||
share/vm/gc/parallel/immutableSpace.cpp \
|
||||
share/vm/gc/parallel/mutableNUMASpace.cpp \
|
||||
share/vm/gc/parallel/mutableSpace.cpp \
|
||||
share/vm/gc/parallel/objectStartArray.cpp \
|
||||
share/vm/gc/parallel/parallelScavengeHeap.cpp \
|
||||
share/vm/gc/parallel/parMarkBitMap.cpp \
|
||||
share/vm/gc/parallel/pcTasks.cpp \
|
||||
share/vm/gc/parallel/psAdaptiveSizePolicy.cpp \
|
||||
share/vm/gc/parallel/psCompactionManager.cpp \
|
||||
share/vm/gc/parallel/psGCAdaptivePolicyCounters.cpp \
|
||||
share/vm/gc/parallel/psGenerationCounters.cpp \
|
||||
share/vm/gc/parallel/psMarkSweep.cpp \
|
||||
share/vm/gc/parallel/psMarkSweepDecorator.cpp \
|
||||
share/vm/gc/parallel/psOldGen.cpp \
|
||||
share/vm/gc/parallel/psParallelCompact.cpp \
|
||||
share/vm/gc/parallel/psPromotionLAB.cpp \
|
||||
share/vm/gc/parallel/psPromotionManager.cpp \
|
||||
share/vm/gc/parallel/psScavenge.cpp \
|
||||
share/vm/gc/parallel/psTasks.cpp \
|
||||
share/vm/gc/parallel/psVirtualspace.cpp \
|
||||
share/vm/gc/parallel/psYoungGen.cpp \
|
||||
share/vm/gc/parallel/spaceCounters.cpp \
|
||||
share/vm/gc/parallel/vmPSOperations.cpp \
|
||||
share/vm/gc/serial/cSpaceCounters.cpp \
|
||||
share/vm/gc/serial/defNewGeneration.cpp \
|
||||
share/vm/gc/serial/genMarkSweep.cpp \
|
||||
share/vm/gc/serial/markSweep.cpp \
|
||||
share/vm/gc/serial/tenuredGeneration.cpp \
|
||||
share/vm/gc/shared/adaptiveSizePolicy.cpp \
|
||||
share/vm/gc/shared/ageTable.cpp \
|
||||
share/vm/gc/shared/ageTableTracer.cpp \
|
||||
share/vm/gc/shared/allocTracer.cpp \
|
||||
share/vm/gc/shared/barrierSet.cpp \
|
||||
share/vm/gc/shared/blockOffsetTable.cpp \
|
||||
share/vm/gc/shared/cardGeneration.cpp \
|
||||
share/vm/gc/shared/cardTableModRefBS.cpp \
|
||||
share/vm/gc/shared/cardTableModRefBSForCTRS.cpp \
|
||||
share/vm/gc/shared/cardTableRS.cpp \
|
||||
share/vm/gc/shared/collectedHeap.cpp \
|
||||
share/vm/gc/shared/collectorCounters.cpp \
|
||||
share/vm/gc/shared/collectorPolicy.cpp \
|
||||
share/vm/gc/shared/concurrentGCThread.cpp \
|
||||
share/vm/gc/shared/gcCause.cpp \
|
||||
share/vm/gc/shared/gcId.cpp \
|
||||
share/vm/gc/shared/gcLocker.cpp \
|
||||
share/vm/gc/shared/gcPolicyCounters.cpp \
|
||||
share/vm/gc/shared/gcStats.cpp \
|
||||
share/vm/gc/shared/gcTimer.cpp \
|
||||
share/vm/gc/shared/gcTrace.cpp \
|
||||
share/vm/gc/shared/gcTraceSend.cpp \
|
||||
share/vm/gc/shared/gcTraceTime.cpp \
|
||||
share/vm/gc/shared/gcUtil.cpp \
|
||||
share/vm/gc/shared/genCollectedHeap.cpp \
|
||||
share/vm/gc/shared/generationCounters.cpp \
|
||||
share/vm/gc/shared/generation.cpp \
|
||||
share/vm/gc/shared/generationSpec.cpp \
|
||||
share/vm/gc/shared/genOopClosures.cpp \
|
||||
share/vm/gc/shared/objectCountEventSender.cpp \
|
||||
share/vm/gc/shared/plab.cpp \
|
||||
share/vm/gc/shared/preservedMarks.cpp \
|
||||
share/vm/gc/shared/referencePolicy.cpp \
|
||||
share/vm/gc/shared/referenceProcessor.cpp \
|
||||
share/vm/gc/shared/space.cpp \
|
||||
share/vm/gc/shared/spaceDecorator.cpp \
|
||||
share/vm/gc/shared/strongRootsScope.cpp \
|
||||
share/vm/gc/shared/taskqueue.cpp \
|
||||
share/vm/gc/shared/threadLocalAllocBuffer.cpp \
|
||||
share/vm/gc/shared/vmGCOperations.cpp \
|
||||
share/vm/gc/shared/workgroup.cpp \
|
||||
share/vm/interpreter/abstractInterpreter.cpp \
|
||||
share/vm/interpreter/bytecode.cpp \
|
||||
share/vm/interpreter/bytecodeHistogram.cpp \
|
||||
share/vm/interpreter/bytecodeInterpreter.cpp \
|
||||
share/vm/interpreter/bytecodeInterpreterWithChecks.cpp \
|
||||
share/vm/interpreter/bytecodes.cpp \
|
||||
share/vm/interpreter/bytecodeStream.cpp \
|
||||
share/vm/interpreter/bytecodeTracer.cpp \
|
||||
share/vm/interpreter/cppInterpreter.cpp \
|
||||
share/vm/interpreter/cppInterpreterGenerator.cpp \
|
||||
share/vm/interpreter/interpreter.cpp \
|
||||
share/vm/interpreter/interpreterRuntime.cpp \
|
||||
share/vm/interpreter/invocationCounter.cpp \
|
||||
share/vm/interpreter/linkResolver.cpp \
|
||||
share/vm/interpreter/oopMapCache.cpp \
|
||||
share/vm/interpreter/rewriter.cpp \
|
||||
share/vm/interpreter/templateInterpreter.cpp \
|
||||
share/vm/interpreter/templateInterpreterGenerator.cpp \
|
||||
share/vm/interpreter/templateTable.cpp \
|
||||
share/vm/logging/logConfiguration.cpp \
|
||||
share/vm/logging/logDecorations.cpp \
|
||||
share/vm/logging/logDecorators.cpp \
|
||||
share/vm/logging/logDiagnosticCommand.cpp \
|
||||
share/vm/logging/logFileOutput.cpp \
|
||||
share/vm/logging/logFileStreamOutput.cpp \
|
||||
share/vm/logging/logLevel.cpp \
|
||||
share/vm/logging/logMessageBuffer.cpp \
|
||||
share/vm/logging/logOutput.cpp \
|
||||
share/vm/logging/logOutputList.cpp \
|
||||
share/vm/logging/logStream.cpp \
|
||||
share/vm/logging/logTag.cpp \
|
||||
share/vm/logging/logTagLevelExpression.cpp \
|
||||
share/vm/logging/logTagSet.cpp \
|
||||
share/vm/logging/logTagSetDescriptions.cpp \
|
||||
share/vm/memory/allocation.cpp \
|
||||
share/vm/memory/binaryTreeDictionary.cpp \
|
||||
share/vm/memory/filemap.cpp \
|
||||
share/vm/memory/freeBlockDictionary.cpp \
|
||||
share/vm/memory/freeList.cpp \
|
||||
share/vm/memory/guardedMemory.cpp \
|
||||
share/vm/memory/heap.cpp \
|
||||
share/vm/memory/heapInspection.cpp \
|
||||
share/vm/memory/iterator.cpp \
|
||||
share/vm/memory/memRegion.cpp \
|
||||
share/vm/memory/metachunk.cpp \
|
||||
share/vm/memory/metaspaceCounters.cpp \
|
||||
share/vm/memory/metaspace.cpp \
|
||||
share/vm/memory/metaspaceShared.cpp \
|
||||
share/vm/memory/metaspaceTracer.cpp \
|
||||
share/vm/memory/oopFactory.cpp \
|
||||
share/vm/memory/resourceArea.cpp \
|
||||
share/vm/memory/universe.cpp \
|
||||
share/vm/memory/universe_ext.cpp \
|
||||
share/vm/memory/virtualspace.cpp \
|
||||
share/vm/oops/annotations.cpp \
|
||||
share/vm/oops/arrayKlass.cpp \
|
||||
share/vm/oops/compiledICHolder.cpp \
|
||||
share/vm/oops/constantPool.cpp \
|
||||
share/vm/oops/constMethod.cpp \
|
||||
share/vm/oops/cpCache.cpp \
|
||||
share/vm/oops/generateOopMap.cpp \
|
||||
share/vm/oops/instanceKlass.cpp \
|
||||
share/vm/oops/instanceMirrorKlass.cpp \
|
||||
share/vm/oops/instanceOop.cpp \
|
||||
share/vm/oops/instanceRefKlass.cpp \
|
||||
share/vm/oops/klass.cpp \
|
||||
share/vm/oops/klassVtable.cpp \
|
||||
share/vm/oops/markOop.cpp \
|
||||
share/vm/oops/metadata.cpp \
|
||||
share/vm/oops/methodCounters.cpp \
|
||||
share/vm/oops/method.cpp \
|
||||
share/vm/oops/methodData.cpp \
|
||||
share/vm/oops/objArrayKlass.cpp \
|
||||
share/vm/oops/objArrayOop.cpp \
|
||||
share/vm/oops/oop.cpp \
|
||||
share/vm/oops/oopsHierarchy.cpp \
|
||||
share/vm/oops/symbol.cpp \
|
||||
share/vm/oops/typeArrayKlass.cpp \
|
||||
share/vm/prims/evmCompat.cpp \
|
||||
share/vm/prims/forte.cpp \
|
||||
share/vm/prims/jniCheck.cpp \
|
||||
share/vm/prims/jni.cpp \
|
||||
share/vm/prims/jniFastGetField.cpp \
|
||||
share/vm/prims/jvm.cpp \
|
||||
share/vm/prims/jvmtiClassFileReconstituter.cpp \
|
||||
share/vm/prims/jvmtiCodeBlobEvents.cpp \
|
||||
share/vm/prims/jvmtiEnvBase.cpp \
|
||||
share/vm/prims/jvmtiEnv.cpp \
|
||||
share/vm/prims/jvmtiEnvThreadState.cpp \
|
||||
share/vm/prims/jvmtiEventController.cpp \
|
||||
share/vm/prims/jvmtiExport.cpp \
|
||||
share/vm/prims/jvmtiExtensions.cpp \
|
||||
share/vm/prims/jvmtiGetLoadedClasses.cpp \
|
||||
share/vm/prims/jvmtiImpl.cpp \
|
||||
share/vm/prims/jvmtiManageCapabilities.cpp \
|
||||
share/vm/prims/jvmtiRawMonitor.cpp \
|
||||
share/vm/prims/jvmtiRedefineClasses.cpp \
|
||||
share/vm/prims/jvmtiTagMap.cpp \
|
||||
share/vm/prims/jvmtiThreadState.cpp \
|
||||
share/vm/prims/jvmtiTrace.cpp \
|
||||
share/vm/prims/jvmtiUtil.cpp \
|
||||
share/vm/prims/methodComparator.cpp \
|
||||
share/vm/prims/methodHandles.cpp \
|
||||
share/vm/prims/nativeLookup.cpp \
|
||||
share/vm/prims/perf.cpp \
|
||||
share/vm/prims/privilegedStack.cpp \
|
||||
share/vm/prims/stackwalk.cpp \
|
||||
share/vm/prims/unsafe.cpp \
|
||||
share/vm/prims/wbtestmethods/parserTests.cpp \
|
||||
share/vm/prims/whitebox.cpp \
|
||||
share/vm/prims/whitebox_ext.cpp \
|
||||
share/vm/runtime/advancedThresholdPolicy.cpp \
|
||||
share/vm/runtime/arguments.cpp \
|
||||
share/vm/runtime/arguments_ext.cpp \
|
||||
share/vm/runtime/basicLock.cpp \
|
||||
share/vm/runtime/biasedLocking.cpp \
|
||||
share/vm/runtime/commandLineFlagConstraintList.cpp \
|
||||
share/vm/runtime/commandLineFlagConstraintsCompiler.cpp \
|
||||
share/vm/runtime/commandLineFlagConstraintsGC.cpp \
|
||||
share/vm/runtime/commandLineFlagConstraintsRuntime.cpp \
|
||||
share/vm/runtime/commandLineFlagRangeList.cpp \
|
||||
share/vm/runtime/commandLineFlagWriteableList.cpp \
|
||||
share/vm/runtime/compilationPolicy.cpp \
|
||||
share/vm/runtime/deoptimization.cpp \
|
||||
share/vm/runtime/fieldDescriptor.cpp \
|
||||
share/vm/runtime/fieldType.cpp \
|
||||
share/vm/runtime/fprofiler.cpp \
|
||||
share/vm/runtime/frame.cpp \
|
||||
share/vm/runtime/globals.cpp \
|
||||
share/vm/runtime/handles.cpp \
|
||||
share/vm/runtime/icache.cpp \
|
||||
share/vm/runtime/init.cpp \
|
||||
share/vm/runtime/interfaceSupport.cpp \
|
||||
share/vm/runtime/javaCalls.cpp \
|
||||
share/vm/runtime/java.cpp \
|
||||
share/vm/runtime/jniHandles.cpp \
|
||||
share/vm/runtime/jniPeriodicChecker.cpp \
|
||||
share/vm/runtime/memprofiler.cpp \
|
||||
share/vm/runtime/monitorChunk.cpp \
|
||||
share/vm/runtime/mutex.cpp \
|
||||
share/vm/runtime/mutexLocker.cpp \
|
||||
share/vm/runtime/objectMonitor.cpp \
|
||||
share/vm/runtime/orderAccess.cpp \
|
||||
share/vm/runtime/os.cpp \
|
||||
share/vm/runtime/osThread.cpp \
|
||||
share/vm/runtime/park.cpp \
|
||||
share/vm/runtime/perfData.cpp \
|
||||
share/vm/runtime/perfMemory.cpp \
|
||||
share/vm/runtime/reflection.cpp \
|
||||
share/vm/runtime/reflectionUtils.cpp \
|
||||
share/vm/runtime/relocator.cpp \
|
||||
share/vm/runtime/rframe.cpp \
|
||||
share/vm/runtime/rtmLocking.cpp \
|
||||
share/vm/runtime/safepoint.cpp \
|
||||
share/vm/runtime/serviceThread.cpp \
|
||||
share/vm/runtime/sharedRuntime.cpp \
|
||||
share/vm/runtime/sharedRuntimeTrans.cpp \
|
||||
share/vm/runtime/sharedRuntimeTrig.cpp \
|
||||
share/vm/runtime/signature.cpp \
|
||||
share/vm/runtime/simpleThresholdPolicy.cpp \
|
||||
share/vm/runtime/stackValueCollection.cpp \
|
||||
share/vm/runtime/stackValue.cpp \
|
||||
share/vm/runtime/statSampler.cpp \
|
||||
share/vm/runtime/stubCodeGenerator.cpp \
|
||||
share/vm/runtime/stubRoutines.cpp \
|
||||
share/vm/runtime/sweeper.cpp \
|
||||
share/vm/runtime/synchronizer.cpp \
|
||||
share/vm/runtime/task.cpp \
|
||||
share/vm/runtime/thread.cpp \
|
||||
share/vm/runtime/thread_ext.cpp \
|
||||
share/vm/runtime/timer.cpp \
|
||||
share/vm/runtime/timerTrace.cpp \
|
||||
share/vm/runtime/unhandledOops.cpp \
|
||||
share/vm/runtime/vframeArray.cpp \
|
||||
share/vm/runtime/vframe.cpp \
|
||||
share/vm/runtime/vframe_hp.cpp \
|
||||
share/vm/runtime/vm_operations.cpp \
|
||||
share/vm/runtime/vmStructs.cpp \
|
||||
share/vm/runtime/vmThread.cpp \
|
||||
share/vm/runtime/vm_version.cpp \
|
||||
share/vm/services/attachListener.cpp \
|
||||
share/vm/services/classLoadingService.cpp \
|
||||
share/vm/services/diagnosticArgument.cpp \
|
||||
share/vm/services/diagnosticCommand.cpp \
|
||||
share/vm/services/diagnosticFramework.cpp \
|
||||
share/vm/services/dtraceAttacher.cpp \
|
||||
share/vm/services/g1MemoryPool.cpp \
|
||||
share/vm/services/gcNotifier.cpp \
|
||||
share/vm/services/heapDumper.cpp \
|
||||
share/vm/services/lowMemoryDetector.cpp \
|
||||
share/vm/services/mallocSiteTable.cpp \
|
||||
share/vm/services/mallocTracker.cpp \
|
||||
share/vm/services/management.cpp \
|
||||
share/vm/services/memBaseline.cpp \
|
||||
share/vm/services/memoryManager.cpp \
|
||||
share/vm/services/memoryPool.cpp \
|
||||
share/vm/services/memoryService.cpp \
|
||||
share/vm/services/memReporter.cpp \
|
||||
share/vm/services/memTracker.cpp \
|
||||
share/vm/services/nmtCommon.cpp \
|
||||
share/vm/services/nmtDCmd.cpp \
|
||||
share/vm/services/psMemoryPool.cpp \
|
||||
share/vm/services/runtimeService.cpp \
|
||||
share/vm/services/threadService.cpp \
|
||||
share/vm/services/virtualMemoryTracker.cpp \
|
||||
share/vm/services/writeableFlags.cpp \
|
||||
share/vm/trace/traceBackend.cpp \
|
||||
share/vm/trace/traceStream.cpp \
|
||||
share/vm/utilities/accessFlags.cpp \
|
||||
share/vm/utilities/bitMap.cpp \
|
||||
share/vm/utilities/constantTag.cpp \
|
||||
share/vm/utilities/copy.cpp \
|
||||
share/vm/utilities/debug.cpp \
|
||||
share/vm/utilities/decoder.cpp \
|
||||
share/vm/utilities/decoder_elf.cpp \
|
||||
share/vm/utilities/elfFile.cpp \
|
||||
share/vm/utilities/elfFuncDescTable.cpp \
|
||||
share/vm/utilities/elfStringTable.cpp \
|
||||
share/vm/utilities/elfSymbolTable.cpp \
|
||||
share/vm/utilities/errorReporter.cpp \
|
||||
share/vm/utilities/events.cpp \
|
||||
share/vm/utilities/exceptions.cpp \
|
||||
share/vm/utilities/globalDefinitions.cpp \
|
||||
share/vm/utilities/growableArray.cpp \
|
||||
share/vm/utilities/hashtable.cpp \
|
||||
share/vm/utilities/histogram.cpp \
|
||||
share/vm/utilities/internalVMTests.cpp \
|
||||
share/vm/utilities/intHisto.cpp \
|
||||
share/vm/utilities/json.cpp \
|
||||
share/vm/utilities/nativeCallStack.cpp \
|
||||
share/vm/utilities/numberSeq.cpp \
|
||||
share/vm/utilities/ostream.cpp \
|
||||
share/vm/utilities/preserveException.cpp \
|
||||
share/vm/utilities/sizes.cpp \
|
||||
share/vm/utilities/stringUtils.cpp \
|
||||
share/vm/utilities/ticks.cpp \
|
||||
share/vm/utilities/utf8.cpp \
|
||||
share/vm/utilities/vmError.cpp \
|
||||
share/vm/utilities/xmlstream.cpp
|
||||
|
||||
CC_OPT_share/vm/runtime/vm_version += $(JDK_VERSION) \
|
||||
-DHOTSPOT_VERSION_STRING='"9-internal+0-adhoc.genode.openjdk-jdk9-jdk9"'\
|
||||
-DDEBUG_LEVEL='"release"' -DHOTSPOT_VM_DISTRO='"OpenJDK"' \
|
||||
-DHOTSPOT_BUILD_USER='"genode"'
|
||||
|
||||
CC_OPT_share/vm/interpreter/bytecodeInterpreterWithChecks += -DVM_JVMTI
|
||||
|
||||
vpath dummies.cpp $(REP_DIR)/src/app/jdk/lib/jvm
|
||||
vpath jvmtiEnter.cpp $(JDK_GENERATED)/src
|
||||
vpath jvmtiEnterTrace.cpp $(JDK_GENERATED)/src
|
||||
vpath %.cpp $(HOTSPOT_BASE)
|
||||
|
||||
# vi: set ft=make :
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
LIBS = libc zlib
|
||||
SHARED_LIB = yes
|
||||
JDK_BASE = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
|
||||
JDK_GENERATED = $(call select_from_ports,jdk_generated)/src/app/jdk
|
||||
|
||||
SRC_C = Adler32.c CRC32.c Deflater.c Inflater.c zip_util.c
|
||||
|
||||
INC_DIR += $(JDK_BASE)/share/native/include \
|
||||
$(JDK_BASE)/share/native/libjava \
|
||||
$(JDK_BASE)/unix/native/include \
|
||||
$(JDK_BASE)/unix/native/libjava \
|
||||
$(JDK_GENERATED)/include/java.base
|
||||
|
||||
CC_C_OPT = -D_ALLBSD_SOURCE
|
||||
|
||||
vpath %.c $(JDK_BASE)/share/native/libzip
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
LIBS = libc
|
||||
SHARED_LIB = yes
|
||||
JDK_BASE = $(call select_from_ports,jdk)/src/app/jdk/jdk/src/java.base
|
||||
JDK_GENERATED = $(call select_from_ports,jdk_generated)/src/app/jdk
|
||||
|
||||
SRC_C = fs/UnixNativeDispatcher.c \
|
||||
fs/UnixCopyFile.c \
|
||||
MappedByteBuffer.c \
|
||||
ch/UnixAsynchronousServerSocketChannelImpl.c \
|
||||
ch/FileKey.c \
|
||||
ch/UnixAsynchronousSocketChannelImpl.c \
|
||||
ch/SocketDispatcher.c \
|
||||
ch/NativeThread.c \
|
||||
ch/DatagramChannelImpl.c \
|
||||
ch/FileChannelImpl.c \
|
||||
ch/PollArrayWrapper.c \
|
||||
ch/InheritedChannel.c \
|
||||
ch/Net.c \
|
||||
ch/FileDispatcherImpl.c \
|
||||
ch/IOUtil.c \
|
||||
ch/DatagramDispatcher.c \
|
||||
ch/ServerSocketChannelImpl.c \
|
||||
ch/SocketChannelImpl.c
|
||||
|
||||
|
||||
INC_DIR += $(JDK_GENERATED)/include/java.base \
|
||||
$(JDK_BASE)/share/native/include \
|
||||
$(JDK_BASE)/share/native/libjava \
|
||||
$(JDK_BASE)/share/native/libnet \
|
||||
$(JDK_BASE)/share/native/libnio \
|
||||
$(JDK_BASE)/share/native/libnio/ch \
|
||||
$(JDK_BASE)/unix/native/include \
|
||||
$(JDK_BASE)/unix/native/libjava \
|
||||
$(JDK_BASE)/unix/native/libnet \
|
||||
$(JDK_BASE)/unix/native/libnio
|
||||
|
||||
CC_C_OPT = -D_ALLBSD_SOURCE -include netinet/in.h
|
||||
|
||||
CC_OPT_ch/Net += -DIPV6_ADD_MEMBERSHIP=IPV6_JOIN_GROUP -DIPV6_DROP_MEMBERSHIP=IPV6_LEAVE_GROUP
|
||||
CC_OPT_net_util_md += -include sys/socket.h
|
||||
|
||||
vpath %.c $(JDK_BASE)/unix/native/libnio
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
CC_OPT = -DARCHPROPNAME='"arm"'
|
||||
|
||||
include $(REP_DIR)/lib/mk/java.inc
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
CC_OPT = -DHOTSPOT_LIB_ARCH='"arm"' -DARM -DARM32 \
|
||||
-DZERO_LIBARCH='"arm"'
|
||||
|
||||
include $(REP_DIR)/lib/mk/jvm.inc
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
CC_OPT = -DARCHPROPNAME='"amd64"'
|
||||
|
||||
include $(REP_DIR)/lib/mk/java.inc
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
CC_OPT = -DAMD64 -DHOTSPOT_LIB_ARCH='"amd64"' \
|
||||
-DZERO_LIBARCH='"amd64"'
|
||||
|
||||
include $(REP_DIR)/lib/mk/jvm.inc
|
||||
|
|
@ -1 +0,0 @@
|
|||
ce1c22ae10fce9ba28837e47c25262a1b819e4ad
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
LICENSE := GPLv2
|
||||
VERSION := 64892f1c9874938dfcdc235b5c051dd761cdd833
|
||||
DOWNLOADS := jdk.archive
|
||||
|
||||
NAME(jdk) := jdk.tgz
|
||||
URL(jdk) := https://api.github.com/repos/dmlloyd/openjdk/tarball/$(VERSION)
|
||||
SHA(jdk) := d5b032d5d312148d1c15cde975aa43c4dfa4f2441472d70270ffd6aa22a33694
|
||||
DIR(jdk) := src/app/jdk
|
||||
|
||||
PATCHES := $(addprefix src/app/jdk/patches/,jdk.patch arm.patch size.patch \
|
||||
pollselectorprovider.patch os_bsd.patch \
|
||||
os_bsd_zero.patch)
|
||||
PATCH_OPT := -p1 -d src/app/jdk
|
||||
|
||||
gen_file := src/app/jdk/hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.cpp
|
||||
|
||||
default: $(gen_file)
|
||||
|
||||
$(gen_file): _patch
|
||||
$(VERBOSE)cp $(@D)/bytecodeInterpreter.cpp $(gen_file)
|
||||
|
||||
# vi: set ft=make :
|
||||
|
|
@ -1 +0,0 @@
|
|||
a122728151284665ca99aa71cec49a81347fac76
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
LICENSE := GPLv2
|
||||
VERSION := git
|
||||
DOWNLOADS := jdk_generated.git
|
||||
|
||||
URL(jdk_generated) := https://github.com/ssumpf/jdk_generated.git
|
||||
REV(jdk_generated) := cede347a20501628db7feb43e4beacefdb6761b2
|
||||
DIR(jdk_generated) := src/app/jdk
|
||||
|
||||
# vi: set ft=make :
|
||||
|
|
@ -1,106 +0,0 @@
|
|||
set build_components {
|
||||
core init
|
||||
drivers/timer
|
||||
app/jdk/java
|
||||
}
|
||||
|
||||
build $build_components
|
||||
create_boot_directory
|
||||
|
||||
proc copy_test_data { } {
|
||||
set ::env(MAKEFLAGS) s
|
||||
set jdk_data [exec [genode_dir]/tool/ports/current jdk_generated]/src/app/jdk/bin
|
||||
exec cp $jdk_data/classes.tar bin/.
|
||||
exec cp $jdk_data/hello.tar bin/.
|
||||
exec cp $jdk_data/tzdb.dat bin/.
|
||||
}
|
||||
|
||||
copy_test_data
|
||||
|
||||
set config {
|
||||
<config>
|
||||
<parent-provides>
|
||||
<service name="ROM"/>
|
||||
<service name="LOG"/>
|
||||
<service name="RM"/>
|
||||
<service name="CPU"/>
|
||||
<service name="PD"/>
|
||||
<service name="IRQ"/>
|
||||
<service name="IO_PORT"/>
|
||||
<service name="IO_MEM"/>
|
||||
</parent-provides>
|
||||
<default-route>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</default-route>
|
||||
<default caps="100" />
|
||||
<start name="timer">
|
||||
<resource name="RAM" quantum="2M" />
|
||||
<provides> <service name="Timer" /> </provides>
|
||||
</start>
|
||||
<start name="java" caps="300">
|
||||
<resource name="RAM" quantum="96M" />
|
||||
<route>
|
||||
<service name="ROM" label="zip.lib.so">
|
||||
<parent label="jzip.lib.so" />
|
||||
</service>
|
||||
<service name="ROM" label="net.lib.so">
|
||||
<parent label="jnet.lib.so" />
|
||||
</service>
|
||||
<any-service> <parent/> <any-child/> </any-service>
|
||||
</route>
|
||||
<config ld_verbose="no">
|
||||
<arg value="/bin/java" />
|
||||
<arg value="-jar" />
|
||||
<arg value="hello.jar" />
|
||||
<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" />
|
||||
<vfs rtc="/dev/rtc">
|
||||
<dir name="dev">
|
||||
<log/><null/>
|
||||
<inline name="rtc">2000-01-01 00:00</inline>
|
||||
</dir>
|
||||
<dir name="bin">
|
||||
<rom name="java" />
|
||||
</dir>
|
||||
<dir name="lib">
|
||||
<rom name="java.lib.so" />
|
||||
<inline name="jvm.cfg">-server KNOWN
|
||||
-client IGNORE
|
||||
</inline>
|
||||
<dir name="server">
|
||||
<rom name="jvm.lib.so" />
|
||||
</dir>
|
||||
</dir>
|
||||
<dir name="modules">
|
||||
<tar name="classes.tar" />
|
||||
</dir>
|
||||
<tar name="hello.tar" />
|
||||
<rom name="zip.lib.so" />
|
||||
<rom name="nio.lib.so" />
|
||||
<rom name="net.lib.so" />
|
||||
</vfs>
|
||||
</config>
|
||||
</start>
|
||||
</config>
|
||||
}
|
||||
|
||||
install_config $config
|
||||
|
||||
set boot_modules {
|
||||
core init ld.lib.so timer
|
||||
java jli.lib.so
|
||||
java.lib.so jvm.lib.so jzip.lib.so jimage.lib.so
|
||||
libc.lib.so libm.lib.so libc_pipe.lib.so
|
||||
zlib.lib.so nio.lib.so jnet.lib.so
|
||||
posix.lib.so stdcxx.lib.so ffi.lib.so
|
||||
vfs.lib.so
|
||||
classes.tar hello.tar
|
||||
}
|
||||
|
||||
|
||||
build_boot_image $boot_modules
|
||||
|
||||
append qemu_args " -nographic"
|
||||
|
||||
run_genode_until {.*Hello, Genode.*} 180
|
||||
|
||||
exec rm bin/classes.tar bin/hello.tar bin/tzdb.dat
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
TARGET = java
|
||||
SRC_C = main.c
|
||||
LIBS = jli java jvm libc posix libc_pipe
|
||||
|
||||
CC_C_OPT = -DVERSION_STRING='"9-genode.openjdk"' -D__GENODE__
|
||||
|
||||
JDK_PATH = $(call select_from_ports,jdk)/src/app/jdk
|
||||
vpath main.c $(JDK_PATH)/jdk/src/java.base/share/native/launcher
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
#ifndef _INCLUDE__ERRNO_H_
|
||||
#define _INCLUDE__ERRNO_H_
|
||||
|
||||
#include <sys/errno.h>
|
||||
|
||||
#define ENOSTR 60
|
||||
#define ENODATA 61
|
||||
#define ETIME 62
|
||||
#define ENOSR 63
|
||||
|
||||
#endif /* _INCLUDE__ERRNO_H_ */
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#ifndef _INCLUDE__OS_BSD_HPP_
|
||||
#define _INCLUDE__OS_BSD_HPP_
|
||||
|
||||
#include <bsd/vm/os_bsd.hpp>
|
||||
|
||||
static int cmpxchg(int oldval, int newval, volatile int *ptr);
|
||||
|
||||
#endif /* _INCLUDE__OS_BSD_HPP_ */
|
||||
|
|
@ -1 +0,0 @@
|
|||
#include <sys/ucontext.h>
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#include <math.h>
|
||||
|
||||
double jacos(double d) { return acos(d); }
|
||||
double jasin(double d) { return asin(d); }
|
||||
double jatan(double d) { return atan(d); }
|
||||
double jatan2(double d1, double d2) { return atan2(d1, d2); }
|
||||
double jcos(double d) { return cos(d); }
|
||||
double jcosh(double d) { return cosh(d); }
|
||||
double jexpm1(double d) { return expm1(d); }
|
||||
double jlog(double d) { return log(d); }
|
||||
double jlog10(double d) { return log10(d); }
|
||||
double jlog1p(double d) { return log1p(d); }
|
||||
double jremainder(double d1, double d2) { return remainder(d1, d2); }
|
||||
double jsin(double d) { return sin(d); }
|
||||
double jsinh(double d) { return sinh(d); }
|
||||
double jsqrt(double d) { return sqrt(d); }
|
||||
double jtan(double d) { return tan(d); }
|
||||
double jtanh(double d) { return tanh(d); }
|
||||
|
|
@ -1 +0,0 @@
|
|||
LIBS = java
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
#include <base/log.h>
|
||||
#include <os/backtrace.h>
|
||||
|
||||
extern "C" {
|
||||
#include <pwd.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/time.h>
|
||||
#include <signal.h>
|
||||
}
|
||||
|
||||
#if 0
|
||||
#define WARN_NOT_IMPL Genode::warning(__func__, " not implemented (jvm)");
|
||||
#else
|
||||
#define WARN_NOT_IMPL
|
||||
#endif
|
||||
|
||||
extern "C" void collector_func_load(char* name,
|
||||
void* null_argument_1,
|
||||
void* null_argument_2,
|
||||
void *vaddr,
|
||||
int size,
|
||||
int zero_argument,
|
||||
void* null_argument_3)
|
||||
{ }
|
||||
|
||||
|
||||
int getpwuid_r(uid_t uid, struct passwd *pwd,
|
||||
char *buf, size_t buflen, struct passwd **result)
|
||||
{
|
||||
*result = nullptr;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int getpwnam_r(const char *name, struct passwd *pwd,
|
||||
char *buf, size_t buflen, struct passwd **result)
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int mincore(const void *, size_t, char *)
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int msync(void *addr, size_t length, int flags)
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int lchown(const char *pathname, uid_t owner, gid_t group)
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int futimes(int fd, const struct timeval tv[2])
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
ssize_t sendmsg(int sockfd, const struct msghdr *msg, int flags)
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
int socketpair(int domain, int type, int protocol, int sv[2])
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sigaction(int signum, const struct sigaction *act,
|
||||
struct sigaction *oldact)
|
||||
{
|
||||
WARN_NOT_IMPL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
extern "C" void backtrace()
|
||||
{
|
||||
Genode::backtrace();
|
||||
}
|
||||
|
|
@ -1 +0,0 @@
|
|||
LIBS = jvm
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp
|
||||
index e808340..560a8d3 100644
|
||||
--- a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp
|
||||
+++ b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp
|
||||
@@ -111,8 +111,12 @@ static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
|
||||
*/
|
||||
|
||||
typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
|
||||
-#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
|
||||
|
||||
+#ifdef __GENODE__
|
||||
+#define __kernel_cmpxchg os::cmpxchg
|
||||
+#else
|
||||
+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
|
||||
+#endif
|
||||
|
||||
|
||||
/* Perform an atomic compare and swap: if the current value of `*PTR'
|
||||
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
|
||||
index fb3017c..f5c2d37 100644
|
||||
--- a/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
|
||||
+++ b/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
|
||||
@@ -37,7 +37,13 @@
|
||||
* helper for all gcc versions so it is unreliable to use as well.
|
||||
*/
|
||||
typedef void (__kernel_dmb_t) (void);
|
||||
+
|
||||
+#ifdef __GENODE__
|
||||
+static inline void __kernel_dmb(void) { asm volatile ("dmb ish": : :"memory"); }
|
||||
+#else
|
||||
#define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0)
|
||||
+#endif
|
||||
+
|
||||
|
||||
#define FULL_MEM_BARRIER __kernel_dmb()
|
||||
#define LIGHT_MEM_BARRIER __kernel_dmb()
|
||||
|
|
@ -1,101 +0,0 @@
|
|||
commit 9521d3210cb2979888d3c9ed5a7c8e0e4dd548da
|
||||
Author: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
|
||||
Date: Wed Sep 27 09:58:20 2017 +0200
|
||||
|
||||
hotspot: Genode patches
|
||||
|
||||
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
|
||||
index 197079ba1..b1972ca31 100644
|
||||
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
|
||||
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
|
||||
@@ -426,7 +426,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
|
||||
__ xorl(rsi, rsi);
|
||||
VM_Version::set_cpuinfo_segv_addr(__ pc());
|
||||
// Generate SEGV
|
||||
- __ movl(rax, Address(rsi, 0));
|
||||
+ //__ movl(rax, Address(rsi, 0));
|
||||
|
||||
VM_Version::set_cpuinfo_cont_addr(__ pc());
|
||||
// Returns here after signal. Save xmm0 to check it later.
|
||||
diff --git a/hotspot/src/os/bsd/vm/jvm_bsd.h b/hotspot/src/os/bsd/vm/jvm_bsd.h
|
||||
index f099198d1..5fa636a7d 100644
|
||||
--- a/hotspot/src/os/bsd/vm/jvm_bsd.h
|
||||
+++ b/hotspot/src/os/bsd/vm/jvm_bsd.h
|
||||
@@ -68,7 +68,7 @@
|
||||
#define AGENT_ONUNLOAD_SYMBOLS {"Agent_OnUnload"}
|
||||
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
|
||||
|
||||
-#define JNI_LIB_PREFIX "lib"
|
||||
+#define JNI_LIB_PREFIX ""
|
||||
#ifdef __APPLE__
|
||||
#define JNI_LIB_SUFFIX ".dylib"
|
||||
#else
|
||||
diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
|
||||
index 3a405dec2..e5963f3fc 100644
|
||||
--- a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
|
||||
+++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
|
||||
@@ -44,7 +44,7 @@ inline bool os::obsolete_option(const JavaVMOption *option) {
|
||||
}
|
||||
|
||||
inline bool os::uses_stack_guard_pages() {
|
||||
- return true;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
inline bool os::must_commit_stack_guard_pages() {
|
||||
diff --git a/hotspot/src/os/posix/vm/os_posix.cpp b/hotspot/src/os/posix/vm/os_posix.cpp
|
||||
index 5885906f6..e482a405a 100644
|
||||
--- a/hotspot/src/os/posix/vm/os_posix.cpp
|
||||
+++ b/hotspot/src/os/posix/vm/os_posix.cpp
|
||||
@@ -185,7 +185,7 @@ int os::log_vsnprintf(char* buf, size_t len, const char* fmt, va_list args) {
|
||||
}
|
||||
|
||||
int os::get_fileno(FILE* fp) {
|
||||
- return NOT_AIX(::)fileno(fp);
|
||||
+ return fileno(fp);
|
||||
}
|
||||
|
||||
struct tm* os::gmtime_pd(const time_t* clock, struct tm* res) {
|
||||
diff --git a/jdk/src/java.base/unix/native/include/jvm_md.h b/jdk/src/java.base/unix/native/include/jvm_md.h
|
||||
index 818ab732a..23692e9ac 100644
|
||||
--- a/jdk/src/java.base/unix/native/include/jvm_md.h
|
||||
+++ b/jdk/src/java.base/unix/native/include/jvm_md.h
|
||||
@@ -40,10 +40,18 @@
|
||||
#define JNI_ONLOAD_SYMBOLS {"JNI_OnLoad"}
|
||||
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
|
||||
|
||||
+#ifdef __GENODE__
|
||||
+#define JNI_LIB_PREFIX ""
|
||||
+#else
|
||||
#define JNI_LIB_PREFIX "lib"
|
||||
+#endif
|
||||
+
|
||||
#ifdef __APPLE__
|
||||
#define JNI_LIB_SUFFIX ".dylib"
|
||||
#define VERSIONED_JNI_LIB_NAME(NAME, VERSION) JNI_LIB_PREFIX NAME "." VERSION JNI_LIB_SUFFIX
|
||||
+#elif defined(__GENODE__)
|
||||
+#define JNI_LIB_SUFFIX ".lib.so"
|
||||
+#define VERSIONED_JNI_LIB_NAME(NAME, VERSION) JNI_LIB_PREFIX NAME JNI_LIB_SUFFIX "." VERSION
|
||||
#else
|
||||
#define JNI_LIB_SUFFIX ".so"
|
||||
#define VERSIONED_JNI_LIB_NAME(NAME, VERSION) JNI_LIB_PREFIX NAME JNI_LIB_SUFFIX "." VERSION
|
||||
diff --git a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c
|
||||
index cb9afc098..2d5af9fc6 100644
|
||||
--- a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c
|
||||
+++ b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c
|
||||
@@ -37,9 +37,14 @@
|
||||
#include <sys/types.h>
|
||||
#include "manifest_info.h"
|
||||
|
||||
-
|
||||
+#ifdef __GENODE__
|
||||
+#define JVM_DLL "jvm.lib.so"
|
||||
+#define JAVA_DLL "java.lib.so"
|
||||
+#else
|
||||
#define JVM_DLL "libjvm.so"
|
||||
#define JAVA_DLL "libjava.so"
|
||||
+#endif
|
||||
+
|
||||
#ifdef AIX
|
||||
#define LD_LIBRARY_PATH "LIBPATH"
|
||||
#else
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
|
||||
index 15a5b7d..e4d30f7 100644
|
||||
--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
|
||||
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
|
||||
@@ -63,7 +63,7 @@
|
||||
extern sigjmp_buf* get_jmp_buf_for_continuation();
|
||||
|
||||
address os::current_stack_pointer() {
|
||||
- address dummy = (address) &dummy;
|
||||
+ volatile address dummy = (address) &dummy;
|
||||
return dummy;
|
||||
}
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
Use PollSelectorProvider instead of EPollSelectorProvider
|
||||
|
||||
diff --git a/jdk/src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java b/jdk/src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java
|
||||
index 1278f15..3f23cc4 100644
|
||||
--- a/jdk/src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java
|
||||
+++ b/jdk/src/java.base/linux/classes/sun/nio/ch/DefaultSelectorProvider.java
|
||||
@@ -42,7 +42,7 @@ public class DefaultSelectorProvider {
|
||||
* Returns the default SelectorProvider.
|
||||
*/
|
||||
public static SelectorProvider create() {
|
||||
- return new sun.nio.ch.EPollSelectorProvider();
|
||||
+ return new sun.nio.ch.PollSelectorProvider();
|
||||
}
|
||||
|
||||
}
|
||||
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
|
||||
index 090434a..507dd10 100644
|
||||
--- a/make/CompileJavaModules.gmk
|
||||
+++ b/make/CompileJavaModules.gmk
|
||||
@@ -55,7 +55,7 @@ java.base_EXCLUDES += java/lang/doc-files
|
||||
# data files and shouldn't go in the product
|
||||
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
|
||||
|
||||
-ifneq ($(filter solaris macosx linux windows,$(OPENJDK_TARGET_OS)), )
|
||||
+ifneq ($(filter solaris macosx windows,$(OPENJDK_TARGET_OS)), )
|
||||
java.base_EXCLUDE_FILES += \
|
||||
sun/nio/ch/AbstractPollSelectorImpl.java \
|
||||
sun/nio/ch/PollSelectorImpl.java \
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
commit 7a6a25557a0b21e0d3202f04a4172b3fa5e9a4e9
|
||||
Author: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
|
||||
Date: Mon Apr 16 11:08:15 2018 +0200
|
||||
|
||||
jdk: size_t patch
|
||||
|
||||
diff --git a/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp
|
||||
index 0a2a462..7bc5011 100644
|
||||
--- a/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp
|
||||
+++ b/hotspot/src/share/vm/gc/g1/g1PageBasedVirtualSpace.cpp
|
||||
@@ -99,7 +99,7 @@ size_t G1PageBasedVirtualSpace::uncommitted_size() const {
|
||||
return reserved_size() - committed_size();
|
||||
}
|
||||
|
||||
-size_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
|
||||
+uintptr_t G1PageBasedVirtualSpace::addr_to_page_index(char* addr) const {
|
||||
return (addr - _low_boundary) / _page_size;
|
||||
}
|
||||
|
||||
diff --git a/hotspot/src/share/vm/prims/whitebox.cpp b/hotspot/src/share/vm/prims/whitebox.cpp
|
||||
index 952aa5f..ab3c3b8 100644
|
||||
--- a/hotspot/src/share/vm/prims/whitebox.cpp
|
||||
+++ b/hotspot/src/share/vm/prims/whitebox.cpp
|
||||
@@ -1022,7 +1022,7 @@ WB_ENTRY(jobject, WB_GetUint64VMFlag(JNIEnv* env, jobject o, jstring name))
|
||||
WB_END
|
||||
|
||||
WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
|
||||
- uintx result;
|
||||
+ size_t result;
|
||||
if (GetVMFlag <size_t> (thread, env, name, &result, &CommandLineFlags::size_tAt)) {
|
||||
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
|
||||
return longBox(thread, env, result);
|
||||
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
|
||||
index 92f18dd..9164cbf 100644
|
||||
--- a/hotspot/src/share/vm/runtime/arguments.cpp
|
||||
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
|
||||
@@ -78,7 +78,7 @@ SystemProperty* Arguments::_system_properties = NULL;
|
||||
const char* Arguments::_gc_log_filename = NULL;
|
||||
bool Arguments::_has_profile = false;
|
||||
size_t Arguments::_conservative_max_heap_alignment = 0;
|
||||
-size_t Arguments::_min_heap_size = 0;
|
||||
+uintx Arguments::_min_heap_size = 0;
|
||||
Arguments::Mode Arguments::_mode = _mixed;
|
||||
bool Arguments::_java_compiler = false;
|
||||
bool Arguments::_xdebug_mode = false;
|
||||
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.hpp b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
|
||||
index dbb080e..11c3278 100644
|
||||
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp
|
||||
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
|
||||
@@ -284,8 +284,7 @@ inline size_t byte_size_in_exact_unit(size_t s) {
|
||||
|
||||
// intx and uintx are the 'extended' int and 'extended' unsigned int types;
|
||||
// they are 32bit wide on a 32-bit platform, and 64bit wide on a 64bit platform.
|
||||
-
|
||||
-typedef intptr_t intx;
|
||||
+typedef intptr_t intx;
|
||||
typedef uintptr_t uintx;
|
||||
|
||||
const intx min_intx = (intx)1 << (sizeof(intx)*BitsPerByte-1);
|
||||
@@ -1106,10 +1105,10 @@ inline intptr_t bitfield(intptr_t x, int start_bit_no, int field_length) {
|
||||
// and 64-bit overloaded functions, which does not work, and having
|
||||
// explicitly-typed versions of these routines (i.e., MAX2I, MAX2L)
|
||||
// will be even more error-prone than macros.
|
||||
-template<class T> inline T MAX2(T a, T b) { return (a > b) ? a : b; }
|
||||
-template<class T> inline T MIN2(T a, T b) { return (a < b) ? a : b; }
|
||||
+template<class T, class U> inline T MAX2(T a, U b) { return (a > b) ? a : b; }
|
||||
+template<class T, class U> inline T MIN2(T a, U b) { return (a < b) ? a : b; }
|
||||
template<class T> inline T MAX3(T a, T b, T c) { return MAX2(MAX2(a, b), c); }
|
||||
-template<class T> inline T MIN3(T a, T b, T c) { return MIN2(MIN2(a, b), c); }
|
||||
+template<class T, class U, class V> inline T MIN3(T a, U b, V c) { return MIN2(MIN2(a, b), c); }
|
||||
template<class T> inline T MAX4(T a, T b, T c, T d) { return MAX2(MAX3(a, b, c), d); }
|
||||
template<class T> inline T MIN4(T a, T b, T c, T d) { return MIN2(MIN3(a, b, c), d); }
|
||||
|
||||
diff --git a/hotspot/src/share/vm/utilities/macros.hpp b/hotspot/src/share/vm/utilities/macros.hpp
|
||||
index f24e4ff..534cb29 100644
|
||||
--- a/hotspot/src/share/vm/utilities/macros.hpp
|
||||
+++ b/hotspot/src/share/vm/utilities/macros.hpp
|
||||
@@ -334,7 +334,6 @@
|
||||
#endif
|
||||
|
||||
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
|
||||
-#define BSD
|
||||
#define BSD_ONLY(code) code
|
||||
#define NOT_BSD(code)
|
||||
#else
|
||||
Loading…
Reference in New Issue