svn commit: r352721 - in head/java/openjdk8: . files
Jung-uk Kim
jkim at FreeBSD.org
Thu May 1 04:43:40 UTC 2014
Author: jkim
Date: Thu May 1 04:43:39 2014
New Revision: 352721
URL: http://svnweb.freebsd.org/changeset/ports/352721
QAT: https://qat.redports.org/buildarchive/r352721/
Log:
Merge more HotSpot patches from java/openjdk6 and clean up.
Modified:
head/java/openjdk8/Makefile
head/java/openjdk8/files/patch-bsd
Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile Thu May 1 04:32:55 2014 (r352720)
+++ head/java/openjdk8/Makefile Thu May 1 04:43:39 2014 (r352721)
@@ -2,7 +2,7 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/:jdk \
https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
@@ -145,8 +145,14 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICON
.endif
post-extract:
- @${CP} ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \
- ${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg
+ @${MV} -f ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug \
+ ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug.macosx
+ @${MV} -f ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product \
+ ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product.macosx
+ @${CP} -f ${WRKSRC}/hotspot/make/linux/makefiles/mapfile-vers-debug \
+ ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-debug
+ @${CP} -f ${WRKSRC}/hotspot/make/linux/makefiles/mapfile-vers-product \
+ ${WRKSRC}/hotspot/make/bsd/makefiles/mapfile-vers-product
@${MKDIR} ${WRKSRC}/jdk/src/bsd/classes/java/net \
${WRKSRC}/jdk/src/bsd/classes/sun/nio/ch
@${MV} -f ${WRKSRC}/jdk/src/macosx/classes/java/net/DefaultInterface.java \
@@ -162,6 +168,8 @@ post-extract:
${WRKSRC}/jdk/src/macosx/native/sun/nio
@${CP} -f ${WRKSRC}/jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd \
${WRKSRC}/jdk/src/solaris/classes/java/lang/UNIXProcess.java.macosx
+ @${CP} -f ${FILESDIR}/jdk-test-javax-imageio-plugins-jpeg-truncated.jpg \
+ ${WRKSRC}/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg
post-patch:
@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
@@ -198,15 +206,11 @@ post-build:
do-install:
@${MKDIR} ${STAGEDIR}${INSTALLDIR}
@cd ${JDK_IMAGEDIR} && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} \
- "-not ( -type d -name bin -prune )"
- @cd ${JDK_IMAGEDIR} && \
- ${COPYTREE_BIN} "bin jre/bin" ${STAGEDIR}${INSTALLDIR}
- @${INSTALL_PROGRAM} ${JDK_IMAGEDIR}/jre/lib/${ARCH}/jexec \
- ${JDK_IMAGEDIR}/jre/lib/${ARCH}/jspawnhelper \
- ${STAGEDIR}${INSTALLDIR}/jre/lib/${ARCH}
- @${INSTALL_PROGRAM} ${JDK_IMAGEDIR}/lib/${ARCH}/jexec \
- ${STAGEDIR}${INSTALLDIR}/lib/${ARCH}
+ ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
+ @cd ${STAGEDIR}${INSTALLDIR} && \
+ ${FIND} bin jre/bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \
+ ${CHMOD} ${BINMODE} jre/lib/${ARCH}/jexec \
+ jre/lib/${ARCH}/jspawnhelper lib/${ARCH}/jexec
@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
@${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
Modified: head/java/openjdk8/files/patch-bsd
==============================================================================
--- head/java/openjdk8/files/patch-bsd Thu May 1 04:32:55 2014 (r352720)
+++ head/java/openjdk8/files/patch-bsd Thu May 1 04:43:39 2014 (r352721)
@@ -141,7 +141,7 @@
CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DLINUX"
--- hotspot/make/bsd/makefiles/build_vm_def.sh
+++ hotspot/make/bsd/makefiles/build_vm_def.sh
-@@ -1,12 +1,21 @@
+@@ -1,12 +1,22 @@
#!/bin/sh
# If we're cross compiling use that path for nm
@@ -155,18 +155,33 @@
-$NM -Uj $* | awk '
- { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 }
- '
-+case `uname` in
-+ *BSD )
-+ $NM --defined-only $* | awk '
-+ { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" }
-+ '
-+ ;;
-+ Darwin )
-+ $NM -Uj $* | awk '
-+ { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 }
-+ '
-+ ;;
-+esac
++if [ "$(uname -s)" = Darwin ]; then
++ $NM -Uj $* | awk '
++ { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 }
++ '
++ exit
++fi
++$NM --defined-only $* \
++ | awk '{
++ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
++ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
++ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
++ }' \
++ | sort -u
+--- hotspot/make/bsd/makefiles/debug.make
++++ hotspot/make/bsd/makefiles/debug.make
+@@ -35,7 +35,10 @@
+ # to inhibit the effect of the previous line on CFLAGS.
+
+ # Linker mapfile
+-MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
++ifeq ($(OS_VENDOR), Darwin)
++MAPSUFX = .macosx
++endif
++MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug$(MAPSUFX)
+
+ VERSION = debug
+ SYSDEFS += -DASSERT
--- hotspot/make/bsd/makefiles/defs.make
+++ hotspot/make/bsd/makefiles/defs.make
@@ -254,7 +254,7 @@
@@ -178,6 +193,20 @@
# Library suffix
ifeq ($(OS_VENDOR),Darwin)
+--- hotspot/make/bsd/makefiles/fastdebug.make
++++ hotspot/make/bsd/makefiles/fastdebug.make
+@@ -56,7 +56,10 @@
+ # to inhibit the effect of the previous line on CFLAGS.
+
+ # Linker mapfile
+-MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
++ifeq ($(OS_VENDOR), Darwin)
++MAPSUFX = .macosx
++endif
++MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug$(MAPSUFX)
+
+ VERSION = fastdebug
+ SYSDEFS += -DASSERT -DCHECK_UNHANDLED_OOPS
--- hotspot/make/bsd/makefiles/gcc.make
+++ hotspot/make/bsd/makefiles/gcc.make
@@ -168,6 +168,10 @@
@@ -335,945 +364,53 @@
+
--- hotspot/make/bsd/makefiles/mapfile-vers-debug
+++ hotspot/make/bsd/makefiles/mapfile-vers-debug
-@@ -24,238 +24,245 @@
- # Only used for OSX/Darwin builds
-
- # Define public interface.
-- # _JNI
-- _JNI_CreateJavaVM
-- _JNI_GetCreatedJavaVMs
-- _JNI_GetDefaultJavaVMInitArgs
--
-- # _JVM
-- _JVM_Accept
-- _JVM_ActiveProcessorCount
-- _JVM_AllocateNewArray
-- _JVM_AllocateNewObject
-- _JVM_ArrayCopy
-- _JVM_AssertionStatusDirectives
-- _JVM_Available
-- _JVM_Bind
-- _JVM_ClassDepth
-- _JVM_ClassLoaderDepth
-- _JVM_Clone
-- _JVM_Close
-- _JVM_CX8Field
-- _JVM_CompileClass
-- _JVM_CompileClasses
-- _JVM_CompilerCommand
-- _JVM_Connect
-- _JVM_ConstantPoolGetClassAt
-- _JVM_ConstantPoolGetClassAtIfLoaded
-- _JVM_ConstantPoolGetDoubleAt
-- _JVM_ConstantPoolGetFieldAt
-- _JVM_ConstantPoolGetFieldAtIfLoaded
-- _JVM_ConstantPoolGetFloatAt
-- _JVM_ConstantPoolGetIntAt
-- _JVM_ConstantPoolGetLongAt
-- _JVM_ConstantPoolGetMethodAt
-- _JVM_ConstantPoolGetMethodAtIfLoaded
-- _JVM_ConstantPoolGetMemberRefInfoAt
-- _JVM_ConstantPoolGetSize
-- _JVM_ConstantPoolGetStringAt
-- _JVM_ConstantPoolGetUTF8At
-- _JVM_CountStackFrames
-- _JVM_CurrentClassLoader
-- _JVM_CurrentLoadedClass
-- _JVM_CurrentThread
-- _JVM_CurrentTimeMillis
-- _JVM_DefineClass
-- _JVM_DefineClassWithSource
-- _JVM_DefineClassWithSourceCond
-- _JVM_DesiredAssertionStatus
-- _JVM_DisableCompiler
-- _JVM_DoPrivileged
-- _JVM_DTraceGetVersion
-- _JVM_DTraceActivate
-- _JVM_DTraceIsProbeEnabled
-- _JVM_DTraceIsSupported
-- _JVM_DTraceDispose
-- _JVM_DumpAllStacks
-- _JVM_DumpThreads
-- _JVM_EnableCompiler
-- _JVM_Exit
-- _JVM_FillInStackTrace
-- _JVM_FindClassFromClass
-- _JVM_FindClassFromClassLoader
-- _JVM_FindClassFromBootLoader
-- _JVM_FindLibraryEntry
-- _JVM_FindLoadedClass
-- _JVM_FindPrimitiveClass
-- _JVM_FindSignal
-- _JVM_FreeMemory
-- _JVM_GC
-- _JVM_GetAllThreads
-- _JVM_GetArrayElement
-- _JVM_GetArrayLength
-- _JVM_GetCPClassNameUTF
-- _JVM_GetCPFieldClassNameUTF
-- _JVM_GetCPFieldModifiers
-- _JVM_GetCPFieldNameUTF
-- _JVM_GetCPFieldSignatureUTF
-- _JVM_GetCPMethodClassNameUTF
-- _JVM_GetCPMethodModifiers
-- _JVM_GetCPMethodNameUTF
-- _JVM_GetCPMethodSignatureUTF
-- _JVM_GetCallerClass
-- _JVM_GetClassAccessFlags
-- _JVM_GetClassAnnotations
-- _JVM_GetClassCPEntriesCount
-- _JVM_GetClassCPTypes
-- _JVM_GetClassConstantPool
-- _JVM_GetClassContext
-- _JVM_GetClassDeclaredConstructors
-- _JVM_GetClassDeclaredFields
-- _JVM_GetClassDeclaredMethods
-- _JVM_GetClassFieldsCount
-- _JVM_GetClassInterfaces
-- _JVM_GetClassLoader
-- _JVM_GetClassMethodsCount
-- _JVM_GetClassModifiers
-- _JVM_GetClassName
-- _JVM_GetClassNameUTF
-- _JVM_GetClassSignature
-- _JVM_GetClassSigners
-- _JVM_GetClassTypeAnnotations
-- _JVM_GetComponentType
-- _JVM_GetDeclaredClasses
-- _JVM_GetDeclaringClass
-- _JVM_GetEnclosingMethodInfo
-- _JVM_GetFieldAnnotations
-- _JVM_GetFieldIxModifiers
-- _JVM_GetFieldTypeAnnotations
-- _JVM_GetHostName
-- _JVM_GetInheritedAccessControlContext
-- _JVM_GetInterfaceVersion
-- _JVM_GetLastErrorString
-- _JVM_GetManagement
-- _JVM_GetMethodAnnotations
-- _JVM_GetMethodDefaultAnnotationValue
-- _JVM_GetMethodIxArgsSize
-- _JVM_GetMethodIxByteCode
-- _JVM_GetMethodIxByteCodeLength
-- _JVM_GetMethodIxExceptionIndexes
-- _JVM_GetMethodIxExceptionTableEntry
-- _JVM_GetMethodIxExceptionTableLength
-- _JVM_GetMethodIxExceptionsCount
-- _JVM_GetMethodIxLocalsCount
-- _JVM_GetMethodIxMaxStack
-- _JVM_GetMethodIxModifiers
-- _JVM_GetMethodIxNameUTF
-- _JVM_GetMethodIxSignatureUTF
-- _JVM_GetMethodParameterAnnotations
-- _JVM_GetMethodParameters
-- _JVM_GetMethodTypeAnnotations
-- _JVM_GetPrimitiveArrayElement
-- _JVM_GetProtectionDomain
-- _JVM_GetSockName
-- _JVM_GetSockOpt
-- _JVM_GetStackAccessControlContext
-- _JVM_GetStackTraceDepth
-- _JVM_GetStackTraceElement
-- _JVM_GetSystemPackage
-- _JVM_GetSystemPackages
-- _JVM_GetThreadStateNames
-- _JVM_GetThreadStateValues
-- _JVM_GetVersionInfo
-- _JVM_Halt
-- _JVM_HoldsLock
-- _JVM_IHashCode
-- _JVM_InitAgentProperties
-- _JVM_InitProperties
-- _JVM_InitializeCompiler
-- _JVM_InitializeSocketLibrary
-- _JVM_InternString
-- _JVM_Interrupt
-- _JVM_InvokeMethod
-- _JVM_IsArrayClass
-- _JVM_IsConstructorIx
-- _JVM_IsInterface
-- _JVM_IsInterrupted
-- _JVM_IsNaN
-- _JVM_IsPrimitiveClass
-- _JVM_IsSameClassPackage
-- _JVM_IsSilentCompiler
-- _JVM_IsSupportedJNIVersion
-- _JVM_IsThreadAlive
-- _JVM_IsVMGeneratedMethodIx
-- _JVM_LatestUserDefinedLoader
-- _JVM_Listen
-- _JVM_LoadClass0
-- _JVM_LoadLibrary
-- _JVM_Lseek
-- _JVM_MaxObjectInspectionAge
-- _JVM_MaxMemory
-- _JVM_MonitorNotify
-- _JVM_MonitorNotifyAll
-- _JVM_MonitorWait
-- _JVM_NanoTime
-- _JVM_NativePath
-- _JVM_NewArray
-- _JVM_NewInstanceFromConstructor
-- _JVM_NewMultiArray
-- _JVM_OnExit
-- _JVM_Open
-- _JVM_RaiseSignal
-- _JVM_RawMonitorCreate
-- _JVM_RawMonitorDestroy
-- _JVM_RawMonitorEnter
-- _JVM_RawMonitorExit
-- _JVM_Read
-- _JVM_Recv
-- _JVM_RecvFrom
-- _JVM_RegisterSignal
-- _JVM_ReleaseUTF
-- _JVM_ResolveClass
-- _JVM_ResumeThread
-- _JVM_Send
-- _JVM_SendTo
-- _JVM_SetArrayElement
-- _JVM_SetClassSigners
-- _JVM_SetLength
-- _JVM_SetNativeThreadName
-- _JVM_SetPrimitiveArrayElement
-- _JVM_SetSockOpt
-- _JVM_SetThreadPriority
-- _JVM_Sleep
-- _JVM_Socket
-- _JVM_SocketAvailable
-- _JVM_SocketClose
-- _JVM_SocketShutdown
-- _JVM_StartThread
-- _JVM_StopThread
-- _JVM_SuspendThread
-- _JVM_SupportsCX8
-- _JVM_Sync
-- _JVM_Timeout
-- _JVM_TotalMemory
-- _JVM_TraceInstructions
-- _JVM_TraceMethodCalls
-- _JVM_UnloadLibrary
-- _JVM_Write
-- _JVM_Yield
-- _JVM_handle_bsd_signal
--
-- # debug _JVM
-- _JVM_AccessVMBooleanFlag
-- _JVM_AccessVMIntFlag
-- _JVM_VMBreakPoint
-+
-+SUNWprivate_1.1 {
-+ global:
-+ # JNI
-+ JNI_CreateJavaVM;
-+ JNI_GetCreatedJavaVMs;
-+ JNI_GetDefaultJavaVMInitArgs;
-+
-+ # JVM
-+ JVM_Accept;
-+ JVM_ActiveProcessorCount;
-+ JVM_AllocateNewArray;
-+ JVM_AllocateNewObject;
-+ JVM_ArrayCopy;
-+ JVM_AssertionStatusDirectives;
-+ JVM_Available;
-+ JVM_Bind;
-+ JVM_ClassDepth;
-+ JVM_ClassLoaderDepth;
-+ JVM_Clone;
-+ JVM_Close;
-+ JVM_CX8Field;
-+ JVM_CompileClass;
-+ JVM_CompileClasses;
-+ JVM_CompilerCommand;
-+ JVM_Connect;
-+ JVM_ConstantPoolGetClassAt;
-+ JVM_ConstantPoolGetClassAtIfLoaded;
-+ JVM_ConstantPoolGetDoubleAt;
-+ JVM_ConstantPoolGetFieldAt;
-+ JVM_ConstantPoolGetFieldAtIfLoaded;
-+ JVM_ConstantPoolGetFloatAt;
-+ JVM_ConstantPoolGetIntAt;
-+ JVM_ConstantPoolGetLongAt;
-+ JVM_ConstantPoolGetMethodAt;
-+ JVM_ConstantPoolGetMethodAtIfLoaded;
-+ JVM_ConstantPoolGetMemberRefInfoAt;
-+ JVM_ConstantPoolGetSize;
-+ JVM_ConstantPoolGetStringAt;
-+ JVM_ConstantPoolGetUTF8At;
-+ JVM_CountStackFrames;
-+ JVM_CurrentClassLoader;
-+ JVM_CurrentLoadedClass;
-+ JVM_CurrentThread;
-+ JVM_CurrentTimeMillis;
-+ JVM_DefineClass;
-+ JVM_DefineClassWithSource;
-+ JVM_DefineClassWithSourceCond;
-+ JVM_DesiredAssertionStatus;
-+ JVM_DisableCompiler;
-+ JVM_DoPrivileged;
-+ JVM_DTraceGetVersion;
-+ JVM_DTraceActivate;
-+ JVM_DTraceIsProbeEnabled;
-+ JVM_DTraceIsSupported;
-+ JVM_DTraceDispose;
-+ JVM_DumpAllStacks;
-+ JVM_DumpThreads;
-+ JVM_EnableCompiler;
-+ JVM_Exit;
-+ JVM_FillInStackTrace;
-+ JVM_FindClassFromClass;
-+ JVM_FindClassFromClassLoader;
-+ JVM_FindClassFromBootLoader;
-+ JVM_FindLibraryEntry;
-+ JVM_FindLoadedClass;
-+ JVM_FindPrimitiveClass;
-+ JVM_FindSignal;
-+ JVM_FreeMemory;
-+ JVM_GC;
-+ JVM_GetAllThreads;
-+ JVM_GetArrayElement;
-+ JVM_GetArrayLength;
-+ JVM_GetCPClassNameUTF;
-+ JVM_GetCPFieldClassNameUTF;
-+ JVM_GetCPFieldModifiers;
-+ JVM_GetCPFieldNameUTF;
-+ JVM_GetCPFieldSignatureUTF;
-+ JVM_GetCPMethodClassNameUTF;
-+ JVM_GetCPMethodModifiers;
-+ JVM_GetCPMethodNameUTF;
-+ JVM_GetCPMethodSignatureUTF;
-+ JVM_GetCallerClass;
-+ JVM_GetClassAccessFlags;
-+ JVM_GetClassAnnotations;
-+ JVM_GetClassCPEntriesCount;
-+ JVM_GetClassCPTypes;
-+ JVM_GetClassConstantPool;
-+ JVM_GetClassContext;
-+ JVM_GetClassDeclaredConstructors;
-+ JVM_GetClassDeclaredFields;
-+ JVM_GetClassDeclaredMethods;
-+ JVM_GetClassFieldsCount;
-+ JVM_GetClassInterfaces;
-+ JVM_GetClassLoader;
-+ JVM_GetClassMethodsCount;
-+ JVM_GetClassModifiers;
-+ JVM_GetClassName;
-+ JVM_GetClassNameUTF;
-+ JVM_GetClassSignature;
-+ JVM_GetClassSigners;
-+ JVM_GetClassTypeAnnotations;
-+ JVM_GetComponentType;
-+ JVM_GetDeclaredClasses;
-+ JVM_GetDeclaringClass;
-+ JVM_GetEnclosingMethodInfo;
-+ JVM_GetFieldAnnotations;
-+ JVM_GetFieldIxModifiers;
-+ JVM_GetFieldTypeAnnotations;
-+ JVM_GetHostName;
-+ JVM_GetInheritedAccessControlContext;
-+ JVM_GetInterfaceVersion;
-+ JVM_GetLastErrorString;
-+ JVM_GetManagement;
-+ JVM_GetMethodAnnotations;
-+ JVM_GetMethodDefaultAnnotationValue;
-+ JVM_GetMethodIxArgsSize;
-+ JVM_GetMethodIxByteCode;
-+ JVM_GetMethodIxByteCodeLength;
-+ JVM_GetMethodIxExceptionIndexes;
-+ JVM_GetMethodIxExceptionTableEntry;
-+ JVM_GetMethodIxExceptionTableLength;
-+ JVM_GetMethodIxExceptionsCount;
-+ JVM_GetMethodIxLocalsCount;
-+ JVM_GetMethodIxMaxStack;
-+ JVM_GetMethodIxModifiers;
-+ JVM_GetMethodIxNameUTF;
-+ JVM_GetMethodIxSignatureUTF;
-+ JVM_GetMethodParameterAnnotations;
-+ JVM_GetMethodParameters;
-+ JVM_GetMethodTypeAnnotations;
-+ JVM_GetPrimitiveArrayElement;
-+ JVM_GetProtectionDomain;
-+ JVM_GetSockName;
-+ JVM_GetSockOpt;
-+ JVM_GetStackAccessControlContext;
-+ JVM_GetStackTraceDepth;
-+ JVM_GetStackTraceElement;
-+ JVM_GetSystemPackage;
-+ JVM_GetSystemPackages;
-+ JVM_GetThreadStateNames;
-+ JVM_GetThreadStateValues;
-+ JVM_GetVersionInfo;
-+ JVM_Halt;
-+ JVM_HoldsLock;
-+ JVM_IHashCode;
-+ JVM_InitAgentProperties;
-+ JVM_InitProperties;
-+ JVM_InitializeCompiler;
-+ JVM_InitializeSocketLibrary;
-+ JVM_InternString;
-+ JVM_Interrupt;
-+ JVM_InvokeMethod;
-+ JVM_IsArrayClass;
-+ JVM_IsConstructorIx;
-+ JVM_IsInterface;
-+ JVM_IsInterrupted;
-+ JVM_IsNaN;
-+ JVM_IsPrimitiveClass;
-+ JVM_IsSameClassPackage;
-+ JVM_IsSilentCompiler;
-+ JVM_IsSupportedJNIVersion;
-+ JVM_IsThreadAlive;
-+ JVM_IsVMGeneratedMethodIx;
-+ JVM_LatestUserDefinedLoader;
-+ JVM_Listen;
-+ JVM_LoadClass0;
-+ JVM_LoadLibrary;
-+ JVM_Lseek;
-+ JVM_MaxObjectInspectionAge;
-+ JVM_MaxMemory;
-+ JVM_MonitorNotify;
-+ JVM_MonitorNotifyAll;
-+ JVM_MonitorWait;
-+ JVM_NanoTime;
-+ JVM_NativePath;
-+ JVM_NewArray;
-+ JVM_NewInstanceFromConstructor;
-+ JVM_NewMultiArray;
-+ JVM_OnExit;
-+ JVM_Open;
-+ JVM_RaiseSignal;
-+ JVM_RawMonitorCreate;
-+ JVM_RawMonitorDestroy;
-+ JVM_RawMonitorEnter;
-+ JVM_RawMonitorExit;
-+ JVM_Read;
-+ JVM_Recv;
-+ JVM_RecvFrom;
-+ JVM_RegisterSignal;
-+ JVM_ReleaseUTF;
-+ JVM_ResolveClass;
-+ JVM_ResumeThread;
-+ JVM_Send;
-+ JVM_SendTo;
-+ JVM_SetArrayElement;
-+ JVM_SetClassSigners;
-+ JVM_SetLength;
-+ JVM_SetNativeThreadName;
-+ JVM_SetPrimitiveArrayElement;
-+ JVM_SetSockOpt;
-+ JVM_SetThreadPriority;
-+ JVM_Sleep;
-+ JVM_Socket;
-+ JVM_SocketAvailable;
-+ JVM_SocketClose;
-+ JVM_SocketShutdown;
-+ JVM_StartThread;
-+ JVM_StopThread;
-+ JVM_SuspendThread;
-+ JVM_SupportsCX8;
-+ JVM_Sync;
-+ JVM_Timeout;
-+ JVM_TotalMemory;
-+ JVM_TraceInstructions;
-+ JVM_TraceMethodCalls;
-+ JVM_UnloadLibrary;
-+ JVM_Write;
-+ JVM_Yield;
+@@ -242,7 +242,7 @@
+ JVM_UnloadLibrary;
+ JVM_Write;
+ JVM_Yield;
+- JVM_handle_linux_signal;
+ JVM_handle_bsd_signal;
-+
-+ # debug JVM
-+ JVM_AccessVMBooleanFlag;
-+ JVM_AccessVMIntFlag;
-+ JVM_VMBreakPoint;
-
- # miscellaneous functions
-- _jio_fprintf
-- _jio_printf
-- _jio_snprintf
-- _jio_vfprintf
-- _jio_vsnprintf
-+ jio_fprintf;
-+ jio_printf;
-+ jio_snprintf;
-+ jio_vfprintf;
-+ jio_vsnprintf;
-
- # This is for Forte Analyzer profiling support.
-- _AsyncGetCallTrace
-+ AsyncGetCallTrace;
-
- # INSERT VTABLE SYMBOLS HERE
-+ local:
-+ *;
-+};
-+
+ # debug JVM
+ JVM_AccessVMBooleanFlag;
--- hotspot/make/bsd/makefiles/mapfile-vers-product
+++ hotspot/make/bsd/makefiles/mapfile-vers-product
-@@ -24,233 +24,239 @@
- # Only used for OSX/Darwin builds
-
- # Define public interface.
-- # _JNI
-- _JNI_CreateJavaVM
-- _JNI_GetCreatedJavaVMs
-- _JNI_GetDefaultJavaVMInitArgs
--
-- # _JVM
-- _JVM_Accept
-- _JVM_ActiveProcessorCount
-- _JVM_AllocateNewArray
-- _JVM_AllocateNewObject
-- _JVM_ArrayCopy
-- _JVM_AssertionStatusDirectives
-- _JVM_Available
-- _JVM_Bind
-- _JVM_ClassDepth
-- _JVM_ClassLoaderDepth
-- _JVM_Clone
-- _JVM_Close
-- _JVM_CX8Field
-- _JVM_CompileClass
-- _JVM_CompileClasses
-- _JVM_CompilerCommand
-- _JVM_Connect
-- _JVM_ConstantPoolGetClassAt
-- _JVM_ConstantPoolGetClassAtIfLoaded
-- _JVM_ConstantPoolGetDoubleAt
-- _JVM_ConstantPoolGetFieldAt
-- _JVM_ConstantPoolGetFieldAtIfLoaded
-- _JVM_ConstantPoolGetFloatAt
-- _JVM_ConstantPoolGetIntAt
-- _JVM_ConstantPoolGetLongAt
-- _JVM_ConstantPoolGetMethodAt
-- _JVM_ConstantPoolGetMethodAtIfLoaded
-- _JVM_ConstantPoolGetMemberRefInfoAt
-- _JVM_ConstantPoolGetSize
-- _JVM_ConstantPoolGetStringAt
-- _JVM_ConstantPoolGetUTF8At
-- _JVM_CountStackFrames
-- _JVM_CurrentClassLoader
-- _JVM_CurrentLoadedClass
-- _JVM_CurrentThread
-- _JVM_CurrentTimeMillis
-- _JVM_DefineClass
-- _JVM_DefineClassWithSource
-- _JVM_DefineClassWithSourceCond
-- _JVM_DesiredAssertionStatus
-- _JVM_DisableCompiler
-- _JVM_DoPrivileged
-- _JVM_DTraceGetVersion
-- _JVM_DTraceActivate
-- _JVM_DTraceIsProbeEnabled
-- _JVM_DTraceIsSupported
-- _JVM_DTraceDispose
-- _JVM_DumpAllStacks
-- _JVM_DumpThreads
-- _JVM_EnableCompiler
-- _JVM_Exit
-- _JVM_FillInStackTrace
-- _JVM_FindClassFromClass
-- _JVM_FindClassFromClassLoader
-- _JVM_FindClassFromBootLoader
-- _JVM_FindLibraryEntry
-- _JVM_FindLoadedClass
-- _JVM_FindPrimitiveClass
-- _JVM_FindSignal
-- _JVM_FreeMemory
-- _JVM_GC
-- _JVM_GetAllThreads
-- _JVM_GetArrayElement
-- _JVM_GetArrayLength
-- _JVM_GetCPClassNameUTF
-- _JVM_GetCPFieldClassNameUTF
-- _JVM_GetCPFieldModifiers
-- _JVM_GetCPFieldNameUTF
-- _JVM_GetCPFieldSignatureUTF
-- _JVM_GetCPMethodClassNameUTF
-- _JVM_GetCPMethodModifiers
-- _JVM_GetCPMethodNameUTF
-- _JVM_GetCPMethodSignatureUTF
-- _JVM_GetCallerClass
-- _JVM_GetClassAccessFlags
-- _JVM_GetClassAnnotations
-- _JVM_GetClassCPEntriesCount
-- _JVM_GetClassCPTypes
-- _JVM_GetClassConstantPool
-- _JVM_GetClassContext
-- _JVM_GetClassDeclaredConstructors
-- _JVM_GetClassDeclaredFields
-- _JVM_GetClassDeclaredMethods
-- _JVM_GetClassFieldsCount
-- _JVM_GetClassInterfaces
-- _JVM_GetClassLoader
-- _JVM_GetClassMethodsCount
-- _JVM_GetClassModifiers
-- _JVM_GetClassName
-- _JVM_GetClassNameUTF
-- _JVM_GetClassSignature
-- _JVM_GetClassSigners
-- _JVM_GetClassTypeAnnotations
-- _JVM_GetComponentType
-- _JVM_GetDeclaredClasses
-- _JVM_GetDeclaringClass
-- _JVM_GetEnclosingMethodInfo
-- _JVM_GetFieldAnnotations
-- _JVM_GetFieldIxModifiers
-- _JVM_GetFieldTypeAnnotations
-- _JVM_GetHostName
-- _JVM_GetInheritedAccessControlContext
-- _JVM_GetInterfaceVersion
-- _JVM_GetLastErrorString
-- _JVM_GetManagement
-- _JVM_GetMethodAnnotations
-- _JVM_GetMethodDefaultAnnotationValue
-- _JVM_GetMethodIxArgsSize
-- _JVM_GetMethodIxByteCode
-- _JVM_GetMethodIxByteCodeLength
-- _JVM_GetMethodIxExceptionIndexes
-- _JVM_GetMethodIxExceptionTableEntry
-- _JVM_GetMethodIxExceptionTableLength
-- _JVM_GetMethodIxExceptionsCount
-- _JVM_GetMethodIxLocalsCount
-- _JVM_GetMethodIxMaxStack
-- _JVM_GetMethodIxModifiers
-- _JVM_GetMethodIxNameUTF
-- _JVM_GetMethodIxSignatureUTF
-- _JVM_GetMethodParameterAnnotations
-- _JVM_GetMethodParameters
-- _JVM_GetMethodTypeAnnotations
-- _JVM_GetPrimitiveArrayElement
-- _JVM_GetProtectionDomain
-- _JVM_GetSockName
-- _JVM_GetSockOpt
-- _JVM_GetStackAccessControlContext
-- _JVM_GetStackTraceDepth
-- _JVM_GetStackTraceElement
-- _JVM_GetSystemPackage
-- _JVM_GetSystemPackages
-- _JVM_GetThreadStateNames
-- _JVM_GetThreadStateValues
-- _JVM_GetVersionInfo
-- _JVM_Halt
-- _JVM_HoldsLock
-- _JVM_IHashCode
-- _JVM_InitAgentProperties
-- _JVM_InitProperties
-- _JVM_InitializeCompiler
-- _JVM_InitializeSocketLibrary
-- _JVM_InternString
-- _JVM_Interrupt
-- _JVM_InvokeMethod
-- _JVM_IsArrayClass
-- _JVM_IsConstructorIx
-- _JVM_IsInterface
-- _JVM_IsInterrupted
-- _JVM_IsNaN
-- _JVM_IsPrimitiveClass
-- _JVM_IsSameClassPackage
-- _JVM_IsSilentCompiler
-- _JVM_IsSupportedJNIVersion
-- _JVM_IsThreadAlive
-- _JVM_IsVMGeneratedMethodIx
-- _JVM_LatestUserDefinedLoader
-- _JVM_Listen
-- _JVM_LoadClass0
-- _JVM_LoadLibrary
-- _JVM_Lseek
-- _JVM_MaxObjectInspectionAge
-- _JVM_MaxMemory
-- _JVM_MonitorNotify
-- _JVM_MonitorNotifyAll
-- _JVM_MonitorWait
-- _JVM_NanoTime
-- _JVM_NativePath
-- _JVM_NewArray
-- _JVM_NewInstanceFromConstructor
-- _JVM_NewMultiArray
-- _JVM_OnExit
-- _JVM_Open
-- _JVM_RaiseSignal
-- _JVM_RawMonitorCreate
-- _JVM_RawMonitorDestroy
-- _JVM_RawMonitorEnter
-- _JVM_RawMonitorExit
-- _JVM_Read
-- _JVM_Recv
-- _JVM_RecvFrom
-- _JVM_RegisterSignal
-- _JVM_ReleaseUTF
-- _JVM_ResolveClass
-- _JVM_ResumeThread
-- _JVM_Send
-- _JVM_SendTo
-- _JVM_SetArrayElement
-- _JVM_SetClassSigners
-- _JVM_SetLength
-- _JVM_SetNativeThreadName
-- _JVM_SetPrimitiveArrayElement
-- _JVM_SetSockOpt
-- _JVM_SetThreadPriority
-- _JVM_Sleep
-- _JVM_Socket
-- _JVM_SocketAvailable
-- _JVM_SocketClose
-- _JVM_SocketShutdown
-- _JVM_StartThread
-- _JVM_StopThread
-- _JVM_SuspendThread
-- _JVM_SupportsCX8
-- _JVM_Sync
-- _JVM_Timeout
-- _JVM_TotalMemory
-- _JVM_TraceInstructions
-- _JVM_TraceMethodCalls
-- _JVM_UnloadLibrary
-- _JVM_Write
-- _JVM_Yield
-- _JVM_handle_bsd_signal
-+SUNWprivate_1.1 {
-+ global:
-+ # JNI
-+ JNI_CreateJavaVM;
-+ JNI_GetCreatedJavaVMs;
-+ JNI_GetDefaultJavaVMInitArgs;
-+
-+ # JVM
-+ JVM_Accept;
-+ JVM_ActiveProcessorCount;
-+ JVM_AllocateNewArray;
-+ JVM_AllocateNewObject;
-+ JVM_ArrayCopy;
-+ JVM_AssertionStatusDirectives;
-+ JVM_Available;
-+ JVM_Bind;
-+ JVM_ClassDepth;
-+ JVM_ClassLoaderDepth;
-+ JVM_Clone;
-+ JVM_Close;
-+ JVM_CX8Field;
-+ JVM_CompileClass;
-+ JVM_CompileClasses;
-+ JVM_CompilerCommand;
-+ JVM_Connect;
-+ JVM_ConstantPoolGetClassAt;
-+ JVM_ConstantPoolGetClassAtIfLoaded;
-+ JVM_ConstantPoolGetDoubleAt;
-+ JVM_ConstantPoolGetFieldAt;
-+ JVM_ConstantPoolGetFieldAtIfLoaded;
-+ JVM_ConstantPoolGetFloatAt;
-+ JVM_ConstantPoolGetIntAt;
-+ JVM_ConstantPoolGetLongAt;
-+ JVM_ConstantPoolGetMethodAt;
-+ JVM_ConstantPoolGetMethodAtIfLoaded;
-+ JVM_ConstantPoolGetMemberRefInfoAt;
-+ JVM_ConstantPoolGetSize;
-+ JVM_ConstantPoolGetStringAt;
-+ JVM_ConstantPoolGetUTF8At;
-+ JVM_CountStackFrames;
-+ JVM_CurrentClassLoader;
-+ JVM_CurrentLoadedClass;
-+ JVM_CurrentThread;
-+ JVM_CurrentTimeMillis;
-+ JVM_DefineClass;
-+ JVM_DefineClassWithSource;
-+ JVM_DefineClassWithSourceCond;
-+ JVM_DesiredAssertionStatus;
-+ JVM_DisableCompiler;
-+ JVM_DoPrivileged;
-+ JVM_DTraceGetVersion;
-+ JVM_DTraceActivate;
-+ JVM_DTraceIsProbeEnabled;
-+ JVM_DTraceIsSupported;
-+ JVM_DTraceDispose;
-+ JVM_DumpAllStacks;
-+ JVM_DumpThreads;
-+ JVM_EnableCompiler;
-+ JVM_Exit;
-+ JVM_FillInStackTrace;
-+ JVM_FindClassFromClass;
-+ JVM_FindClassFromClassLoader;
-+ JVM_FindClassFromBootLoader;
-+ JVM_FindLibraryEntry;
-+ JVM_FindLoadedClass;
-+ JVM_FindPrimitiveClass;
-+ JVM_FindSignal;
-+ JVM_FreeMemory;
-+ JVM_GC;
-+ JVM_GetAllThreads;
-+ JVM_GetArrayElement;
-+ JVM_GetArrayLength;
-+ JVM_GetCPClassNameUTF;
-+ JVM_GetCPFieldClassNameUTF;
-+ JVM_GetCPFieldModifiers;
-+ JVM_GetCPFieldNameUTF;
-+ JVM_GetCPFieldSignatureUTF;
-+ JVM_GetCPMethodClassNameUTF;
-+ JVM_GetCPMethodModifiers;
-+ JVM_GetCPMethodNameUTF;
-+ JVM_GetCPMethodSignatureUTF;
-+ JVM_GetCallerClass;
-+ JVM_GetClassAccessFlags;
-+ JVM_GetClassAnnotations;
-+ JVM_GetClassCPEntriesCount;
-+ JVM_GetClassCPTypes;
-+ JVM_GetClassConstantPool;
-+ JVM_GetClassContext;
-+ JVM_GetClassDeclaredConstructors;
-+ JVM_GetClassDeclaredFields;
-+ JVM_GetClassDeclaredMethods;
-+ JVM_GetClassFieldsCount;
-+ JVM_GetClassInterfaces;
-+ JVM_GetClassLoader;
-+ JVM_GetClassMethodsCount;
-+ JVM_GetClassModifiers;
-+ JVM_GetClassName;
-+ JVM_GetClassNameUTF;
-+ JVM_GetClassSignature;
-+ JVM_GetClassSigners;
-+ JVM_GetClassTypeAnnotations;
-+ JVM_GetComponentType;
-+ JVM_GetDeclaredClasses;
-+ JVM_GetDeclaringClass;
-+ JVM_GetEnclosingMethodInfo;
-+ JVM_GetFieldAnnotations;
-+ JVM_GetFieldIxModifiers;
-+ JVM_GetFieldTypeAnnotations;
-+ JVM_GetHostName;
-+ JVM_GetInheritedAccessControlContext;
-+ JVM_GetInterfaceVersion;
-+ JVM_GetLastErrorString;
-+ JVM_GetManagement;
-+ JVM_GetMethodAnnotations;
-+ JVM_GetMethodDefaultAnnotationValue;
-+ JVM_GetMethodIxArgsSize;
-+ JVM_GetMethodIxByteCode;
-+ JVM_GetMethodIxByteCodeLength;
-+ JVM_GetMethodIxExceptionIndexes;
-+ JVM_GetMethodIxExceptionTableEntry;
-+ JVM_GetMethodIxExceptionTableLength;
-+ JVM_GetMethodIxExceptionsCount;
-+ JVM_GetMethodIxLocalsCount;
-+ JVM_GetMethodIxMaxStack;
-+ JVM_GetMethodIxModifiers;
-+ JVM_GetMethodIxNameUTF;
-+ JVM_GetMethodIxSignatureUTF;
-+ JVM_GetMethodParameterAnnotations;
-+ JVM_GetMethodParameters;
-+ JVM_GetMethodTypeAnnotations;
-+ JVM_GetPrimitiveArrayElement;
-+ JVM_GetProtectionDomain;
-+ JVM_GetSockName;
-+ JVM_GetSockOpt;
-+ JVM_GetStackAccessControlContext;
-+ JVM_GetStackTraceDepth;
-+ JVM_GetStackTraceElement;
-+ JVM_GetSystemPackage;
-+ JVM_GetSystemPackages;
-+ JVM_GetThreadStateNames;
-+ JVM_GetThreadStateValues;
-+ JVM_GetVersionInfo;
-+ JVM_Halt;
-+ JVM_HoldsLock;
-+ JVM_IHashCode;
-+ JVM_InitAgentProperties;
-+ JVM_InitProperties;
-+ JVM_InitializeCompiler;
-+ JVM_InitializeSocketLibrary;
-+ JVM_InternString;
-+ JVM_Interrupt;
-+ JVM_InvokeMethod;
-+ JVM_IsArrayClass;
-+ JVM_IsConstructorIx;
-+ JVM_IsInterface;
-+ JVM_IsInterrupted;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list