svn commit: r329926 - in head/java: openjdk6 openjdk6-jre openjdk6/files openjdk6/files/icedtea openjdk6/files/icedtea/openjdk openjdk6/files/icedtea/security
Jung-uk Kim
jkim at FreeBSD.org
Wed Oct 9 20:36:07 UTC 2013
Author: jkim
Date: Wed Oct 9 20:36:06 2013
New Revision: 329926
URL: http://svnweb.freebsd.org/changeset/ports/329926
Log:
Update to Build b28.
Deleted:
head/java/openjdk6/files/icedtea/jaxp.patch
head/java/openjdk6/files/icedtea/jaxws.patch
head/java/openjdk6/files/icedtea/openjdk/
head/java/openjdk6/files/icedtea/security/
head/java/openjdk6/files/libiconv.patch
head/java/openjdk6/files/patch-sharedRuntime_x86_64.cpp
Modified:
head/java/openjdk6-jre/Makefile
head/java/openjdk6/Makefile
head/java/openjdk6/Makefile.icedtea
head/java/openjdk6/distinfo
head/java/openjdk6/files/patch-set
Modified: head/java/openjdk6-jre/Makefile
==============================================================================
--- head/java/openjdk6-jre/Makefile Wed Oct 9 20:26:14 2013 (r329925)
+++ head/java/openjdk6-jre/Makefile Wed Oct 9 20:36:06 2013 (r329926)
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 10
+PORTREVISION= 0
CATEGORIES= java devel
PKGNAMESUFFIX= -jre
Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile Wed Oct 9 20:26:14 2013 (r329925)
+++ head/java/openjdk6/Makefile Wed Oct 9 20:36:06 2013 (r329926)
@@ -2,23 +2,16 @@
# $FreeBSD$
PORTNAME= openjdk6
-PORTVERSION= b27
-PORTREVISION?= 8
+PORTVERSION= b28
+PORTREVISION?= 0
CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
- http://download.java.net/jaxp/openjdk/jdk6/:jaxp \
- http://icedtea.classpath.org/download/drops/:jaxp \
- https://java.net/downloads/jax-ws/OpenJDK6/:jaf \
- http://icedtea.classpath.org/download/drops/:jaf \
- http://download.java.net/glassfish/components/jax-ws/openjdk/jdk6/:jaxws \
- http://icedtea.classpath.org/download/drops/:jaxws \
http://download.java.net/openjdk/jtreg/promoted/4.1/b05/:jtreg \
- http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/
+ https://java.net/projects/openjdk6/downloads/download/ \
+ LOCAL
+MASTER_SITE_SUBDIR= jkim
DISTNAME= openjdk-6-src-${PORTVERSION}-${OPENJDK_BUILDDATE}
DISTFILES= ${ANTFILE}:ant \
- ${JAXPFILE}:jaxp \
- ${JAFFILE}:jaf \
- ${JAXWSFILE}:jaxws \
${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} ${ANTFILE}
@@ -27,7 +20,7 @@ COMMENT?= Oracle's Java 6 virtual machin
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LICENSE_DISTFILES=${JAXPFILE} ${JAFFILE} ${JAXWSFILE} ${DISTNAME}${EXTRACT_SUFX}
+LICENSE_DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
@@ -36,7 +29,7 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
-OPENJDK_BUILDDATE= 26_oct_2012
+OPENJDK_BUILDDATE= 04_oct_2013
OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE
OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE
@@ -72,12 +65,6 @@ USE_XORG= x11 xext xi xt xtst
ANTVERSION= 1.8.4
ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2
-JAXP_BUILD= 144_05
-JAXPFILE= jaxp${JAXP_BUILD}.zip
-JAF_BUILD= b20
-JAFFILE= jdk6-jaf-${JAF_BUILD}.zip
-JAXWS_BUILD= 2_1_6-2011_06_13
-JAXWSFILE= jdk6-jaxws${JAXWS_BUILD}.zip
JTREG_BUILD= b05_29_nov_2012
JTREGFILE= jtreg-4.1-bin-${JTREG_BUILD}.zip
UPDATE_VERSION= 32
@@ -124,7 +111,6 @@ MAKE_ENV= LANG=C LC_ALL=C OS= \
ALT_FREETYPE_LIB_PATH=${LOCALBASE}/lib \
ALT_X11_PATH=${LOCALBASE} \
ALT_PACKAGE_PATH=${LOCALBASE} \
- ALT_DROPS_DIR=${DISTDIR} \
ANT_HOME=${WRKDIR}/apache-ant-${ANTVERSION} \
JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \
BUILD_NUMBER=${PORTVERSION} \
@@ -132,11 +118,8 @@ MAKE_ENV= LANG=C LC_ALL=C OS= \
MILESTONE=fcs \
JDK_UPDATE_VERSION=${UPDATE_VERSION}
-# HotSpot wants CCC instead of CXX. Also, HotSpot SA wants GCC.
-MAKE_ENV+= CCC="${CXX}" GCC="${CC}"
-
# XXX Turn off -Werror from HotSpot.
-MAKE_ENV+= WARNINGS_ARE_ERRORS="${WARNINGS_ARE_ERRORS}"
+MAKE_ENV+= COMPILER_WARNINGS_FATAL=false
# XXX Turn off parallel build by default.
_MAKE_JOBS= #
@@ -174,29 +157,26 @@ EXTRA_PATCHES+= ${FILESDIR}/alsa-disable
DISTFILES+= ${JTREGFILE}:jtreg
EXTRACT_ONLY+= ${JTREGFILE}
BUILD_DEPENDS+= ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
-USES+= display
+USES+= display:test
.else
EXTRA_PATCHES+= ${FILESDIR}/test_gamma-disable.patch
.endif
+.if !empty(ICONV_LIB)
+ICONV_INCLUDE= -I${LOCALBASE}/include
+ICONV_LIBS= -L${LOCALBASE}/lib ${ICONV_LIB}
+.else
+ICONV_INCLUDE=
+ICONV_LIBS=
+.endif
+
COPYDIRS= \
- hotspot/src/os/linux/vm \
- hotspot/src/os_cpu/linux_x86/vm \
- hotspot/agent/src/os/linux \
- hotspot/make/linux \
- hotspot/make/linux/makefiles \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64 \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86 \
jdk/src/linux/doc/man
COPYFILES= \
corba/make/common/Defs-linux.gmk \
corba/make/common/shared/Defs-linux.gmk \
- hotspot/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java \
+ hotspot/src/os/linux/vm/decoder_linux.cpp \
jdk/make/com/sun/tools/attach/mapfile-linux \
jdk/make/common/Defs-linux.gmk \
jdk/make/common/shared/Defs-linux.gmk \
@@ -239,6 +219,12 @@ post-extract:
post-patch:
@${REINPLACE_CMD} \
+ -e "s|%%ICONV_INC%%|${ICONV_INCLUDE}|" \
+ -e "s|%%ICONV_LIB%%|${ICONV_LIBS}|" \
+ ${WRKSRC}/Makefile ${WRKSRC}/jdk/make/java/instrument/Makefile \
+ ${WRKSRC}/jdk/make/java/npt/Makefile \
+ ${WRKSRC}/jdk/make/sun/splashscreen/Makefile
+ @${REINPLACE_CMD} \
-e "s|/lib:/usr/lib|/lib:/usr/lib:${LOCALBASE}/lib|" \
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp
.if ${PORT_OPTIONS:MPOLICY}
@@ -246,8 +232,17 @@ post-patch:
-e 's|policy install-limited|policy install-unlimited|' \
${WRKSRC}/jdk/make/javax/crypto/Makefile
.endif
-.if empty(ICONV_LIB)
- @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/libiconv.patch
+ @${REINPLACE_CMD} \
+ -e "s|%%LOCALBASE%%|${LOCALBASE}|" \
+ ${WRKSRC}/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
+.if defined(BUILD_JRE)
+ @${REINPLACE_CMD} \
+ -e "s|%%OPENJDK_HOME%%|${PREFIX}/openjdk6-jre|" \
+ ${WRKSRC}/jdk/src/solaris/bin/java_md.c
+.else
+ @${REINPLACE_CMD} \
+ -e "s|%%OPENJDK_HOME%%|${PREFIX}/openjdk6|" \
+ ${WRKSRC}/jdk/src/solaris/bin/java_md.c
.endif
post-build:
@@ -271,21 +266,20 @@ post-build:
.endif
@${ECHO_MSG} ""
-test: build-depends build
-.if !defined(DISPLAY)
- @${LOCALBASE}/bin/Xvfb :1001 -screen 0 800x600x24 \
- -fp ${LOCALBASE}/lib/X11/fonts/misc > /dev/null 2>&1 & \
- ${ECHO_CMD} $$! > ${WRKDIR}/.Xvfb.pid
-.endif
- @-(cd ${WRKSRC}/jdk/test; ${SETENV} ${MAKE_ENV} \
- PLATFORM=bsd ARCH=${ARCH:S/i386/i586/} ${GMAKE} tests)
-.if !defined(DISPLAY)
- @-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
- @${RM} -f ${WRKDIR}/.Xvfb.pid
+.if defined(DISPLAY)
+_TEST_SEQ= do-test
+.else
+_TEST_SEQ= pre-test do-test post-test
+.ORDER: ${_TEST_SEQ}
.endif
+test: ${_TEST_SEQ}
@${ECHO_MSG} ""
@${ECHO_MSG} "You can run \"make test\" again to re-execute only the failed tests."
@${ECHO_MSG} ""
+
+do-test: build-depends build
+ @-(cd ${WRKSRC}/jdk/test; ${SETENV} PLATFORM=bsd ARCH=${ARCH} \
+ ${MAKE_ENV} ${GMAKE} tests)
.endif
do-install:
@@ -368,4 +362,4 @@ do-install:
@${ECHO_CMD} "exit 0" >> ${PKGDEINSTALL}
@${ECHO_CMD} "exit 0" >> ${PKGINSTALL}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/java/openjdk6/Makefile.icedtea
==============================================================================
--- head/java/openjdk6/Makefile.icedtea Wed Oct 9 20:26:14 2013 (r329925)
+++ head/java/openjdk6/Makefile.icedtea Wed Oct 9 20:36:06 2013 (r329926)
@@ -1,170 +1,10 @@
# $FreeBSD$
-_PATCHES= \
- jaxp.patch \
- jaxws.patch \
- security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
- security/20130201/7201068.patch \
- security/20130201/6563318.patch \
- security/20130201/6664509.patch \
- security/20130201/6776941.patch \
- security/20130201/7141694.patch \
- security/20130201/7173145.patch \
- security/20130201/7186945.patch \
- security/20130201/7186948.patch \
- security/20130201/7186952.patch \
- security/20130201/7186954.patch \
- security/20130201/7192392.patch \
- security/20130201/7192393.patch \
- security/20130201/7192977.patch \
- security/20130201/7197546.patch \
- security/20130201/7200491.patch \
- security/20130201/7200500.patch \
- security/20130201/7201064.patch \
- security/20130201/7201066.patch \
- security/20130201/7201070.patch \
- security/20130201/7201071.patch \
- security/20130201/8000210.patch \
- security/20130201/8000537.patch \
- security/20130201/8000540.patch \
- security/20130201/8000631.patch \
- security/20130201/8001242.patch \
- security/20130201/8001307.patch \
- security/20130201/8001972.patch \
- security/20130201/8002325.patch \
- security/20130219/8006446.patch \
- security/20130219/8006777.patch \
- security/20130219/8007688.patch \
- security/20130304/8007014.patch \
- security/20130304/8007675.patch \
- openjdk/7036559-concurrenthashmap_improvements.patch \
- security/20130416/8009063.patch \
- openjdk/8004302-soap_test_failure.patch \
- security/20130416/6657673.patch \
- security/20130416/6657673-fixup.patch \
- openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \
- security/20130416/6657673-factory_finder.patch \
- openjdk/6669869-queries_per_appcontext.patch \
- openjdk/5102804-memory_leak.patch \
- openjdk/6963811-deadlock_fix.patch \
- openjdk/7064279-resource_release.patch \
- openjdk/7064279-fixup.patch \
- security/20130416/7200507.patch \
- security/20130416/8000724.patch \
- security/20130416/8004986.patch \
- openjdk/6501644-icu_sync.patch \
- openjdk/6886358-layout_update.patch \
- security/20130416/8001031.patch \
- openjdk/7017324-kerning_crash.patch \
- security/20130416/8001040.patch \
- security/20130416/8001322.patch \
- security/20130416/8001329.patch \
- security/20130416/8003335.patch \
- security/20130416/8003445.patch \
- security/20130416/8003543.patch \
- security/20130416/8004261.patch \
- security/20130416/8004336.patch \
- security/20130416/8005432.patch \
- security/20130416/8005943.patch \
- security/20130416/8006309.patch \
- security/20130416/8006435.patch \
- security/20130416/8006790.patch \
- security/20130416/8006795.patch \
- security/20130416/8007406.patch \
- security/20130416/8007617.patch \
- security/20130416/8007667.patch \
- security/20130416/8007918.patch \
- security/20130416/8009305.patch \
- security/20130416/8009699.patch \
- security/20130416/8009814.patch \
- security/20130416/8009857.patch \
- openjdk/7195301-no_instanceof_node.patch \
- openjdk/6469266-xmlsec_1.4.2.patch \
- security/20130618/6741606-apache_santuario.patch \
- security/20130618/7170730-windows_network_stack.patch \
- security/20130618/8000638-improve_deserialization.patch \
- security/20130618/8001032-restrict_object_access-corba.patch \
- security/20130618/8001033-refactor_address_handling.patch \
- security/20130618/8001034-memory_management.patch \
- security/20130618/8001038-resourcefully_handle_resources.patch \
- security/20130618/8001043-clarify_definition_restrictions.patch \
- security/20130618/8001309-better_handling_of_annotation_interfaces.patch \
- security/20130618/8001318-socket_getlocaladdress_consistency.patch \
- security/20130618/8001318-6_fixup.patch \
- security/20130618/8001330-improve_checking_order.patch \
- security/20130618/8003703-update_rmi_connection_dialog.patch \
- openjdk/8005615-failure_to_load_logger_implementation.patch \
- openjdk/8007393.patch \
- openjdk/8007611.patch \
- security/20130618/8004584-augment_applet_contextualization.patch \
- security/20130618/8005007-better_glyph_processing.patch \
- security/20130618/8006328-sound_class_robustness.patch \
- security/20130618/8006328-6_fixup.patch \
- security/20130618/8006611-improve_scripting.patch \
- security/20130618/8007467-improve_jmx_internal_api_robustness.patch \
- security/20130618/8007471-improve_mbean_notifications.patch \
- security/20130618/8007471-6_fixup.patch \
- security/20130618/8007812-getenclosingmethod.patch \
- security/20130618/8008120-improve_jmx_class_checking.patch \
- security/20130618/8008124-better_compliance_testing.patch \
- security/20130618/8008128-better_jmx_api_coherence.patch \
- security/20130618/8008132-better_serialization.patch \
- security/20130618/8008585-jmx_data_handling.patch \
- security/20130618/8008593-better_urlclassloader.patch \
- security/20130618/8008603-jmx_provider_provision.patch \
- security/20130618/8008611-jmx_annotations.patch \
- security/20130618/8008611-6_fixup.patch \
- security/20130618/8008615-jmx_internal_api_robustness.patch \
- security/20130618/8008623-mbeanserver_handling.patch \
- security/20130618/8008744-6741606_rework.patch \
- security/20130618/8008982-jmx_interface_changes.patch \
- security/20130618/8009004-rmi_connection_improvement.patch \
- security/20130618/8009013-t2k_glyphs.patch \
- security/20130618/8009034-jmx_notification_improvement.patch \
- security/20130618/8009038-jmx_notification_support_improvement.patch \
- security/20130618/8009067-improve_key_storing.patch \
- security/20130618/8009235-improve_tsa_data_handling.patch \
- openjdk/6888167-medialib_memory_leaks.patch \
- security/20130618/8011243-improve_imaginglib.patch \
- security/20130618/8011248-better_component_rasters.patch \
- security/20130618/8011253-better_short_component_rasters.patch \
- security/20130618/8011257-better_byte_component_rasters.patch \
- security/20130618/8011557-improve_reflection.patch \
- security/20130618/8012421-better_positioning.patch \
- security/20130618/8012438-better_image_validation.patch \
- security/20130618/8012597-better_image_channel_validation.patch \
- security/20130618/8012601-better_layout_validation.patch \
- security/20130618/8014281-better_xml_signature_checking.patch \
- security/20130618/diamond_fix.patch \
- security/20130618/handle_npe.patch \
- security/20130618/javac_issue.patch \
- security/20130618/7158805-nested_subroutine_rewriting.patch \
- security/20130618/8001330-checking_order_improvement.patch \
- security/20130618/8000642-better_transportation_handling.patch \
- openjdk/6786028-wcag_bold_tags.patch \
- openjdk/6786682-wcag_lang.patch \
- openjdk/6802694-no_deprecated.patch \
- openjdk/6786690-wcag_dl.patch \
- openjdk/6786688-wcag_table.patch \
- openjdk/6961178-doclet_xml.patch \
- openjdk/6851834-restructure.patch \
- openjdk/6851834-handle_renames.patch \
- openjdk/7006270-regressions.patch \
- security/20130618/8012375-javadoc_framing.patch \
- security/20130618/8015997-more_javadoc_framing.patch \
- security/20130618/langtools_merge-01.patch \
- security/20130618/langtools_merge-02.patch \
- security/20130618/langtools_generics.patch \
- security/20130618/langtools_merge-03.patch \
- security/20130618/8009071-improve_shape_handling.patch
+_PATCHES=
.if ${PORT_OPTIONS:MICEDTEA}
_PATCHES+= \
applet_hole.patch \
- openjdk/7032388-work_without_cmov_instruction.patch \
- openjdk/8004341-jck_dialog_failure.patch \
- openjdk/8004341-jck_dialog_failure-02.patch \
- openjdk/7197906-handle_32_bit_shifts.patch \
jpegclasses.patch
.endif
Modified: head/java/openjdk6/distinfo
==============================================================================
--- head/java/openjdk6/distinfo Wed Oct 9 20:26:14 2013 (r329925)
+++ head/java/openjdk6/distinfo Wed Oct 9 20:36:06 2013 (r329926)
@@ -1,12 +1,6 @@
SHA256 (apache-ant-1.8.4-bin.tar.bz2) = aeaed7d5c2b1e73ffc195d713931047ecc113b8c9844df5cbac2797007455069
SIZE (apache-ant-1.8.4-bin.tar.bz2) = 4257152
-SHA256 (jaxp144_05.zip) = c1a8a5a219fa55ecbf2ad43b66514335a3e96ccad40bd2ec9165a821343b2bff
-SIZE (jaxp144_05.zip) = 5976387
-SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
-SIZE (jdk6-jaf-b20.zip) = 71243
-SHA256 (jdk6-jaxws2_1_6-2011_06_13.zip) = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3
-SIZE (jdk6-jaxws2_1_6-2011_06_13.zip) = 5512710
-SHA256 (openjdk-6-src-b27-26_oct_2012.tar.gz) = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
-SIZE (openjdk-6-src-b27-26_oct_2012.tar.gz) = 45789350
+SHA256 (openjdk-6-src-b28-04_oct_2013.tar.gz) = ac4fceed060ad61dab938c41181455fb0910f58f6944f820f0637b0f0c64bf75
+SIZE (openjdk-6-src-b28-04_oct_2013.tar.gz) = 53599044
SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d
SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382
Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set Wed Oct 9 20:26:14 2013 (r329925)
+++ head/java/openjdk6/files/patch-set Wed Oct 9 20:36:06 2013 (r329926)
@@ -10,8 +10,8 @@
+ OTHER_LDLIBS += -liconv
+ else
+ ifneq ($(OS_NAME), netbsd)
-+ CPPFLAGS += -I$(PACKAGE_PATH)/include
-+ OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv
++ CPPFLAGS += %%ICONV_INC%%
++ OTHER_LDLIBS += %%ICONV_LIB%%
+ endif
+ endif
+endif
@@ -430,383 +430,20 @@
fi)
MIN_VM_MEMORY := $(shell \
if [ $(MAX_VM_MEMORY) -le 128 ] ; then \
---- hotspot/agent/make/Makefile
-+++ hotspot/agent/make/Makefile
-@@ -52,6 +52,9 @@
- sun.jvm.hotspot.compiler \
- sun.jvm.hotspot.debugger \
- sun.jvm.hotspot.debugger.amd64 \
-+sun.jvm.hotspot.debugger.bsd \
-+sun.jvm.hotspot.debugger.bsd.amd64 \
-+sun.jvm.hotspot.debugger.bsd.x86 \
- sun.jvm.hotspot.debugger.cdbg \
- sun.jvm.hotspot.debugger.cdbg.basic \
- sun.jvm.hotspot.debugger.cdbg.basic.amd64 \
-@@ -94,6 +97,9 @@
- sun.jvm.hotspot.oops \
- sun.jvm.hotspot.runtime \
- sun.jvm.hotspot.runtime.amd64 \
-+sun.jvm.hotspot.runtime.bsd \
-+sun.jvm.hotspot.runtime.bsd_amd64 \
-+sun.jvm.hotspot.runtime.bsd_x86 \
- sun.jvm.hotspot.runtime.ia64 \
- sun.jvm.hotspot.runtime.linux \
- sun.jvm.hotspot.runtime.linux_amd64 \
-@@ -143,6 +149,9 @@
- sun/jvm/hotspot/compiler/*.java \
- sun/jvm/hotspot/debugger/*.java \
- sun/jvm/hotspot/debugger/amd64/*.java \
-+sun/jvm/hotspot/debugger/bsd/*.java \
-+sun/jvm/hotspot/debugger/bsd/amd64/*.java \
-+sun/jvm/hotspot/debugger/bsd/x86/*.java \
- sun/jvm/hotspot/debugger/cdbg/*.java \
- sun/jvm/hotspot/debugger/cdbg/basic/*.java \
- sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
-@@ -178,6 +187,9 @@
- sun/jvm/hotspot/oops/*.java \
- sun/jvm/hotspot/runtime/*.java \
- sun/jvm/hotspot/runtime/amd64/*.java \
-+sun/jvm/hotspot/runtime/bsd/*.java \
-+sun/jvm/hotspot/runtime/bsd_amd64/*.java \
-+sun/jvm/hotspot/runtime/bsd_x86/*.java \
- sun/jvm/hotspot/runtime/ia64/*.java \
- sun/jvm/hotspot/runtime/linux/*.java \
- sun/jvm/hotspot/runtime/linux_amd64/*.java \
---- hotspot/agent/src/os/bsd/BsdDebuggerLocal.c
-+++ hotspot/agent/src/os/bsd/BsdDebuggerLocal.c
-@@ -22,6 +22,7 @@
- *
- */
-
-+#include <stdlib.h>
- #include <jni.h>
- #include "libproc.h"
-
-@@ -73,7 +74,7 @@
- (JNIEnv *env, jclass cls) {
- jclass listClass;
-
-- if (init_libproc(getenv("LIBSAPROC_DEBUG")) != true) {
-+ if (init_libproc(getenv("LIBSAPROC_DEBUG") != NULL) != true) {
- THROW_NEW_DEBUGGER_EXCEPTION("can't initialize libproc");
- }
-
-@@ -275,7 +276,7 @@
- bufPtr = (*env)->GetByteArrayElements(env, array, &isCopy);
- CHECK_EXCEPTION_(0);
-
-- err = ps_pdread(get_proc_handle(env, this_obj), (psaddr_t) (uintptr_t)addr, bufPtr, numBytes);
-+ err = ps_pread(get_proc_handle(env, this_obj), (psaddr_t) (uintptr_t)addr, bufPtr, numBytes);
- (*env)->ReleaseByteArrayElements(env, array, bufPtr, 0);
- return (err == PS_OK)? array : 0;
- }
-@@ -283,11 +284,10 @@
- JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0
- (JNIEnv *env, jobject this_obj, jint lwp_id) {
-
-- struct user_regs_struct gregs;
-+ struct reg gregs;
- jboolean isCopy;
- jlongArray array;
- jlong *regs;
-- int i;
-
- struct ps_prochandle* ph = get_proc_handle(env, this_obj);
- if (get_lwp_regs(ph, lwp_id, &gregs) != true) {
-@@ -317,26 +317,27 @@
- #ifdef i386
- #define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg
-
-- regs[REG_INDEX(GS)] = (uintptr_t) gregs.xgs;
-- regs[REG_INDEX(FS)] = (uintptr_t) gregs.xfs;
-- regs[REG_INDEX(ES)] = (uintptr_t) gregs.xes;
-- regs[REG_INDEX(DS)] = (uintptr_t) gregs.xds;
-- regs[REG_INDEX(EDI)] = (uintptr_t) gregs.edi;
-- regs[REG_INDEX(ESI)] = (uintptr_t) gregs.esi;
-- regs[REG_INDEX(FP)] = (uintptr_t) gregs.ebp;
-- regs[REG_INDEX(SP)] = (uintptr_t) gregs.esp;
-- regs[REG_INDEX(EBX)] = (uintptr_t) gregs.ebx;
-- regs[REG_INDEX(EDX)] = (uintptr_t) gregs.edx;
-- regs[REG_INDEX(ECX)] = (uintptr_t) gregs.ecx;
-- regs[REG_INDEX(EAX)] = (uintptr_t) gregs.eax;
-- regs[REG_INDEX(PC)] = (uintptr_t) gregs.eip;
-- regs[REG_INDEX(CS)] = (uintptr_t) gregs.xcs;
-- regs[REG_INDEX(SS)] = (uintptr_t) gregs.xss;
-+ regs[REG_INDEX(GS)] = (uintptr_t) gregs.r_gs;
-+ regs[REG_INDEX(FS)] = (uintptr_t) gregs.r_fs;
-+ regs[REG_INDEX(ES)] = (uintptr_t) gregs.r_es;
-+ regs[REG_INDEX(DS)] = (uintptr_t) gregs.r_ds;
-+ regs[REG_INDEX(EDI)] = (uintptr_t) gregs.r_edi;
-+ regs[REG_INDEX(ESI)] = (uintptr_t) gregs.r_esi;
-+ regs[REG_INDEX(FP)] = (uintptr_t) gregs.r_ebp;
-+ regs[REG_INDEX(SP)] = (uintptr_t) gregs.r_isp;
-+ regs[REG_INDEX(EBX)] = (uintptr_t) gregs.r_ebx;
-+ regs[REG_INDEX(EDX)] = (uintptr_t) gregs.r_edx;
-+ regs[REG_INDEX(ECX)] = (uintptr_t) gregs.r_ecx;
-+ regs[REG_INDEX(EAX)] = (uintptr_t) gregs.r_eax;
-+ regs[REG_INDEX(PC)] = (uintptr_t) gregs.r_eip;
-+ regs[REG_INDEX(CS)] = (uintptr_t) gregs.r_cs;
-+ regs[REG_INDEX(SS)] = (uintptr_t) gregs.r_ss;
-
- #endif /* i386 */
-
- #if ia64
- regs = (*env)->GetLongArrayElements(env, array, &isCopy);
-+ int i;
- for (i = 0; i < NPRGREG; i++ ) {
- regs[i] = 0xDEADDEAD;
- }
-@@ -345,31 +346,31 @@
- #ifdef amd64
- #define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg
-
-- regs[REG_INDEX(R15)] = gregs.r15;
-- regs[REG_INDEX(R14)] = gregs.r14;
-- regs[REG_INDEX(R13)] = gregs.r13;
-- regs[REG_INDEX(R12)] = gregs.r12;
-- regs[REG_INDEX(RBP)] = gregs.rbp;
-- regs[REG_INDEX(RBX)] = gregs.rbx;
-- regs[REG_INDEX(R11)] = gregs.r11;
-- regs[REG_INDEX(R10)] = gregs.r10;
-- regs[REG_INDEX(R9)] = gregs.r9;
-- regs[REG_INDEX(R8)] = gregs.r8;
-- regs[REG_INDEX(RAX)] = gregs.rax;
-- regs[REG_INDEX(RCX)] = gregs.rcx;
-- regs[REG_INDEX(RDX)] = gregs.rdx;
-- regs[REG_INDEX(RSI)] = gregs.rsi;
-- regs[REG_INDEX(RDI)] = gregs.rdi;
-- regs[REG_INDEX(RIP)] = gregs.rip;
-- regs[REG_INDEX(CS)] = gregs.cs;
-- regs[REG_INDEX(RSP)] = gregs.rsp;
-- regs[REG_INDEX(SS)] = gregs.ss;
-- regs[REG_INDEX(FSBASE)] = gregs.fs_base;
-- regs[REG_INDEX(GSBASE)] = gregs.gs_base;
-- regs[REG_INDEX(DS)] = gregs.ds;
-- regs[REG_INDEX(ES)] = gregs.es;
-- regs[REG_INDEX(FS)] = gregs.fs;
-- regs[REG_INDEX(GS)] = gregs.gs;
-+ regs[REG_INDEX(R15)] = gregs.r_r15;
-+ regs[REG_INDEX(R14)] = gregs.r_r14;
-+ regs[REG_INDEX(R13)] = gregs.r_r13;
-+ regs[REG_INDEX(R12)] = gregs.r_r12;
-+ regs[REG_INDEX(RBP)] = gregs.r_rbp;
-+ regs[REG_INDEX(RBX)] = gregs.r_rbx;
-+ regs[REG_INDEX(R11)] = gregs.r_r11;
-+ regs[REG_INDEX(R10)] = gregs.r_r10;
-+ regs[REG_INDEX(R9)] = gregs.r_r9;
-+ regs[REG_INDEX(R8)] = gregs.r_r8;
-+ regs[REG_INDEX(RAX)] = gregs.r_rax;
-+ regs[REG_INDEX(RCX)] = gregs.r_rcx;
-+ regs[REG_INDEX(RDX)] = gregs.r_rdx;
-+ regs[REG_INDEX(RSI)] = gregs.r_rsi;
-+ regs[REG_INDEX(RDI)] = gregs.r_rdi;
-+ regs[REG_INDEX(RIP)] = gregs.r_rip;
-+ regs[REG_INDEX(CS)] = gregs.r_cs;
-+ regs[REG_INDEX(RSP)] = gregs.r_rsp;
-+ regs[REG_INDEX(SS)] = gregs.r_ss;
-+// regs[REG_INDEX(FSBASE)] = gregs.fs_base;
-+// regs[REG_INDEX(GSBASE)] = gregs.gs_base;
-+// regs[REG_INDEX(DS)] = gregs.ds;
-+// regs[REG_INDEX(ES)] = gregs.es;
-+// regs[REG_INDEX(FS)] = gregs.fs;
-+// regs[REG_INDEX(GS)] = gregs.gs;
-
- #endif /* amd64 */
-
--- hotspot/agent/src/os/bsd/Makefile
+++ hotspot/agent/src/os/bsd/Makefile
-@@ -22,8 +22,8 @@
- #
+@@ -23,7 +23,7 @@
#
--ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+ ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "amd64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
-GCC = gcc
-+ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "amd64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+GCC ?= gcc
JAVAH = ${JAVA_HOME}/bin/javah
-@@ -32,25 +32,24 @@
- libproc_impl.c \
- ps_proc.c \
- ps_core.c \
-- BsdDebuggerLocal.c
-+ BsdDebuggerLocal.c
-
--INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/bsd
-+INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
-
- OBJS = $(SOURCES:.c=.o)
-
--LIBS = -lthread_db
-+LIBS = -lutil -lthread_db
-
--CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
-+CFLAGS = -c -fPIC -g -Wall -D_ALLBSD_SOURCE -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
-
- LIBSA = $(ARCH)/libsaproc.so
-
- all: $(LIBSA)
-
- BsdDebuggerLocal.o: BsdDebuggerLocal.c
-- $(JAVAH) -jni -classpath ../../../build/classes \
-+ $(JAVAH) -jni -classpath ../../../../../build/bsd-i586/hotspot/outputdir/bsd_i486_compiler2/generated/saclasses \
- sun.jvm.hotspot.debugger.x86.X86ThreadContext \
-- sun.jvm.hotspot.debugger.sparc.SPARCThreadContext \
-- sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
-+ sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
- $(GCC) $(CFLAGS) $<
-
- .c.obj:
-@@ -60,26 +59,19 @@
- LFLAGS_LIBSA = -Xlinker --version-script=mapfile
- endif
-
--# If this is a --hash-style=gnu system, use --hash-style=both
--# The gnu .hash section won't work on some Bsd systems like SuSE 10.
--_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | grep -- '--hash-style=gnu')
--ifneq ($(_HAS_HASH_STYLE_GNU),)
-- LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
--endif
--LFLAGS_LIBSA += $(LDFLAGS_HASH_STYLE)
--
- $(LIBSA): $(OBJS) mapfile
- if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi
- $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
-
--test.o: test.c
-+test.o: $(LIBSA) test.c
- $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
-
- test: test.o
- $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
-
- clean:
-- rm -rf $(LIBSA)
-- rm -rf $(OBJS)
-- rmdir $(ARCH)
-+ rm -f $(LIBSA)
-+ rm -f $(OBJS)
-+ rm -f test.o
-+ -rmdir $(ARCH)
-
---- hotspot/agent/src/os/bsd/elfmacros.h
-+++ hotspot/agent/src/os/bsd/elfmacros.h
-@@ -25,16 +25,19 @@
- #ifndef _ELFMACROS_H_
- #define _ELFMACROS_H_
-
-+#define ELF_NHDR Elf_Note
-+
- #if defined(_LP64)
- #define ELF_EHDR Elf64_Ehdr
- #define ELF_SHDR Elf64_Shdr
- #define ELF_PHDR Elf64_Phdr
- #define ELF_SYM Elf64_Sym
--#define ELF_NHDR Elf64_Nhdr
- #define ELF_DYN Elf64_Dyn
- #define ELF_ADDR Elf64_Addr
-
-+#ifndef ELF_ST_TYPE
- #define ELF_ST_TYPE ELF64_ST_TYPE
-+#endif
-
- #else
-
-@@ -42,11 +45,12 @@
- #define ELF_SHDR Elf32_Shdr
- #define ELF_PHDR Elf32_Phdr
- #define ELF_SYM Elf32_Sym
--#define ELF_NHDR Elf32_Nhdr
- #define ELF_DYN Elf32_Dyn
- #define ELF_ADDR Elf32_Addr
-
-+#ifndef ELF_ST_TYPE
- #define ELF_ST_TYPE ELF32_ST_TYPE
-+#endif
-
- #endif
-
---- hotspot/agent/src/os/bsd/libproc.h
-+++ hotspot/agent/src/os/bsd/libproc.h
-@@ -27,7 +27,8 @@
-
- #include <unistd.h>
- #include <stdint.h>
--#include "proc_service.h"
-+#include <machine/reg.h>
-+#include <proc_service.h>
-
- #if defined(sparc) || defined(sparcv9)
- /*
-@@ -50,14 +51,11 @@
- adds Pgrab__ and some missing stuff. We hide the difference b/w live process and core
- file by this interface.
-
--1. pthread_id unique in both NPTL & BsdThreads. We store this in
--OSThread::_pthread_id in JVM code.
-+1. pthread_id is unique. We store this in OSThread::_pthread_id in JVM code.
-
--2. All threads see the same pid when they call getpid() under NPTL.
--Threads receive different pid under BsdThreads. We used to save the result of
--::getpid() call in OSThread::_thread_id. This way uniqueness of OSThread::_thread_id
--was lost under NPTL. Now, we store the result of ::gettid() call in
--OSThread::_thread_id. Because gettid returns actual pid of thread (lwp id), this is
-+2. All threads see the same pid when they call getpid().
-+We used to save the result of ::getpid() call in OSThread::_thread_id.
-+Because gettid returns actual pid of thread (lwp id), this is
- unique again. We therefore use OSThread::_thread_id as unique identifier.
-
- 3. There is a unique LWP id under both thread libraries. libthread_db maps pthread_id
-@@ -74,20 +72,7 @@
-
- *************************************************************************************/
-
--#ifdef ia64
--struct user_regs_struct {
--/* copied from user.h which doesn't define this in a struct */
--
--#define IA64_REG_COUNT (EF_SIZE/8+32) /* integer and fp regs */
--unsigned long regs[IA64_REG_COUNT]; /* integer and fp regs */
--};
--#endif
--
--#if defined(sparc) || defined(sparcv9)
--#define user_regs_struct pt_regs
--#endif
--
--// This C bool type must be int for compatibility with Bsd calls and
-+// This C bool type must be int for compatibility with BSD calls and
- // it would be a mistake to equivalence it to C++ bool on many platforms
-
- typedef int bool;
-@@ -118,7 +103,7 @@
- lwpid_t get_lwp_id(struct ps_prochandle* ph, int index);
-
- // get regs for a given lwp
--bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lid, struct user_regs_struct* regs);
-+bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lid, struct reg* regs);
-
- // get number of shared objects
- int get_num_libs(struct ps_prochandle* ph);
--- hotspot/agent/src/os/bsd/libproc_impl.c
+++ hotspot/agent/src/os/bsd/libproc_impl.c
-@@ -174,10 +174,13 @@
- return NULL;
- }
-
-- newlib->symtab = build_symtab(newlib->fd, libname);
-+ newlib->symtab = build_symtab(newlib->fd);
- if (newlib->symtab == NULL) {
- print_debug("symbol table build failed for %s\n", newlib->name);
- }
-+ else {
-+ print_debug("built symbol table for %s\n", newlib->name);
-+ }
-
- // even if symbol table building fails, we add the lib_info.
- // This is because we may need to read from the ELF file for core file
-@@ -232,6 +235,24 @@
+@@ -235,6 +235,24 @@
}
// add a thread to ps_prochandle
@@ -831,7 +468,7 @@
thread_info* add_thread_info(struct ps_prochandle* ph, pthread_t pthread_id, lwpid_t lwp_id) {
thread_info* newthr;
if ( (newthr = (thread_info*) calloc(1, sizeof(thread_info))) == NULL) {
-@@ -249,6 +270,7 @@
+@@ -252,6 +270,7 @@
ph->num_threads++;
return newthr;
}
@@ -839,7 +476,7 @@
// struct used for client data from thread_db callback
-@@ -270,10 +292,17 @@
+@@ -273,10 +292,17 @@
return err;
}
@@ -851,120 +488,15 @@
+#else
print_debug("thread_db : pthread %d (lwp %d)\n", ti.ti_tid, ti.ti_lid);
-- if (ptr->callback(ptr->ph, ti.ti_tid, ti.ti_lid) != true)
-+ if (ptr->callback(ptr->ph, (pthread_t)ti.ti_tid, ti.ti_lid) != true)
+ if (ptr->callback(ptr->ph, (pthread_t)ti.ti_tid, ti.ti_lid) != true)
return TD_ERR;
+#endif
return TD_OK;
}
-@@ -324,7 +353,7 @@
- }
-
- // get regs for a given lwp
--bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lwp_id, struct user_regs_struct* regs) {
-+bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lwp_id, struct reg* regs) {
- return ph->ops->get_lwp_regs(ph, lwp_id, regs);
- }
-
-@@ -375,11 +404,6 @@
- //--------------------------------------------------------------------------
- // proc service functions
-
--// get process id
--pid_t ps_getpid(struct ps_prochandle *ph) {
-- return ph->pid;
--}
--
- // ps_pglobal_lookup() looks up the symbol sym_name in the symbol table
- // of the load object object_name in the target process identified by ph.
- // It returns the symbol's value as an address in the target process in
-@@ -392,17 +416,33 @@
- }
-
- // read "size" bytes info "buf" from address "addr"
--ps_err_e ps_pdread(struct ps_prochandle *ph, psaddr_t addr,
-- void *buf, size_t size) {
-+ps_err_e ps_pread(struct ps_prochandle *ph, psaddr_t addr,
-+ void *buf, size_t size) {
- return ph->ops->p_pread(ph, (uintptr_t) addr, buf, size)? PS_OK: PS_ERR;
- }
-
- // write "size" bytes of data to debuggee at address "addr"
--ps_err_e ps_pdwrite(struct ps_prochandle *ph, psaddr_t addr,
-- const void *buf, size_t size) {
-+ps_err_e ps_pwrite(struct ps_prochandle *ph, psaddr_t addr,
-+ const void *buf, size_t size) {
- return ph->ops->p_pwrite(ph, (uintptr_t)addr, buf, size)? PS_OK: PS_ERR;
- }
-
-+// fill in ptrace_lwpinfo for lid
-+ps_err_e ps_linfo(struct ps_prochandle *ph, lwpid_t lwp_id, void *linfo) {
-+ return ph->ops->get_lwp_info(ph, lwp_id, linfo)? PS_OK: PS_ERR;
-+}
-+
-+// needed for when libthread_db is compiled with TD_DEBUG defined
-+void
-+ps_plog (const char *format, ...)
-+{
-+ va_list alist;
-+
-+ va_start(alist, format);
-+ vfprintf(stderr, format, alist);
-+ va_end(alist);
-+}
-+
- // ------------------------------------------------------------------------
- // Functions below this point are not yet implemented. They are here only
- // to make the linker happy.
-@@ -427,8 +467,12 @@
- return PS_OK;
- }
-
--// new libthread_db of NPTL seem to require this symbol
--ps_err_e ps_get_thread_area() {
-- print_debug("ps_get_thread_area not implemented\n");
-+ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lid) {
-+ print_debug("ps_lstop not implemented\n");
-+ return PS_OK;
-+}
-+
-+ps_err_e ps_pcontinue(struct ps_prochandle *ph) {
-+ print_debug("ps_pcontinue not implemented\n");
- return PS_OK;
- }
--- hotspot/agent/src/os/bsd/libproc_impl.h
+++ hotspot/agent/src/os/bsd/libproc_impl.h
-@@ -47,7 +47,7 @@
- typedef struct thread_info {
- lwpid_t lwp_id;
- pthread_t pthread_id; // not used cores, always -1
-- struct user_regs_struct regs; // not for process, core uses for caching regset
-+ struct reg regs; // not for process, core uses for caching regset
- struct thread_info* next;
- } thread_info;
-
-@@ -71,7 +71,9 @@
- bool (*p_pwrite)(struct ps_prochandle *ph,
- uintptr_t addr, const char *buf , size_t size);
- // get integer regset of a thread
-- bool (*get_lwp_regs)(struct ps_prochandle* ph, lwpid_t lwp_id, struct user_regs_struct* regs);
-+ bool (*get_lwp_regs)(struct ps_prochandle* ph, lwpid_t lwp_id, struct reg* regs);
-+ // get info on thread
-+ bool (*get_lwp_info)(struct ps_prochandle *ph, lwpid_t lwp_id, void *linfo);
- } ps_prochandle_ops;
-
- // the ps_prochandle
-@@ -79,7 +81,7 @@
- struct core_data {
- int core_fd; // file descriptor of core file
- int exec_fd; // file descriptor of exec file
-- int interp_fd; // file descriptor of interpreter (ld-bsd.so.2)
-+ int interp_fd; // file descriptor of interpreter (ld-elf.so.1)
- // part of the class sharing workaround
- int classes_jsa_fd; // file descriptor of class share archive
- uintptr_t dynamic_addr; // address of dynamic section of a.out
-@@ -107,7 +109,11 @@
+@@ -109,7 +109,11 @@
void print_debug(const char* format,...);
bool is_debug();
@@ -976,7 +508,7 @@
// reads thread info using libthread_db and calls above callback for each thread
bool read_thread_info(struct ps_prochandle* ph, thread_info_callback cb);
-@@ -120,7 +126,11 @@
+@@ -122,7 +126,11 @@
uintptr_t base);
// adds a new thread to threads list, returns NULL on failure
@@ -988,212 +520,9 @@
// a test for ELF signature without using libelf
bool is_elf_file(int fd);
---- hotspot/agent/src/os/bsd/mapfile
-+++ hotspot/agent/src/os/bsd/mapfile
-@@ -43,13 +43,17 @@
- # proc_service.h functions - to be used by libthread_db
- ps_getpid;
- ps_pglobal_lookup;
-- ps_pdread;
-- ps_pdwrite;
-+ ps_pread;
-+ ps_pwrite;
- ps_lsetfpregs;
- ps_lsetregs;
- ps_lgetfpregs;
- ps_lgetregs;
-- ps_get_thread_area;
-+ ps_lcontinue;
-+ ps_lgetxmmregs;
-+ ps_lsetxmmregs;
-+ ps_lstop;
-+ ps_linfo;
-
- # used by attach test program
- init_libproc;
---- hotspot/agent/src/os/bsd/proc_service.h
-+++ hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 19:00:00.000000000 -0500
-@@ -1,76 +0,0 @@
--/*
-- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- *
-- */
--
--#ifndef _PROC_SERVICE_H_
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list