diff options
| author | tnn <tnn@pkgsrc.org> | 2020-05-17 00:47:06 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-05-17 00:47:06 +0000 |
| commit | b943e7167e8206d68b4eb185261c4f8935529a2e (patch) | |
| tree | 4f4a423e9b92c5917cfe357f0a655eccf20d113f /lang | |
| parent | 1cd4f1047da7226e7ec3bde934bf3b734daecd13 (diff) | |
| download | pkgsrc-b943e7167e8206d68b4eb185261c4f8935529a2e.tar.gz | |
retire lang/openjdk7
Diffstat (limited to 'lang')
137 files changed, 1 insertions, 6033 deletions
diff --git a/lang/Makefile b/lang/Makefile index 95556600672..accede8c4ee 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.559 2020/05/10 15:02:44 maya Exp $ +# $NetBSD: Makefile,v 1.560 2020/05/17 00:47:06 tnn Exp $ # COMMENT= Programming languages @@ -184,7 +184,6 @@ SUBDIR+= open-cobol-ce SUBDIR+= opencobol SUBDIR+= openjdk-bin SUBDIR+= openjdk11 -SUBDIR+= openjdk7 SUBDIR+= openjdk8 SUBDIR+= opensource-cobol SUBDIR+= oracle-jdk8 diff --git a/lang/openjdk7/DESCR b/lang/openjdk7/DESCR deleted file mode 100644 index a2c67770fb7..00000000000 --- a/lang/openjdk7/DESCR +++ /dev/null @@ -1,8 +0,0 @@ -Open-source implementation of the Java Platform, Standard Edition. - -This package is NOT certified to be compatible with any Java standard. -Use at own risk. - -Mandatory trademark notice: - "OpenJDK is a trademark or registered trademark of Sun Microsystems, - Inc. in the United States and other countries." diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile deleted file mode 100644 index a8f2d0da698..00000000000 --- a/lang/openjdk7/Makefile +++ /dev/null @@ -1,316 +0,0 @@ -# $NetBSD: Makefile,v 1.143 2020/03/22 21:22:20 joerg Exp $ - -JDK_MICRO= 141 -DISTNAME= openjdk-1.7.${JDK_MICRO}-20170813 -PKGNAME= openjdk7-1.7.${JDK_MICRO} -PKGREVISION= 14 -CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} -EXTRACT_SUFX= .tar.xz - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= https://openjdk.java.net/ -COMMENT= Open-source implementation of the Java Platform, Standard Edition -LICENSE= gnu-gpl-v2 - -DISTFILES= ${DEFAULT_DISTFILES} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -DIST_SUBDIR= openjdk7 - -JAVA_NAME= openjdk7 -JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} -JAVA_WRAPPERS= jar java javac javadoc javah javap jcmd jhat jps jstack \ - keytool orbd policytool rmid rmiregistry servertool tnameserv - -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/[a-ik-z]* -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/j[b-z]* -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/jar* -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java -NOT_PAX_MPROTECT_SAFE+= java/${JAVA_NAME}/bin/java[a-z]* - -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "NetBSD" && defined(TOOLS_PLATFORM.paxctl) -SUBST_CLASSES+= set-paxctl -SUBST_STAGE.set-paxctl= pre-build -SUBST_MESSAGE.set-paxctl= Setting NetBSD paxctl -SUBST_FILES.set-paxctl= make/Defs-internal.gmk -SUBST_FILES.set-paxctl+= jdk/make/com/sun/jmx/Makefile -SUBST_SED.set-paxctl+= -e 's,/usr/sbin/paxmark.sh,${PAXCTL},' -SUBST_SED.set-paxctl+= -e 's,-vmsp,+m,' -SUBST_SED.set-paxctl+= -e 's,-vm,+m,' -SUBST_SED.set-paxctl+= -e 's,\^PaX,.,' -.endif - -MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip} -MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip} -MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx - -BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts - -NO_CONFIGURE= yes -USE_LANGUAGES= c gnu++03 -USE_TOOLS+= gmake pax unzip:run zip:run # patch -UNLIMIT_RESOURCES= datasize stacksize -WRKSRC= ${WRKDIR}/openjdk -PLIST_SRC+= ${PLIST_SRC_DFLT} -CHECK_SHLIBS_SKIP= java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libfontmanager.so -CHECK_SHLIBS_SKIP+= java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libjawt.so -CHECK_SHLIBS_SKIP+= java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH}/libsunec.so - -BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR} -PREPEND_PATH+= ${ALT_BOOTDIR}/bin - -MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR} -MAKE_ENV+= ALT_DROPS_DIR=${DISTDIR}/${DIST_SUBDIR} -MAKE_ENV+= ALT_FREETYPE_LIB_PATH=${BUILDLINK_PREFIX.freetype2}/lib -MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include -MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups-base}/include -MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin -MAKE_ENV+= ALT_PACKAGE_PATH=${PREFIX} -MAKE_ENV+= RHINO_JAR=${WRKDIR}/${RHINO}/js.jar - -MAKE_ENV+= BUILDLINK_PREFIX.iconv=${BUILDLINK_PREFIX.iconv:Q} -MAKE_ENV+= ZLIB_LIBS="-L${BUILDLINK_PREFIX.zlib}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.zlib}/lib -lz" - -MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1} -MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS} -MAKE_ENV+= USE_PRECOMPILED_HEADER=0 - -MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc -MAKE_ENV+= JDK_MICRO_VERSION="0_${JDK_MICRO}" -MAKE_ENV+= NO_DOCS=true -MAKE_ENV+= SKIP_COMPARE_IMAGES=true - -# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user. -MAKE_ENV+= JAVA_HOME= -MAKE_ENV+= CLASSPATH= - -BUILD_OPSYS= ${OPSYS:C/.*BSD/bsd/:S/DragonFly/bsd/:S/SunOS/solaris/} -BUILD_ARCH= ${MACHINE_ARCH:S/i386/i586/:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -BUILDDIR= ${WRKSRC}/build/${BUILD_OPSYS}-${BUILD_ARCH} -LD_LIBRARY_PATH= ${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/jli:${WRKDIR}/bootstrap/jre/lib/${LIBDIR_ARCH}/server -MAKE_ENV+= LD_LIBRARY_PATH=${LD_LIBRARY_PATH} -BUILDLINK_PASSTHRU_RPATHDIRS+= ${PREFIX}/java/${JAVA_NAME}/jre/lib/${LIBDIR_ARCH} - -PLIST_SUBST+= ARCH=${LIBDIR_ARCH} -PLIST_SUBST+= LOWER_OPSYS=${LOWER_OPSYS} - -.include "../../mk/compiler.mk" - -.if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Mgcc) -MAKE_ENV+= USE_GCC=1 -MAKE_ENV+= ARCH_DATA_MODEL=${ABI:Q} -.endif - -SUBST_CLASSES+= libpath -SUBST_STAGE.libpath= pre-build -SUBST_FILES.libpath+= hotspot/src/os/bsd/vm/os_bsd.cpp -SUBST_VARS.libpath= PREFIX - -# SmartOS has ccs tools in /usr/bin -.if ${OS_VARIANT} == "SmartOS" -SUBST_CLASSES+= ccspath -SUBST_STAGE.ccspath= pre-build -SUBST_FILES.ccspath= jdk/make/common/shared/Defs-utils.gmk -SUBST_FILES.ccspath+= hotspot/make/solaris/makefiles/build_vm_def.sh -SUBST_SED.ccspath= -e 's/UNIXCCS_PATH/UNIXCOMMAND_PATH/g' -SUBST_SED.ccspath+= -e 's,/usr/ccs/bin,/usr/bin,g' -.endif - -SUBST_CLASSES.SunOS+= mapfix -SUBST_STAGE.mapfix= pre-build -SUBST_FILES.mapfix= jdk/make/com/sun/java/pack/mapfile-vers -SUBST_FILES.mapfix+= jdk/make/java/main/java/mapfile-amd64 -SUBST_FILES.mapfix+= jdk/make/java/main/java/mapfile-i586 -SUBST_SED.mapfix= -e '/__fsr_init_value/d' -SUBST_SED.mapfix+= -e '/__progname/d' - -# environ should only be removed from this file (added by patches) -SUBST_CLASSES.SunOS+= mapfix2 -SUBST_STAGE.mapfix2= pre-build -SUBST_FILES.mapfix2= jdk/make/com/sun/java/pack/mapfile-vers -SUBST_SED.mapfix2= -e '/environ/d' - -CFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -CXXFLAGS+= -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS - -.if !empty(PKGSRC_COMPILER:Mgcc) && empty(CC_VERSION:Mgcc-[2345].*) -CFLAGS+= -fno-lifetime-dse -CFLAGS+= -fno-delete-null-pointer-checks -.endif - -# no multilib support on aarch64 yet -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) -BUILDLINK_TRANSFORM+= rm:-m64 -.endif - -.if !empty(PKGSRC_COMPILER:Mclang) -_WRAP_EXTRA_ARGS.CXX+= -Wno-parentheses -Wno-sign-conversion \ - -Wno-shorten-64-to-32 -Wno-conversion \ - -Wno-unused-value -Wno-switch-enum -Wno-switch \ - -Wno-tautological-compare \ - -Wno-delete-non-virtual-dtor \ - -Wno-return-type -Wno-unused-parameter \ - -Wno-parentheses-equality -Wno-empty-body \ - -Wno-sizeof-array-div -CWRAPPERS_APPEND.cxx+= -Wno-parentheses -Wno-sign-conversion \ - -Wno-shorten-64-to-32 -Wno-conversion \ - -Wno-unused-value -Wno-switch-enum -Wno-switch \ - -Wno-tautological-compare \ - -Wno-delete-non-virtual-dtor \ - -Wno-return-type -Wno-unused-parameter \ - -Wno-parentheses-equality -Wno-empty-body \ - -Wno-sizeof-array-div -. if ${OPSYS} != "FreeBSD" -_WRAP_EXTRA_ARGS.CXX+= -Wno-new-returns-null -CWRAPPERS_APPEND.cxx+= -Wno-new-returns-null -. endif -BUILDLINK_TRANSFORM+= rm:-fcheck-new -BUILDLINK_TRANSFORM+= rm:-fpch-deps -. if ${MACHINE_ARCH} == "x86_64" -_WRAP_EXTRA_ARGS.CXX+= -mstackrealign -CWRAPPERS_APPEND.cxx+= -mstackrealign -. endif -.endif -.include "bootstrap.mk" -.include "icedtea-extras.mk" - -.include "options.mk" - -SUBST_CLASSES+= add-rpaths -SUBST_STAGE.add-rpaths= pre-build -SUBST_MESSAGE.add-rpaths= adding X11 run path flags to Makefiles -SUBST_FILES.add-rpaths= jdk/make/sun/awt/Makefile \ - jdk/make/sun/awt/mawt.gmk \ - jdk/make/sun/jawt/Makefile \ - jdk/make/sun/jdga/Makefile \ - jdk/make/sun/splashscreen/Makefile \ - jdk/make/sun/xawt/Makefile -SUBST_SED.add-rpaths= -e 's|-L$$(OPENWIN_LIB)|-L$$(OPENWIN_LIB) -Wl,-R$$(OPENWIN_LIB)|g' - -SUBST_CLASSES+= fontpaths -SUBST_STAGE.fontpaths= pre-build -SUBST_MESSAGE.fontpaths= fixing font paths -SUBST_FILES.fontpaths= jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties -SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c -SUBST_VARS.fontpaths= PREFIX -SUBST_VARS.fontpaths+= BUILDLINK_PREFIX.fontconfig - -PLIST_VARS+= i386 -.if ${MACHINE_ARCH} == "i386" -PLIST.i386= yes -.endif - -PLIST_VARS+= sctp alsa -.if ${OPSYS} == "FreeBSD" -PLIST.sctp= yes -PLIST.alsa= yes -.include "../../audio/alsa-lib/buildlink3.mk" -.endif - -post-extract: - chmod +x ${ANT_BIN}/ant - ${LN} -s mapfile-i586 ${WRKSRC}/jdk/make/java/main/java/mapfile-arm - ${LN} -s mapfile-amd64 ${WRKSRC}/jdk/make/java/main/java/mapfile-aarch64 -# These libs are bundled w/ the netbsd-7 bootstrap to facilitate building with -# MKLLVM=yes / MKGCC=no. Nuke them from bootstrap if they are present in base. -.if exists(/lib/libgcc_s.so.1) - ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libgcc_s.so* -.endif -.if exists(/usr/lib/libstdc++.so.7) - ${RM} -f ${ALT_BOOTDIR}/jre/lib/${LIBDIR_ARCH}/libstdc++.so* -.endif -.if defined(TOOLS_PLATFORM.paxctl) - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]* - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]* - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar* - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]* - ${PAXCTL} +m ${WRKDIR}/bootstrap/jre/bin/* -.endif - -do-build: ${WRKDIR}/stage3-done - -# stage 1 builds a native JDK using the bootstrap binaries -${WRKDIR}/stage1-done: - ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${JDK_MAKE_TARGET} - rm -rf ${ALT_BOOTDIR} - cd ${BUILDDIR} && mv j2sdk-image ${ALT_BOOTDIR} - mv ${BUILDDIR} ${BUILDDIR}-stage1 - touch ${.TARGET} - -# stage 1.5 reconfigures, since the bootstrap JDK major version might have changed now -${WRKDIR}/stage1_5-done: ${WRKDIR}/stage1-done -.if defined(TOOLS_PLATFORM.paxctl) - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/[a-ik-z]* - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/j[b-z]* - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/jar* - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java - ${PAXCTL} +m ${WRKDIR}/bootstrap/bin/java[a-z]* - ${PAXCTL} +m ${WRKDIR}/bootstrap/jre/bin/* -.endif - touch ${.TARGET} - -# stage 2 rebuilds the JDK using native tools -${WRKDIR}/stage2-done: ${WRKDIR}/stage1_5-done - ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${JDK_MAKE_TARGET} - touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep - touch ${.TARGET} - -# stage 3 builds third party add-ons -${WRKDIR}/stage3-done: ${WRKDIR}/stage2-done ${WRKDIR}/cacerts.out - touch ${.TARGET} - -${WRKDIR}/cacerts.out: -.if defined(TOOLS_PLATFORM.paxctl) - ${PAXCTL} +m ${WRKSRC}/build/*/bin/keytool -.endif - mkdir ${WRKDIR}/cacerts && cd ${WRKDIR}/cacerts && \ - ${PREFIX}/sbin/mozilla-rootcerts extract - for cert in ${WRKDIR}/cacerts/*.pem; do \ - ${INFO_MSG} "Importing $$cert" && \ - ${SETENV} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} LC_ALL=C \ - ${BUILDDIR}/bin/keytool \ - -noprompt \ - -importcert \ - -keystore ${.TARGET} \ - -alias `${ECHO} $$cert | sed 's,.*/\\([^/]*\\)\\.pem,\\1,'` \ - -file $$cert \ - -storepass changeit; \ - done - -do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME} - cd ${BUILDDIR}/j2sdk-image && pax -rwpp . \ - ${DESTDIR}${JAVA_HOME}/. - ${INSTALL_DATA} ${WRKDIR}/cacerts.out \ - ${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts - rm -f ${DESTDIR}${JAVA_HOME}/include/jni_md.h - ln -s ${LOWER_OPSYS}/jni_md.h \ - ${DESTDIR}${JAVA_HOME}/include/jni_md.h - -.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" -TOOLS_PLATFORM.unzip= -.endif - -# Include binutils for objcopy and GNU strip on SmartOS -.if ${OS_VARIANT} == "SmartOS" -.include "../../devel/binutils/buildlink3.mk" -BUILDLINK_DEPMETHOD.binutils?= build -MAKE_ENV+= ALT_OBJCOPY=${PREFIX}/bin/gobjcopy -MAKE_ENV+= STRIP=${PREFIX}/bin/gstrip -.endif - -.include "../../converters/libiconv/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/freetype2/buildlink3.mk" -# Headers from CUPS are required to build the native implementation of -# sun.print.* which is used by java.awt.print. -BUILDLINK_DEPMETHOD.cups-base?= build -.include "../../print/cups-base/buildlink3.mk" -.include "../../mk/java-env.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST deleted file mode 100644 index b352442ae26..00000000000 --- a/lang/openjdk7/PLIST +++ /dev/null @@ -1,1023 +0,0 @@ -@comment $NetBSD: PLIST,v 1.27 2018/09/19 18:18:56 abs Exp $ -bin/openjdk7-jar -bin/openjdk7-java -bin/openjdk7-javac -bin/openjdk7-javadoc -bin/openjdk7-javah -bin/openjdk7-javap -bin/openjdk7-jcmd -bin/openjdk7-jhat -bin/openjdk7-jps -bin/openjdk7-jstack -bin/openjdk7-keytool -bin/openjdk7-orbd -bin/openjdk7-policytool -bin/openjdk7-rmid -bin/openjdk7-rmiregistry -bin/openjdk7-servertool -bin/openjdk7-tnameserv -java/openjdk7/ASSEMBLY_EXCEPTION -java/openjdk7/LICENSE -java/openjdk7/THIRD_PARTY_README -${PLIST.x11}java/openjdk7/bin/appletviewer -java/openjdk7/bin/apt -java/openjdk7/bin/extcheck -java/openjdk7/bin/idlj -java/openjdk7/bin/jar -java/openjdk7/bin/jarsigner -java/openjdk7/bin/java -java/openjdk7/bin/java-rmi.cgi -java/openjdk7/bin/javac -java/openjdk7/bin/javadoc -java/openjdk7/bin/javah -java/openjdk7/bin/javap -java/openjdk7/bin/jcmd -java/openjdk7/bin/jconsole -java/openjdk7/bin/jdb -java/openjdk7/bin/jhat -java/openjdk7/bin/jinfo -java/openjdk7/bin/jmap -java/openjdk7/bin/jps -java/openjdk7/bin/jrunscript -java/openjdk7/bin/jsadebugd -java/openjdk7/bin/jstack -java/openjdk7/bin/jstat -java/openjdk7/bin/jstatd -java/openjdk7/bin/keytool -java/openjdk7/bin/native2ascii -java/openjdk7/bin/orbd -java/openjdk7/bin/pack200 -${PLIST.x11}java/openjdk7/bin/policytool -java/openjdk7/bin/rmic -java/openjdk7/bin/rmid -java/openjdk7/bin/rmiregistry -java/openjdk7/bin/schemagen -java/openjdk7/bin/serialver -java/openjdk7/bin/servertool -java/openjdk7/bin/tnameserv -java/openjdk7/bin/unpack200 -java/openjdk7/bin/wsgen -java/openjdk7/bin/wsimport -java/openjdk7/bin/xjc -java/openjdk7/demo/README -java/openjdk7/demo/applets/ArcTest/ArcCanvas.class -java/openjdk7/demo/applets/ArcTest/ArcControls.class -java/openjdk7/demo/applets/ArcTest/ArcTest.class -java/openjdk7/demo/applets/ArcTest/ArcTest.java -java/openjdk7/demo/applets/ArcTest/IntegerTextField.class -java/openjdk7/demo/applets/ArcTest/example1.html -java/openjdk7/demo/applets/BarChart/BarChart.class -java/openjdk7/demo/applets/BarChart/BarChart.java -java/openjdk7/demo/applets/BarChart/example1.html -java/openjdk7/demo/applets/BarChart/example2.html -java/openjdk7/demo/applets/Blink/Blink$1.class -java/openjdk7/demo/applets/Blink/Blink.class -java/openjdk7/demo/applets/Blink/Blink.java -java/openjdk7/demo/applets/Blink/example1.html -java/openjdk7/demo/applets/CardTest/CardPanel.class -java/openjdk7/demo/applets/CardTest/CardTest.class -java/openjdk7/demo/applets/CardTest/CardTest.java -java/openjdk7/demo/applets/CardTest/example1.html -java/openjdk7/demo/applets/Clock/Clock.class -java/openjdk7/demo/applets/Clock/Clock.java -java/openjdk7/demo/applets/Clock/example1.html -java/openjdk7/demo/applets/DitherTest/CardinalTextField.class -java/openjdk7/demo/applets/DitherTest/DitherCanvas.class -java/openjdk7/demo/applets/DitherTest/DitherControls.class -java/openjdk7/demo/applets/DitherTest/DitherMethod.class -java/openjdk7/demo/applets/DitherTest/DitherTest$1.class -java/openjdk7/demo/applets/DitherTest/DitherTest.class -java/openjdk7/demo/applets/DitherTest/DitherTest.java -java/openjdk7/demo/applets/DitherTest/example1.html -java/openjdk7/demo/applets/DrawTest/DrawControls.class -java/openjdk7/demo/applets/DrawTest/DrawPanel.class -java/openjdk7/demo/applets/DrawTest/DrawTest.class -java/openjdk7/demo/applets/DrawTest/DrawTest.java -java/openjdk7/demo/applets/DrawTest/example1.html -java/openjdk7/demo/applets/Fractal/CLSFractal.class -java/openjdk7/demo/applets/Fractal/CLSFractal.java -java/openjdk7/demo/applets/Fractal/CLSRule.class -java/openjdk7/demo/applets/Fractal/CLSTurtle.class -java/openjdk7/demo/applets/Fractal/ContextLSystem.class -java/openjdk7/demo/applets/Fractal/example1.html -java/openjdk7/demo/applets/GraphicsTest/AppletFrame.class -java/openjdk7/demo/applets/GraphicsTest/AppletFrame.java -java/openjdk7/demo/applets/GraphicsTest/ArcCard.class -java/openjdk7/demo/applets/GraphicsTest/ArcDegreePanel.class -java/openjdk7/demo/applets/GraphicsTest/ArcPanel.class -java/openjdk7/demo/applets/GraphicsTest/ColorUtils.class -java/openjdk7/demo/applets/GraphicsTest/GraphicsCards.class -java/openjdk7/demo/applets/GraphicsTest/GraphicsPanel.class -java/openjdk7/demo/applets/GraphicsTest/GraphicsTest.class -java/openjdk7/demo/applets/GraphicsTest/GraphicsTest.java -java/openjdk7/demo/applets/GraphicsTest/OvalShape.class -java/openjdk7/demo/applets/GraphicsTest/PolygonShape.class -java/openjdk7/demo/applets/GraphicsTest/RectShape.class -java/openjdk7/demo/applets/GraphicsTest/RoundRectShape.class -java/openjdk7/demo/applets/GraphicsTest/Shape.class -java/openjdk7/demo/applets/GraphicsTest/ShapeTest.class -java/openjdk7/demo/applets/GraphicsTest/example1.html -java/openjdk7/demo/applets/MoleculeViewer/Atom.class -java/openjdk7/demo/applets/MoleculeViewer/Matrix3D.class -java/openjdk7/demo/applets/MoleculeViewer/Matrix3D.java -java/openjdk7/demo/applets/MoleculeViewer/XYZApp.class -java/openjdk7/demo/applets/MoleculeViewer/XYZApp.java -java/openjdk7/demo/applets/MoleculeViewer/XYZChemModel.class -java/openjdk7/demo/applets/MoleculeViewer/example1.html -java/openjdk7/demo/applets/MoleculeViewer/example2.html -java/openjdk7/demo/applets/MoleculeViewer/example3.html -java/openjdk7/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz -java/openjdk7/demo/applets/MoleculeViewer/models/benzene.xyz -java/openjdk7/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz -java/openjdk7/demo/applets/MoleculeViewer/models/cyclohexane.xyz -java/openjdk7/demo/applets/MoleculeViewer/models/ethane.xyz -java/openjdk7/demo/applets/MoleculeViewer/models/water.xyz -java/openjdk7/demo/applets/NervousText/NervousText.class -java/openjdk7/demo/applets/NervousText/NervousText.java -java/openjdk7/demo/applets/NervousText/example1.html -java/openjdk7/demo/applets/SimpleGraph/GraphApplet.class -java/openjdk7/demo/applets/SimpleGraph/GraphApplet.java -java/openjdk7/demo/applets/SimpleGraph/example1.html -java/openjdk7/demo/applets/SortDemo/BidirBubbleSortAlgorithm.class -java/openjdk7/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java -java/openjdk7/demo/applets/SortDemo/BubbleSortAlgorithm.class -java/openjdk7/demo/applets/SortDemo/BubbleSortAlgorithm.java -java/openjdk7/demo/applets/SortDemo/QSortAlgorithm.class -java/openjdk7/demo/applets/SortDemo/QSortAlgorithm.java -java/openjdk7/demo/applets/SortDemo/SortAlgorithm.class -java/openjdk7/demo/applets/SortDemo/SortAlgorithm.java -java/openjdk7/demo/applets/SortDemo/SortItem.class -java/openjdk7/demo/applets/SortDemo/SortItem.java -java/openjdk7/demo/applets/SortDemo/example1.html -java/openjdk7/demo/applets/SpreadSheet/Cell.class -java/openjdk7/demo/applets/SpreadSheet/CellUpdater.class -java/openjdk7/demo/applets/SpreadSheet/InputField.class -java/openjdk7/demo/applets/SpreadSheet/Node.class -java/openjdk7/demo/applets/SpreadSheet/SpreadSheet.class -java/openjdk7/demo/applets/SpreadSheet/SpreadSheet.java -java/openjdk7/demo/applets/SpreadSheet/SpreadSheetInput.class -java/openjdk7/demo/applets/SpreadSheet/example1.html -java/openjdk7/demo/applets/WireFrame/FileFormatException.class -java/openjdk7/demo/applets/WireFrame/Matrix3D.class -java/openjdk7/demo/applets/WireFrame/Matrix3D.java -java/openjdk7/demo/applets/WireFrame/Model3D.class -java/openjdk7/demo/applets/WireFrame/ThreeD.class -java/openjdk7/demo/applets/WireFrame/ThreeD.java -java/openjdk7/demo/applets/WireFrame/example1.html -java/openjdk7/demo/applets/WireFrame/example2.html -java/openjdk7/demo/applets/WireFrame/example3.html -java/openjdk7/demo/applets/WireFrame/example4.html -java/openjdk7/demo/applets/WireFrame/models/cube.obj -java/openjdk7/demo/applets/WireFrame/models/dinasaur.obj -java/openjdk7/demo/applets/WireFrame/models/hughes_500.obj -java/openjdk7/demo/applets/WireFrame/models/knoxS.obj -java/openjdk7/demo/jfc/CodePointIM/CodePointIM.jar -java/openjdk7/demo/jfc/CodePointIM/README.html -java/openjdk7/demo/jfc/CodePointIM/README_ja.html -java/openjdk7/demo/jfc/CodePointIM/README_zh_CN.html -java/openjdk7/demo/jfc/CodePointIM/src.zip -java/openjdk7/demo/jfc/FileChooserDemo/FileChooserDemo.jar -java/openjdk7/demo/jfc/FileChooserDemo/README.txt -java/openjdk7/demo/jfc/FileChooserDemo/src.zip -java/openjdk7/demo/jfc/Font2DTest/Font2DTest.html -java/openjdk7/demo/jfc/Font2DTest/Font2DTest.jar -java/openjdk7/demo/jfc/Font2DTest/README.txt -java/openjdk7/demo/jfc/Font2DTest/src.zip -java/openjdk7/demo/jfc/Metalworks/Metalworks.jar -java/openjdk7/demo/jfc/Metalworks/README.txt -java/openjdk7/demo/jfc/Metalworks/src.zip -java/openjdk7/demo/jfc/Notepad/Notepad.jar -java/openjdk7/demo/jfc/Notepad/README.txt -java/openjdk7/demo/jfc/Notepad/src.zip -java/openjdk7/demo/jfc/SampleTree/README.txt -java/openjdk7/demo/jfc/SampleTree/SampleTree.jar -java/openjdk7/demo/jfc/SampleTree/src.zip -java/openjdk7/demo/jfc/SwingApplet/README.txt -java/openjdk7/demo/jfc/SwingApplet/SwingApplet.html -java/openjdk7/demo/jfc/SwingApplet/SwingApplet.jar -java/openjdk7/demo/jfc/SwingApplet/src.zip -java/openjdk7/demo/jfc/TableExample/README.txt -java/openjdk7/demo/jfc/TableExample/TableExample.jar -java/openjdk7/demo/jfc/TableExample/src.zip -java/openjdk7/demo/jfc/TransparentRuler/README.txt -java/openjdk7/demo/jfc/TransparentRuler/TransparentRuler.jar -java/openjdk7/demo/jfc/TransparentRuler/src.zip -java/openjdk7/demo/jpda/com/sun/tools/example/README -java/openjdk7/demo/jpda/examples.jar -java/openjdk7/demo/jpda/src.zip -java/openjdk7/demo/jvmti/compiledMethodLoad/README.txt -java/openjdk7/demo/jvmti/compiledMethodLoad/lib/libcompiledMethodLoad.so -java/openjdk7/demo/jvmti/compiledMethodLoad/src.zip -java/openjdk7/demo/jvmti/gctest/README.txt -java/openjdk7/demo/jvmti/gctest/lib/libgctest.so -java/openjdk7/demo/jvmti/gctest/src.zip -java/openjdk7/demo/jvmti/heapTracker/README.txt -java/openjdk7/demo/jvmti/heapTracker/heapTracker.jar -java/openjdk7/demo/jvmti/heapTracker/lib/libheapTracker.so -java/openjdk7/demo/jvmti/heapTracker/src.zip -java/openjdk7/demo/jvmti/heapViewer/README.txt -java/openjdk7/demo/jvmti/heapViewer/lib/libheapViewer.so -java/openjdk7/demo/jvmti/heapViewer/src.zip -java/openjdk7/demo/jvmti/hprof/README.txt -java/openjdk7/demo/jvmti/hprof/lib/libhprof.so -java/openjdk7/demo/jvmti/hprof/src.zip -java/openjdk7/demo/jvmti/index.html -java/openjdk7/demo/jvmti/minst/README.txt -java/openjdk7/demo/jvmti/minst/lib/libminst.so -java/openjdk7/demo/jvmti/minst/minst.jar -java/openjdk7/demo/jvmti/minst/src.zip -java/openjdk7/demo/jvmti/mtrace/README.txt -java/openjdk7/demo/jvmti/mtrace/lib/libmtrace.so -java/openjdk7/demo/jvmti/mtrace/mtrace.jar -java/openjdk7/demo/jvmti/mtrace/src.zip -java/openjdk7/demo/jvmti/versionCheck/README.txt -java/openjdk7/demo/jvmti/versionCheck/lib/libversionCheck.so -java/openjdk7/demo/jvmti/versionCheck/src.zip -java/openjdk7/demo/jvmti/waiters/README.txt -java/openjdk7/demo/jvmti/waiters/lib/libwaiters.so -java/openjdk7/demo/jvmti/waiters/src.zip -java/openjdk7/demo/management/FullThreadDump/FullThreadDump.jar -java/openjdk7/demo/management/FullThreadDump/README.txt -java/openjdk7/demo/management/FullThreadDump/src.zip -java/openjdk7/demo/management/JTop/JTop.jar -java/openjdk7/demo/management/JTop/README.txt -java/openjdk7/demo/management/JTop/src.zip -java/openjdk7/demo/management/MemoryMonitor/MemoryMonitor.jar -java/openjdk7/demo/management/MemoryMonitor/README.txt -java/openjdk7/demo/management/MemoryMonitor/src.zip -java/openjdk7/demo/management/VerboseGC/README.txt -java/openjdk7/demo/management/VerboseGC/VerboseGC.jar -java/openjdk7/demo/management/VerboseGC/src.zip -java/openjdk7/demo/management/index.html -java/openjdk7/demo/nbproject/README.txt -java/openjdk7/demo/nbproject/jfc/FileChooserDemo/build.properties -java/openjdk7/demo/nbproject/jfc/FileChooserDemo/build.xml -java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml -java/openjdk7/demo/nbproject/jfc/Font2DTest/build.properties -java/openjdk7/demo/nbproject/jfc/Font2DTest/build.xml -java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/Font2DTest/nbproject/project.xml -java/openjdk7/demo/nbproject/jfc/Metalworks/build.properties -java/openjdk7/demo/nbproject/jfc/Metalworks/build.xml -java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/Metalworks/nbproject/project.xml -java/openjdk7/demo/nbproject/jfc/Notepad/build.properties -java/openjdk7/demo/nbproject/jfc/Notepad/build.xml -java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/Notepad/nbproject/project.xml -java/openjdk7/demo/nbproject/jfc/SampleTree/build.properties -java/openjdk7/demo/nbproject/jfc/SampleTree/build.xml -java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/SampleTree/nbproject/project.xml -java/openjdk7/demo/nbproject/jfc/SwingApplet/build.properties -java/openjdk7/demo/nbproject/jfc/SwingApplet/build.xml -java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/SwingApplet/nbproject/project.xml -java/openjdk7/demo/nbproject/jfc/TableExample/build.properties -java/openjdk7/demo/nbproject/jfc/TableExample/build.xml -java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/TableExample/nbproject/project.xml -java/openjdk7/demo/nbproject/jfc/TransparentRuler/build.properties -java/openjdk7/demo/nbproject/jfc/TransparentRuler/build.xml -java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml -java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml -java/openjdk7/demo/nbproject/management/FullThreadDump/build.properties -java/openjdk7/demo/nbproject/management/FullThreadDump/build.xml -java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml -java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/management/FullThreadDump/nbproject/project.xml -java/openjdk7/demo/nbproject/management/JTop/build.properties -java/openjdk7/demo/nbproject/management/JTop/build.xml -java/openjdk7/demo/nbproject/management/JTop/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/management/JTop/nbproject/jdk.xml -java/openjdk7/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/management/JTop/nbproject/project.xml -java/openjdk7/demo/nbproject/management/MemoryMonitor/build.properties -java/openjdk7/demo/nbproject/management/MemoryMonitor/build.xml -java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml -java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/management/MemoryMonitor/nbproject/project.xml -java/openjdk7/demo/nbproject/management/VerboseGC/build.properties -java/openjdk7/demo/nbproject/management/VerboseGC/build.xml -java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/jdk.xml -java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/management/VerboseGC/nbproject/project.xml -java/openjdk7/demo/nbproject/project.xml -java/openjdk7/demo/nbproject/scripting/jconsole-plugin/build.properties -java/openjdk7/demo/nbproject/scripting/jconsole-plugin/build.xml -java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/file-targets.xml -java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml -java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml -java/openjdk7/demo/nbproject/scripting/jconsole-plugin/nbproject/project.xml -java/openjdk7/demo/nio/zipfs/Demo.java -java/openjdk7/demo/nio/zipfs/README.txt -java/openjdk7/demo/nio/zipfs/src.zip -java/openjdk7/demo/nio/zipfs/zipfs.jar -java/openjdk7/demo/scripting/jconsole-plugin/README.txt -java/openjdk7/demo/scripting/jconsole-plugin/build.xml -java/openjdk7/demo/scripting/jconsole-plugin/jconsole-plugin.jar -java/openjdk7/demo/scripting/jconsole-plugin/src.zip -java/openjdk7/include/classfile_constants.h -java/openjdk7/include/jawt.h -java/openjdk7/include/jdwpTransport.h -java/openjdk7/include/jni.h -java/openjdk7/include/jni_md.h -java/openjdk7/include/jvmti.h -java/openjdk7/include/jvmticmlr.h -java/openjdk7/include/${LOWER_OPSYS}/jawt_md.h -java/openjdk7/include/${LOWER_OPSYS}/jni_md.h -java/openjdk7/jre/ASSEMBLY_EXCEPTION -java/openjdk7/jre/LICENSE -java/openjdk7/jre/THIRD_PARTY_README -java/openjdk7/jre/bin/java -java/openjdk7/jre/bin/keytool -java/openjdk7/jre/bin/orbd -java/openjdk7/jre/bin/pack200 -${PLIST.x11}java/openjdk7/jre/bin/policytool -java/openjdk7/jre/bin/rmid -java/openjdk7/jre/bin/rmiregistry -java/openjdk7/jre/bin/servertool -java/openjdk7/jre/bin/tnameserv -java/openjdk7/jre/bin/unpack200 -${PLIST.native}${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt -${PLIST.native}${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so -${PLIST.native}${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so -java/openjdk7/jre/lib/${ARCH}/headless/libmawt.so -java/openjdk7/jre/lib/${ARCH}/jexec -java/openjdk7/jre/lib/${ARCH}/jli/libjli.so -java/openjdk7/jre/lib/${ARCH}/jspawnhelper -java/openjdk7/jre/lib/${ARCH}/jvm.cfg -java/openjdk7/jre/lib/${ARCH}/libattach.so -java/openjdk7/jre/lib/${ARCH}/libawt.so -java/openjdk7/jre/lib/${ARCH}/libdt_socket.so -java/openjdk7/jre/lib/${ARCH}/libfontmanager.so -java/openjdk7/jre/lib/${ARCH}/libhprof.so -java/openjdk7/jre/lib/${ARCH}/libinstrument.so -java/openjdk7/jre/lib/${ARCH}/libj2gss.so -java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so -java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so -java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so -java/openjdk7/jre/lib/${ARCH}/libjava.so -java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so -java/openjdk7/jre/lib/${ARCH}/libjawt.so -java/openjdk7/jre/lib/${ARCH}/libjdwp.so -java/openjdk7/jre/lib/${ARCH}/libjpeg.so -java/openjdk7/jre/lib/${ARCH}/libjsdt.so -java/openjdk7/jre/lib/${ARCH}/libjsig.so -java/openjdk7/jre/lib/${ARCH}/libjsound.so -${PLIST.alsa}java/openjdk7/jre/lib/${ARCH}/libjsoundalsa.so -java/openjdk7/jre/lib/${ARCH}/liblcms.so -java/openjdk7/jre/lib/${ARCH}/libmanagement.so -java/openjdk7/jre/lib/${ARCH}/libmlib_image.so -java/openjdk7/jre/lib/${ARCH}/libnet.so -java/openjdk7/jre/lib/${ARCH}/libnio.so -java/openjdk7/jre/lib/${ARCH}/libnpt.so -${PLIST.native}java/openjdk7/jre/lib/${ARCH}/libsaproc.so -${PLIST.sctp}java/openjdk7/jre/lib/${ARCH}/libsctp.so -${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so -java/openjdk7/jre/lib/${ARCH}/libsunec.so -java/openjdk7/jre/lib/${ARCH}/libunpack.so -java/openjdk7/jre/lib/${ARCH}/libverify.so -java/openjdk7/jre/lib/${ARCH}/libzip.so -java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt -java/openjdk7/jre/lib/${ARCH}/server/libjsig.so -java/openjdk7/jre/lib/${ARCH}/server/libjvm.so -${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so -java/openjdk7/jre/lib/applet/.keep -java/openjdk7/jre/lib/calendars.properties -java/openjdk7/jre/lib/charsets.jar -java/openjdk7/jre/lib/classlist -java/openjdk7/jre/lib/cmm/CIEXYZ.pf -java/openjdk7/jre/lib/cmm/GRAY.pf -java/openjdk7/jre/lib/cmm/LINEAR_RGB.pf -java/openjdk7/jre/lib/cmm/PYCC.pf -java/openjdk7/jre/lib/cmm/sRGB.pf -java/openjdk7/jre/lib/content-types.properties -java/openjdk7/jre/lib/currency.data -java/openjdk7/jre/lib/ext/dnsns.jar -java/openjdk7/jre/lib/ext/localedata.jar -java/openjdk7/jre/lib/ext/meta-index -java/openjdk7/jre/lib/ext/sunec.jar -java/openjdk7/jre/lib/ext/sunjce_provider.jar -java/openjdk7/jre/lib/ext/sunpkcs11.jar -java/openjdk7/jre/lib/ext/zipfs.jar -java/openjdk7/jre/lib/flavormap.properties -java/openjdk7/jre/lib/fontconfig.bfc -java/openjdk7/jre/lib/fontconfig.properties.src -java/openjdk7/jre/lib/images/cursors/cursors.properties -java/openjdk7/jre/lib/images/cursors/invalid32x32.gif -java/openjdk7/jre/lib/images/cursors/motif_CopyDrop32x32.gif -java/openjdk7/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif -java/openjdk7/jre/lib/images/cursors/motif_LinkDrop32x32.gif -java/openjdk7/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif -java/openjdk7/jre/lib/images/cursors/motif_MoveDrop32x32.gif -java/openjdk7/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif -java/openjdk7/jre/lib/jce.jar -java/openjdk7/jre/lib/jsse.jar -java/openjdk7/jre/lib/jvm.hprof.txt -java/openjdk7/jre/lib/logging.properties -java/openjdk7/jre/lib/management-agent.jar -java/openjdk7/jre/lib/management/jmxremote.access -java/openjdk7/jre/lib/management/jmxremote.password.template -java/openjdk7/jre/lib/management/management.properties -java/openjdk7/jre/lib/management/snmp.acl.template -java/openjdk7/jre/lib/meta-index -java/openjdk7/jre/lib/net.properties -java/openjdk7/jre/lib/psfont.properties.ja -java/openjdk7/jre/lib/psfontj2d.properties -java/openjdk7/jre/lib/resources.jar -java/openjdk7/jre/lib/rhino.jar -java/openjdk7/jre/lib/rt.jar -java/openjdk7/jre/lib/security/US_export_policy.jar -java/openjdk7/jre/lib/security/blacklisted.certs -java/openjdk7/jre/lib/security/cacerts -java/openjdk7/jre/lib/security/java.policy -java/openjdk7/jre/lib/security/java.security -java/openjdk7/jre/lib/security/local_policy.jar -java/openjdk7/jre/lib/sound.properties -java/openjdk7/jre/lib/zi/Africa/Abidjan -java/openjdk7/jre/lib/zi/Africa/Accra -java/openjdk7/jre/lib/zi/Africa/Algiers -java/openjdk7/jre/lib/zi/Africa/Bissau -java/openjdk7/jre/lib/zi/Africa/Cairo -java/openjdk7/jre/lib/zi/Africa/Casablanca -java/openjdk7/jre/lib/zi/Africa/Ceuta -java/openjdk7/jre/lib/zi/Africa/El_Aaiun -java/openjdk7/jre/lib/zi/Africa/Johannesburg -java/openjdk7/jre/lib/zi/Africa/Khartoum -java/openjdk7/jre/lib/zi/Africa/Lagos -java/openjdk7/jre/lib/zi/Africa/Maputo -java/openjdk7/jre/lib/zi/Africa/Monrovia -java/openjdk7/jre/lib/zi/Africa/Nairobi -java/openjdk7/jre/lib/zi/Africa/Ndjamena -java/openjdk7/jre/lib/zi/Africa/Tripoli -java/openjdk7/jre/lib/zi/Africa/Tunis -java/openjdk7/jre/lib/zi/Africa/Windhoek -java/openjdk7/jre/lib/zi/America/Adak -java/openjdk7/jre/lib/zi/America/Anchorage -java/openjdk7/jre/lib/zi/America/Araguaina -java/openjdk7/jre/lib/zi/America/Argentina/Buenos_Aires -java/openjdk7/jre/lib/zi/America/Argentina/Catamarca -java/openjdk7/jre/lib/zi/America/Argentina/Cordoba -java/openjdk7/jre/lib/zi/America/Argentina/Jujuy -java/openjdk7/jre/lib/zi/America/Argentina/La_Rioja -java/openjdk7/jre/lib/zi/America/Argentina/Mendoza -java/openjdk7/jre/lib/zi/America/Argentina/Rio_Gallegos -java/openjdk7/jre/lib/zi/America/Argentina/Salta -java/openjdk7/jre/lib/zi/America/Argentina/San_Juan -java/openjdk7/jre/lib/zi/America/Argentina/San_Luis -java/openjdk7/jre/lib/zi/America/Argentina/Tucuman -java/openjdk7/jre/lib/zi/America/Argentina/Ushuaia -java/openjdk7/jre/lib/zi/America/Asuncion -java/openjdk7/jre/lib/zi/America/Atikokan -java/openjdk7/jre/lib/zi/America/Bahia -java/openjdk7/jre/lib/zi/America/Bahia_Banderas -java/openjdk7/jre/lib/zi/America/Barbados -java/openjdk7/jre/lib/zi/America/Belem -java/openjdk7/jre/lib/zi/America/Belize -java/openjdk7/jre/lib/zi/America/Blanc-Sablon -java/openjdk7/jre/lib/zi/America/Boa_Vista -java/openjdk7/jre/lib/zi/America/Bogota -java/openjdk7/jre/lib/zi/America/Boise -java/openjdk7/jre/lib/zi/America/Cambridge_Bay -java/openjdk7/jre/lib/zi/America/Campo_Grande -java/openjdk7/jre/lib/zi/America/Cancun -java/openjdk7/jre/lib/zi/America/Caracas -java/openjdk7/jre/lib/zi/America/Cayenne -java/openjdk7/jre/lib/zi/America/Chicago -java/openjdk7/jre/lib/zi/America/Chihuahua -java/openjdk7/jre/lib/zi/America/Costa_Rica -java/openjdk7/jre/lib/zi/America/Creston -java/openjdk7/jre/lib/zi/America/Cuiaba -java/openjdk7/jre/lib/zi/America/Curacao -java/openjdk7/jre/lib/zi/America/Danmarkshavn -java/openjdk7/jre/lib/zi/America/Dawson -java/openjdk7/jre/lib/zi/America/Dawson_Creek -java/openjdk7/jre/lib/zi/America/Denver -java/openjdk7/jre/lib/zi/America/Detroit -java/openjdk7/jre/lib/zi/America/Edmonton -java/openjdk7/jre/lib/zi/America/Eirunepe -java/openjdk7/jre/lib/zi/America/El_Salvador -java/openjdk7/jre/lib/zi/America/Fortaleza -java/openjdk7/jre/lib/zi/America/Fort_Nelson -java/openjdk7/jre/lib/zi/America/Glace_Bay -java/openjdk7/jre/lib/zi/America/Godthab -java/openjdk7/jre/lib/zi/America/Goose_Bay -java/openjdk7/jre/lib/zi/America/Grand_Turk -java/openjdk7/jre/lib/zi/America/Guatemala -java/openjdk7/jre/lib/zi/America/Guayaquil -java/openjdk7/jre/lib/zi/America/Guyana -java/openjdk7/jre/lib/zi/America/Halifax -java/openjdk7/jre/lib/zi/America/Havana -java/openjdk7/jre/lib/zi/America/Hermosillo -java/openjdk7/jre/lib/zi/America/Indiana/Indianapolis -java/openjdk7/jre/lib/zi/America/Indiana/Knox -java/openjdk7/jre/lib/zi/America/Indiana/Marengo -java/openjdk7/jre/lib/zi/America/Indiana/Petersburg -java/openjdk7/jre/lib/zi/America/Indiana/Tell_City -java/openjdk7/jre/lib/zi/America/Indiana/Vevay -java/openjdk7/jre/lib/zi/America/Indiana/Vincennes -java/openjdk7/jre/lib/zi/America/Indiana/Winamac -java/openjdk7/jre/lib/zi/America/Inuvik -java/openjdk7/jre/lib/zi/America/Iqaluit -java/openjdk7/jre/lib/zi/America/Jamaica -java/openjdk7/jre/lib/zi/America/Juneau -java/openjdk7/jre/lib/zi/America/Kentucky/Louisville -java/openjdk7/jre/lib/zi/America/Kentucky/Monticello -java/openjdk7/jre/lib/zi/America/La_Paz -java/openjdk7/jre/lib/zi/America/Lima -java/openjdk7/jre/lib/zi/America/Los_Angeles -java/openjdk7/jre/lib/zi/America/Maceio -java/openjdk7/jre/lib/zi/America/Managua -java/openjdk7/jre/lib/zi/America/Manaus -java/openjdk7/jre/lib/zi/America/Martinique -java/openjdk7/jre/lib/zi/America/Matamoros -java/openjdk7/jre/lib/zi/America/Mazatlan -java/openjdk7/jre/lib/zi/America/Menominee -java/openjdk7/jre/lib/zi/America/Merida -java/openjdk7/jre/lib/zi/America/Metlakatla -java/openjdk7/jre/lib/zi/America/Mexico_City -java/openjdk7/jre/lib/zi/America/Miquelon -java/openjdk7/jre/lib/zi/America/Moncton -java/openjdk7/jre/lib/zi/America/Monterrey -java/openjdk7/jre/lib/zi/America/Montevideo -java/openjdk7/jre/lib/zi/America/Nassau -java/openjdk7/jre/lib/zi/America/New_York -java/openjdk7/jre/lib/zi/America/Nipigon -java/openjdk7/jre/lib/zi/America/Nome -java/openjdk7/jre/lib/zi/America/Noronha -java/openjdk7/jre/lib/zi/America/North_Dakota/Beulah -java/openjdk7/jre/lib/zi/America/North_Dakota/Center -java/openjdk7/jre/lib/zi/America/North_Dakota/New_Salem -java/openjdk7/jre/lib/zi/America/Ojinaga -java/openjdk7/jre/lib/zi/America/Panama -java/openjdk7/jre/lib/zi/America/Pangnirtung -java/openjdk7/jre/lib/zi/America/Paramaribo -java/openjdk7/jre/lib/zi/America/Phoenix -java/openjdk7/jre/lib/zi/America/Port-au-Prince -java/openjdk7/jre/lib/zi/America/Port_of_Spain -java/openjdk7/jre/lib/zi/America/Porto_Velho -java/openjdk7/jre/lib/zi/America/Puerto_Rico -java/openjdk7/jre/lib/zi/America/Punta_Arenas -java/openjdk7/jre/lib/zi/America/Rainy_River -java/openjdk7/jre/lib/zi/America/Rankin_Inlet -java/openjdk7/jre/lib/zi/America/Recife -java/openjdk7/jre/lib/zi/America/Regina -java/openjdk7/jre/lib/zi/America/Resolute -java/openjdk7/jre/lib/zi/America/Rio_Branco -java/openjdk7/jre/lib/zi/America/Santarem -java/openjdk7/jre/lib/zi/America/Santiago -java/openjdk7/jre/lib/zi/America/Santo_Domingo -java/openjdk7/jre/lib/zi/America/Sao_Paulo -java/openjdk7/jre/lib/zi/America/Scoresbysund -java/openjdk7/jre/lib/zi/America/Sitka -java/openjdk7/jre/lib/zi/America/St_Johns -java/openjdk7/jre/lib/zi/America/Swift_Current -java/openjdk7/jre/lib/zi/America/Tegucigalpa -java/openjdk7/jre/lib/zi/America/Thule -java/openjdk7/jre/lib/zi/America/Thunder_Bay -java/openjdk7/jre/lib/zi/America/Tijuana -java/openjdk7/jre/lib/zi/America/Toronto -java/openjdk7/jre/lib/zi/America/Vancouver -java/openjdk7/jre/lib/zi/America/Whitehorse -java/openjdk7/jre/lib/zi/America/Winnipeg -java/openjdk7/jre/lib/zi/America/Yakutat -java/openjdk7/jre/lib/zi/America/Yellowknife -java/openjdk7/jre/lib/zi/Antarctica/Casey -java/openjdk7/jre/lib/zi/Antarctica/Davis -java/openjdk7/jre/lib/zi/Antarctica/DumontDUrville -java/openjdk7/jre/lib/zi/Antarctica/Macquarie -java/openjdk7/jre/lib/zi/Antarctica/Mawson -java/openjdk7/jre/lib/zi/Antarctica/Palmer -java/openjdk7/jre/lib/zi/Antarctica/Rothera -java/openjdk7/jre/lib/zi/Antarctica/Syowa -java/openjdk7/jre/lib/zi/Antarctica/Troll -java/openjdk7/jre/lib/zi/Antarctica/Vostok -java/openjdk7/jre/lib/zi/Asia/Almaty -java/openjdk7/jre/lib/zi/Asia/Amman -java/openjdk7/jre/lib/zi/Asia/Anadyr -java/openjdk7/jre/lib/zi/Asia/Aqtau -java/openjdk7/jre/lib/zi/Asia/Aqtobe -java/openjdk7/jre/lib/zi/Asia/Ashgabat -java/openjdk7/jre/lib/zi/Asia/Atyrau -java/openjdk7/jre/lib/zi/Asia/Baghdad -java/openjdk7/jre/lib/zi/Asia/Baku -java/openjdk7/jre/lib/zi/Asia/Barnaul -java/openjdk7/jre/lib/zi/Asia/Bangkok -java/openjdk7/jre/lib/zi/Asia/Beirut -java/openjdk7/jre/lib/zi/Asia/Bishkek -java/openjdk7/jre/lib/zi/Asia/Brunei -java/openjdk7/jre/lib/zi/Asia/Chita -java/openjdk7/jre/lib/zi/Asia/Choibalsan -java/openjdk7/jre/lib/zi/Asia/Colombo -java/openjdk7/jre/lib/zi/Asia/Damascus -java/openjdk7/jre/lib/zi/Asia/Dhaka -java/openjdk7/jre/lib/zi/Asia/Dili -java/openjdk7/jre/lib/zi/Asia/Dubai -java/openjdk7/jre/lib/zi/Asia/Dushanbe -java/openjdk7/jre/lib/zi/Asia/Famagusta -java/openjdk7/jre/lib/zi/Asia/Gaza -java/openjdk7/jre/lib/zi/Asia/Hebron -java/openjdk7/jre/lib/zi/Asia/Ho_Chi_Minh -java/openjdk7/jre/lib/zi/Asia/Hong_Kong -java/openjdk7/jre/lib/zi/Asia/Hovd -java/openjdk7/jre/lib/zi/Asia/Irkutsk -java/openjdk7/jre/lib/zi/Asia/Jakarta -java/openjdk7/jre/lib/zi/Asia/Jayapura -java/openjdk7/jre/lib/zi/Asia/Jerusalem -java/openjdk7/jre/lib/zi/Asia/Kabul -java/openjdk7/jre/lib/zi/Asia/Kamchatka -java/openjdk7/jre/lib/zi/Asia/Karachi -java/openjdk7/jre/lib/zi/Asia/Kathmandu -java/openjdk7/jre/lib/zi/Asia/Khandyga -java/openjdk7/jre/lib/zi/Asia/Kolkata -java/openjdk7/jre/lib/zi/Asia/Krasnoyarsk -java/openjdk7/jre/lib/zi/Asia/Kuala_Lumpur -java/openjdk7/jre/lib/zi/Asia/Kuching -java/openjdk7/jre/lib/zi/Asia/Macau -java/openjdk7/jre/lib/zi/Asia/Magadan -java/openjdk7/jre/lib/zi/Asia/Makassar -java/openjdk7/jre/lib/zi/Asia/Manila -java/openjdk7/jre/lib/zi/Asia/Nicosia -java/openjdk7/jre/lib/zi/Asia/Novokuznetsk -java/openjdk7/jre/lib/zi/Asia/Novosibirsk -java/openjdk7/jre/lib/zi/Asia/Omsk -java/openjdk7/jre/lib/zi/Asia/Oral -java/openjdk7/jre/lib/zi/Asia/Pontianak -java/openjdk7/jre/lib/zi/Asia/Pyongyang -java/openjdk7/jre/lib/zi/Asia/Qatar -java/openjdk7/jre/lib/zi/Asia/Qyzylorda -java/openjdk7/jre/lib/zi/Asia/Riyadh -java/openjdk7/jre/lib/zi/Asia/Riyadh87 -java/openjdk7/jre/lib/zi/Asia/Riyadh88 -java/openjdk7/jre/lib/zi/Asia/Riyadh89 -java/openjdk7/jre/lib/zi/Asia/Sakhalin -java/openjdk7/jre/lib/zi/Asia/Samarkand -java/openjdk7/jre/lib/zi/Asia/Seoul -java/openjdk7/jre/lib/zi/Asia/Shanghai -java/openjdk7/jre/lib/zi/Asia/Singapore -java/openjdk7/jre/lib/zi/Asia/Srednekolymsk -java/openjdk7/jre/lib/zi/Asia/Taipei -java/openjdk7/jre/lib/zi/Asia/Tashkent -java/openjdk7/jre/lib/zi/Asia/Tbilisi -java/openjdk7/jre/lib/zi/Asia/Tehran -java/openjdk7/jre/lib/zi/Asia/Thimphu -java/openjdk7/jre/lib/zi/Asia/Tokyo -java/openjdk7/jre/lib/zi/Asia/Tomsk -java/openjdk7/jre/lib/zi/Asia/Ulaanbaatar -java/openjdk7/jre/lib/zi/Asia/Urumqi -java/openjdk7/jre/lib/zi/Asia/Ust-Nera -java/openjdk7/jre/lib/zi/Asia/Vladivostok -java/openjdk7/jre/lib/zi/Asia/Yakutsk -java/openjdk7/jre/lib/zi/Asia/Yekaterinburg -java/openjdk7/jre/lib/zi/Asia/Yangon -java/openjdk7/jre/lib/zi/Asia/Yerevan -java/openjdk7/jre/lib/zi/Atlantic/Azores -java/openjdk7/jre/lib/zi/Atlantic/Bermuda -java/openjdk7/jre/lib/zi/Atlantic/Canary -java/openjdk7/jre/lib/zi/Atlantic/Cape_Verde -java/openjdk7/jre/lib/zi/Atlantic/Faroe -java/openjdk7/jre/lib/zi/Atlantic/Madeira -java/openjdk7/jre/lib/zi/Atlantic/Reykjavik -java/openjdk7/jre/lib/zi/Atlantic/South_Georgia -java/openjdk7/jre/lib/zi/Atlantic/Stanley -java/openjdk7/jre/lib/zi/Australia/Adelaide -java/openjdk7/jre/lib/zi/Australia/Brisbane -java/openjdk7/jre/lib/zi/Australia/Broken_Hill -java/openjdk7/jre/lib/zi/Australia/Currie -java/openjdk7/jre/lib/zi/Australia/Darwin -java/openjdk7/jre/lib/zi/Australia/Eucla -java/openjdk7/jre/lib/zi/Australia/Hobart -java/openjdk7/jre/lib/zi/Australia/Lindeman -java/openjdk7/jre/lib/zi/Australia/Lord_Howe -java/openjdk7/jre/lib/zi/Australia/Melbourne -java/openjdk7/jre/lib/zi/Australia/Perth -java/openjdk7/jre/lib/zi/Australia/Sydney -java/openjdk7/jre/lib/zi/CET -java/openjdk7/jre/lib/zi/CST6CDT -java/openjdk7/jre/lib/zi/EET -java/openjdk7/jre/lib/zi/EST -java/openjdk7/jre/lib/zi/EST5EDT -java/openjdk7/jre/lib/zi/Etc/GMT -java/openjdk7/jre/lib/zi/Etc/GMT+1 -java/openjdk7/jre/lib/zi/Etc/GMT+10 -java/openjdk7/jre/lib/zi/Etc/GMT+11 -java/openjdk7/jre/lib/zi/Etc/GMT+12 -java/openjdk7/jre/lib/zi/Etc/GMT+2 -java/openjdk7/jre/lib/zi/Etc/GMT+3 -java/openjdk7/jre/lib/zi/Etc/GMT+4 -java/openjdk7/jre/lib/zi/Etc/GMT+5 -java/openjdk7/jre/lib/zi/Etc/GMT+6 -java/openjdk7/jre/lib/zi/Etc/GMT+7 -java/openjdk7/jre/lib/zi/Etc/GMT+8 -java/openjdk7/jre/lib/zi/Etc/GMT+9 -java/openjdk7/jre/lib/zi/Etc/GMT-1 -java/openjdk7/jre/lib/zi/Etc/GMT-10 -java/openjdk7/jre/lib/zi/Etc/GMT-11 -java/openjdk7/jre/lib/zi/Etc/GMT-12 -java/openjdk7/jre/lib/zi/Etc/GMT-13 -java/openjdk7/jre/lib/zi/Etc/GMT-14 -java/openjdk7/jre/lib/zi/Etc/GMT-2 -java/openjdk7/jre/lib/zi/Etc/GMT-3 -java/openjdk7/jre/lib/zi/Etc/GMT-4 -java/openjdk7/jre/lib/zi/Etc/GMT-5 -java/openjdk7/jre/lib/zi/Etc/GMT-6 -java/openjdk7/jre/lib/zi/Etc/GMT-7 -java/openjdk7/jre/lib/zi/Etc/GMT-8 -java/openjdk7/jre/lib/zi/Etc/GMT-9 -java/openjdk7/jre/lib/zi/Etc/UCT -java/openjdk7/jre/lib/zi/Etc/UTC -java/openjdk7/jre/lib/zi/Europe/Amsterdam -java/openjdk7/jre/lib/zi/Europe/Andorra -java/openjdk7/jre/lib/zi/Europe/Astrakhan -java/openjdk7/jre/lib/zi/Europe/Athens -java/openjdk7/jre/lib/zi/Europe/Belgrade -java/openjdk7/jre/lib/zi/Europe/Berlin -java/openjdk7/jre/lib/zi/Europe/Brussels -java/openjdk7/jre/lib/zi/Europe/Bucharest -java/openjdk7/jre/lib/zi/Europe/Budapest -java/openjdk7/jre/lib/zi/Europe/Chisinau -java/openjdk7/jre/lib/zi/Europe/Copenhagen -java/openjdk7/jre/lib/zi/Europe/Dublin -java/openjdk7/jre/lib/zi/Europe/Gibraltar -java/openjdk7/jre/lib/zi/Europe/Helsinki -java/openjdk7/jre/lib/zi/Europe/Istanbul -java/openjdk7/jre/lib/zi/Europe/Kaliningrad -java/openjdk7/jre/lib/zi/Europe/Kiev -java/openjdk7/jre/lib/zi/Europe/Kirov -java/openjdk7/jre/lib/zi/Europe/Lisbon -java/openjdk7/jre/lib/zi/Europe/London -java/openjdk7/jre/lib/zi/Europe/Luxembourg -java/openjdk7/jre/lib/zi/Europe/Madrid -java/openjdk7/jre/lib/zi/Europe/Malta -java/openjdk7/jre/lib/zi/Europe/Minsk -java/openjdk7/jre/lib/zi/Europe/Monaco -java/openjdk7/jre/lib/zi/Europe/Moscow -java/openjdk7/jre/lib/zi/Europe/Oslo -java/openjdk7/jre/lib/zi/Europe/Paris -java/openjdk7/jre/lib/zi/Europe/Prague -java/openjdk7/jre/lib/zi/Europe/Riga -java/openjdk7/jre/lib/zi/Europe/Rome -java/openjdk7/jre/lib/zi/Europe/Samara -java/openjdk7/jre/lib/zi/Europe/Saratov -java/openjdk7/jre/lib/zi/Europe/Simferopol -java/openjdk7/jre/lib/zi/Europe/Sofia -java/openjdk7/jre/lib/zi/Europe/Stockholm -java/openjdk7/jre/lib/zi/Europe/Tallinn -java/openjdk7/jre/lib/zi/Europe/Tirane -java/openjdk7/jre/lib/zi/Europe/Ulyanovsk -java/openjdk7/jre/lib/zi/Europe/Uzhgorod -java/openjdk7/jre/lib/zi/Europe/Vienna -java/openjdk7/jre/lib/zi/Europe/Vilnius -java/openjdk7/jre/lib/zi/Europe/Volgograd -java/openjdk7/jre/lib/zi/Europe/Warsaw -java/openjdk7/jre/lib/zi/Europe/Zaporozhye -java/openjdk7/jre/lib/zi/Europe/Zurich -java/openjdk7/jre/lib/zi/GMT -java/openjdk7/jre/lib/zi/HST -java/openjdk7/jre/lib/zi/Indian/Chagos -java/openjdk7/jre/lib/zi/Indian/Christmas -java/openjdk7/jre/lib/zi/Indian/Cocos -java/openjdk7/jre/lib/zi/Indian/Kerguelen -java/openjdk7/jre/lib/zi/Indian/Mahe -java/openjdk7/jre/lib/zi/Indian/Maldives -java/openjdk7/jre/lib/zi/Indian/Mauritius -java/openjdk7/jre/lib/zi/Indian/Reunion -java/openjdk7/jre/lib/zi/MET -java/openjdk7/jre/lib/zi/MST -java/openjdk7/jre/lib/zi/MST7MDT -java/openjdk7/jre/lib/zi/PST8PDT -java/openjdk7/jre/lib/zi/Pacific/Apia -java/openjdk7/jre/lib/zi/Pacific/Auckland -java/openjdk7/jre/lib/zi/Pacific/Bougainville -java/openjdk7/jre/lib/zi/Pacific/Chatham -java/openjdk7/jre/lib/zi/Pacific/Chuuk -java/openjdk7/jre/lib/zi/Pacific/Easter -java/openjdk7/jre/lib/zi/Pacific/Efate -java/openjdk7/jre/lib/zi/Pacific/Enderbury -java/openjdk7/jre/lib/zi/Pacific/Fakaofo -java/openjdk7/jre/lib/zi/Pacific/Fiji -java/openjdk7/jre/lib/zi/Pacific/Funafuti -java/openjdk7/jre/lib/zi/Pacific/Galapagos -java/openjdk7/jre/lib/zi/Pacific/Gambier -java/openjdk7/jre/lib/zi/Pacific/Guadalcanal -java/openjdk7/jre/lib/zi/Pacific/Guam -java/openjdk7/jre/lib/zi/Pacific/Honolulu -java/openjdk7/jre/lib/zi/Pacific/Kiritimati -java/openjdk7/jre/lib/zi/Pacific/Kosrae -java/openjdk7/jre/lib/zi/Pacific/Kwajalein -java/openjdk7/jre/lib/zi/Pacific/Majuro -java/openjdk7/jre/lib/zi/Pacific/Marquesas -java/openjdk7/jre/lib/zi/Pacific/Nauru -java/openjdk7/jre/lib/zi/Pacific/Niue -java/openjdk7/jre/lib/zi/Pacific/Norfolk -java/openjdk7/jre/lib/zi/Pacific/Noumea -java/openjdk7/jre/lib/zi/Pacific/Pago_Pago -java/openjdk7/jre/lib/zi/Pacific/Palau -java/openjdk7/jre/lib/zi/Pacific/Pitcairn -java/openjdk7/jre/lib/zi/Pacific/Pohnpei -java/openjdk7/jre/lib/zi/Pacific/Port_Moresby -java/openjdk7/jre/lib/zi/Pacific/Rarotonga -java/openjdk7/jre/lib/zi/Pacific/Tahiti -java/openjdk7/jre/lib/zi/Pacific/Tarawa -java/openjdk7/jre/lib/zi/Pacific/Tongatapu -java/openjdk7/jre/lib/zi/Pacific/Wake -java/openjdk7/jre/lib/zi/Pacific/Wallis -java/openjdk7/jre/lib/zi/SystemV/AST4 -java/openjdk7/jre/lib/zi/SystemV/AST4ADT -java/openjdk7/jre/lib/zi/SystemV/CST6 -java/openjdk7/jre/lib/zi/SystemV/CST6CDT -java/openjdk7/jre/lib/zi/SystemV/EST5 -java/openjdk7/jre/lib/zi/SystemV/EST5EDT -java/openjdk7/jre/lib/zi/SystemV/HST10 -java/openjdk7/jre/lib/zi/SystemV/MST7 -java/openjdk7/jre/lib/zi/SystemV/MST7MDT -java/openjdk7/jre/lib/zi/SystemV/PST8 -java/openjdk7/jre/lib/zi/SystemV/PST8PDT -java/openjdk7/jre/lib/zi/SystemV/YST9 -java/openjdk7/jre/lib/zi/SystemV/YST9YDT -java/openjdk7/jre/lib/zi/WET -java/openjdk7/jre/lib/zi/ZoneInfoMappings -java/openjdk7/lib/ct.sym -java/openjdk7/lib/ir.idl -java/openjdk7/lib/jconsole.jar -java/openjdk7/lib/orb.idl -${PLIST.native}java/openjdk7/lib/sa-jdi.jar -java/openjdk7/lib/tools.jar -java/openjdk7/man/man1/appletviewer.1 -java/openjdk7/man/man1/apt.1 -java/openjdk7/man/man1/extcheck.1 -java/openjdk7/man/man1/idlj.1 -java/openjdk7/man/man1/jar.1 -java/openjdk7/man/man1/jarsigner.1 -java/openjdk7/man/man1/java.1 -java/openjdk7/man/man1/javac.1 -java/openjdk7/man/man1/javadoc.1 -java/openjdk7/man/man1/javah.1 -java/openjdk7/man/man1/javap.1 -java/openjdk7/man/man1/jcmd.1 -java/openjdk7/man/man1/jconsole.1 -java/openjdk7/man/man1/jdb.1 -java/openjdk7/man/man1/jhat.1 -java/openjdk7/man/man1/jinfo.1 -java/openjdk7/man/man1/jmap.1 -java/openjdk7/man/man1/jps.1 -java/openjdk7/man/man1/jrunscript.1 -java/openjdk7/man/man1/jsadebugd.1 -java/openjdk7/man/man1/jstack.1 -java/openjdk7/man/man1/jstat.1 -java/openjdk7/man/man1/jstatd.1 -java/openjdk7/man/man1/keytool.1 -java/openjdk7/man/man1/native2ascii.1 -java/openjdk7/man/man1/orbd.1 -java/openjdk7/man/man1/pack200.1 -java/openjdk7/man/man1/policytool.1 -java/openjdk7/man/man1/rmic.1 -java/openjdk7/man/man1/rmid.1 -java/openjdk7/man/man1/rmiregistry.1 -java/openjdk7/man/man1/schemagen.1 -java/openjdk7/man/man1/serialver.1 -java/openjdk7/man/man1/servertool.1 -java/openjdk7/man/man1/tnameserv.1 -java/openjdk7/man/man1/unpack200.1 -java/openjdk7/man/man1/wsgen.1 -java/openjdk7/man/man1/wsimport.1 -java/openjdk7/man/man1/xjc.1 -java/openjdk7/release -java/openjdk7/sample/README -java/openjdk7/sample/forkjoin/mergesort/MergeDemo.java -java/openjdk7/sample/forkjoin/mergesort/MergeSort.java -java/openjdk7/sample/jmx/jmx-scandir/build.properties -java/openjdk7/sample/jmx/jmx-scandir/build.xml -java/openjdk7/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg -java/openjdk7/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg -java/openjdk7/sample/jmx/jmx-scandir/docfiles/connect-local.jpg -java/openjdk7/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg -java/openjdk7/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg -java/openjdk7/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg -java/openjdk7/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg -java/openjdk7/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg -java/openjdk7/sample/jmx/jmx-scandir/index.html -java/openjdk7/sample/jmx/jmx-scandir/keystore -java/openjdk7/sample/jmx/jmx-scandir/logging.properties -java/openjdk7/sample/jmx/jmx-scandir/manifest.mf -java/openjdk7/sample/jmx/jmx-scandir/nbproject/file-targets.xml -java/openjdk7/sample/jmx/jmx-scandir/nbproject/jdk.xml -java/openjdk7/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml -java/openjdk7/sample/jmx/jmx-scandir/nbproject/project.xml -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultRecord.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html -java/openjdk7/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html -java/openjdk7/sample/jmx/jmx-scandir/src/etc/access.properties -java/openjdk7/sample/jmx/jmx-scandir/src/etc/management.properties -java/openjdk7/sample/jmx/jmx-scandir/src/etc/password.properties -java/openjdk7/sample/jmx/jmx-scandir/src/etc/testconfig.xml -java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java -java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java -java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java -java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java -java/openjdk7/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java -java/openjdk7/sample/jmx/jmx-scandir/truststore -java/openjdk7/sample/nbproject/project.xml -java/openjdk7/sample/nio/chatserver/ChatServer.java -java/openjdk7/sample/nio/chatserver/Client.java -java/openjdk7/sample/nio/chatserver/ClientReader.java -java/openjdk7/sample/nio/chatserver/DataReader.java -java/openjdk7/sample/nio/chatserver/MessageReader.java -java/openjdk7/sample/nio/chatserver/NameReader.java -java/openjdk7/sample/nio/chatserver/README.txt -java/openjdk7/sample/nio/file/AclEdit.java -java/openjdk7/sample/nio/file/Chmod.java -java/openjdk7/sample/nio/file/Copy.java -java/openjdk7/sample/nio/file/DiskUsage.java -java/openjdk7/sample/nio/file/FileType.java -java/openjdk7/sample/nio/file/WatchDir.java -java/openjdk7/sample/nio/file/Xdd.java -java/openjdk7/sample/nio/multicast/MulticastAddress.java -java/openjdk7/sample/nio/multicast/Reader.java -java/openjdk7/sample/nio/multicast/Sender.java -java/openjdk7/sample/nio/server/AcceptHandler.java -java/openjdk7/sample/nio/server/Acceptor.java -java/openjdk7/sample/nio/server/B1.java -java/openjdk7/sample/nio/server/BN.java -java/openjdk7/sample/nio/server/BP.java -java/openjdk7/sample/nio/server/ChannelIO.java -java/openjdk7/sample/nio/server/ChannelIOSecure.java -java/openjdk7/sample/nio/server/Content.java -java/openjdk7/sample/nio/server/Dispatcher.java -java/openjdk7/sample/nio/server/Dispatcher1.java -java/openjdk7/sample/nio/server/DispatcherN.java -java/openjdk7/sample/nio/server/FileContent.java -java/openjdk7/sample/nio/server/Handler.java -java/openjdk7/sample/nio/server/MalformedRequestException.java -java/openjdk7/sample/nio/server/N1.java -java/openjdk7/sample/nio/server/N2.java -java/openjdk7/sample/nio/server/README.txt -java/openjdk7/sample/nio/server/Reply.java -java/openjdk7/sample/nio/server/Request.java -java/openjdk7/sample/nio/server/RequestHandler.java -java/openjdk7/sample/nio/server/RequestServicer.java -java/openjdk7/sample/nio/server/Sendable.java -java/openjdk7/sample/nio/server/Server.java -java/openjdk7/sample/nio/server/StringContent.java -java/openjdk7/sample/nio/server/URLDumper.java -java/openjdk7/sample/scripting/scriptpad/README.txt -java/openjdk7/sample/scripting/scriptpad/build.properties -java/openjdk7/sample/scripting/scriptpad/build.xml -java/openjdk7/sample/scripting/scriptpad/nbproject/file-targets.xml -java/openjdk7/sample/scripting/scriptpad/nbproject/jdk.xml -java/openjdk7/sample/scripting/scriptpad/nbproject/netbeans-targets.xml -java/openjdk7/sample/scripting/scriptpad/nbproject/project.xml -java/openjdk7/sample/scripting/scriptpad/src/META-INF/manifest.mf -java/openjdk7/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java -java/openjdk7/sample/scripting/scriptpad/src/resources/Main.js -java/openjdk7/sample/scripting/scriptpad/src/resources/conc.js -java/openjdk7/sample/scripting/scriptpad/src/resources/gui.js -java/openjdk7/sample/scripting/scriptpad/src/resources/mm.js -java/openjdk7/sample/scripting/scriptpad/src/resources/scriptpad.js -java/openjdk7/sample/scripting/scriptpad/src/scripts/README.txt -java/openjdk7/sample/scripting/scriptpad/src/scripts/browse.js -java/openjdk7/sample/scripting/scriptpad/src/scripts/insertfile.js -java/openjdk7/sample/scripting/scriptpad/src/scripts/linewrap.js -java/openjdk7/sample/scripting/scriptpad/src/scripts/mail.js -java/openjdk7/sample/scripting/scriptpad/src/scripts/memmonitor.js -java/openjdk7/sample/scripting/scriptpad/src/scripts/memory.bat -java/openjdk7/sample/scripting/scriptpad/src/scripts/memory.js -java/openjdk7/sample/scripting/scriptpad/src/scripts/memory.sh -java/openjdk7/sample/scripting/scriptpad/src/scripts/textcolor.js -java/openjdk7/src.zip diff --git a/lang/openjdk7/PLIST.SunOS b/lang/openjdk7/PLIST.SunOS deleted file mode 100644 index 62361791500..00000000000 --- a/lang/openjdk7/PLIST.SunOS +++ /dev/null @@ -1,35 +0,0 @@ -@comment $NetBSD: PLIST.SunOS,v 1.6 2015/02/10 14:57:35 tnn Exp $ -java/openjdk7/demo/jni/Poller/lib/libPoller.so -java/openjdk7/demo/jni/Poller/Poller.jar -java/openjdk7/demo/jni/Poller/README.txt -java/openjdk7/demo/jni/Poller/src.zip -${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.so -${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.so -${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.so -${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_dtrace.so -java/openjdk7/jre/lib/${ARCH}/libfreetype.so.6 -java/openjdk7/jre/lib/${ARCH}/libsctp.so -${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.so -${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_dtrace.so -java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.so -java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.so -java/openjdk7/jre/lib/sdp/sdp.conf.template -java/openjdk7/jre/lib/security/sunpkcs11-solaris.cfg -java/openjdk7/lib/${ARCH}/jli/libjli.so -java/openjdk7/sample/dtrace/helpers/dtrace_helper.d -java/openjdk7/sample/dtrace/hotspot_jni/CriticalSection_slow.d -java/openjdk7/sample/dtrace/hotspot_jni/CriticalSection.d -java/openjdk7/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d -java/openjdk7/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d -java/openjdk7/sample/dtrace/hotspot_jni/README.txt -java/openjdk7/sample/dtrace/hotspot/class_loading_stat.d -java/openjdk7/sample/dtrace/hotspot/gc_time_stat.d -java/openjdk7/sample/dtrace/hotspot/hotspot_calls_tree.d -java/openjdk7/sample/dtrace/hotspot/method_compile_stat.d -java/openjdk7/sample/dtrace/hotspot/method_invocation_stat_filter.d -java/openjdk7/sample/dtrace/hotspot/method_invocation_stat.d -java/openjdk7/sample/dtrace/hotspot/method_invocation_tree.d -java/openjdk7/sample/dtrace/hotspot/monitors.d -java/openjdk7/sample/dtrace/hotspot/object_allocation_stat.d -java/openjdk7/sample/dtrace/hotspot/README.txt -java/openjdk7/sample/dtrace/README.txt diff --git a/lang/openjdk7/PLIST.debug b/lang/openjdk7/PLIST.debug deleted file mode 100644 index 03be9be861e..00000000000 --- a/lang/openjdk7/PLIST.debug +++ /dev/null @@ -1,37 +0,0 @@ -@comment $NetBSD: PLIST.debug,v 1.1 2015/02/08 23:40:09 tnn Exp $ -java/openjdk7/jre/lib/${ARCH}/jexec.debuginfo -java/openjdk7/jre/lib/${ARCH}/jli/libjli.debuginfo -java/openjdk7/jre/lib/${ARCH}/libattach.debuginfo -java/openjdk7/jre/lib/${ARCH}/libawt.debuginfo -java/openjdk7/jre/lib/${ARCH}/libawt_headless.debuginfo -java/openjdk7/jre/lib/${ARCH}/libdt_socket.debuginfo -java/openjdk7/jre/lib/${ARCH}/libfontmanager.debuginfo -java/openjdk7/jre/lib/${ARCH}/libhprof.debuginfo -java/openjdk7/jre/lib/${ARCH}/libinstrument.debuginfo -java/openjdk7/jre/lib/${ARCH}/libj2gss.debuginfo -java/openjdk7/jre/lib/${ARCH}/libj2pcsc.debuginfo -java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjaas_unix.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjava.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjawt.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjdwp.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjpeg.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjsdt.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjsig.debuginfo -java/openjdk7/jre/lib/${ARCH}/libjsound.debuginfo -java/openjdk7/jre/lib/${ARCH}/liblcms.debuginfo -java/openjdk7/jre/lib/${ARCH}/libmanagement.debuginfo -java/openjdk7/jre/lib/${ARCH}/libmlib_image.debuginfo -java/openjdk7/jre/lib/${ARCH}/libnet.debuginfo -java/openjdk7/jre/lib/${ARCH}/libnio.debuginfo -java/openjdk7/jre/lib/${ARCH}/libnpt.debuginfo -java/openjdk7/jre/lib/${ARCH}/libsaproc.debuginfo -java/openjdk7/jre/lib/${ARCH}/libsctp.debuginfo -java/openjdk7/jre/lib/${ARCH}/libsplashscreen.debuginfo -java/openjdk7/jre/lib/${ARCH}/libsunec.debuginfo -java/openjdk7/jre/lib/${ARCH}/libunpack.debuginfo -java/openjdk7/jre/lib/${ARCH}/libverify.debuginfo -java/openjdk7/jre/lib/${ARCH}/libzip.debuginfo -java/openjdk7/jre/lib/${ARCH}/server/libjsig.debuginfo -java/openjdk7/jre/lib/${ARCH}/server/libjvm.debuginfo diff --git a/lang/openjdk7/bootstrap.mk b/lang/openjdk7/bootstrap.mk deleted file mode 100644 index 2993fdfa2b1..00000000000 --- a/lang/openjdk7/bootstrap.mk +++ /dev/null @@ -1,97 +0,0 @@ -# $NetBSD: bootstrap.mk,v 1.23 2019/09/22 15:16:26 tnn Exp $ -# -# This file contains a map of available binary bootstrap toolchains -# and which kit to use for each supported platform. -# -# Instructions for regenerating a bootstrap kit: -# 1) Prepare a new chroot environment in which to build the kit -# 2) If the running kernel version is not a release, use pkgtools/libkver -# 3) Disable the x11 PKG_OPTION in openjdk7 -# 4) "make" -# 5) cd $(make show-var VARNAME=BUILDDIR) -# 6) mv j2sdk-image bootstrap -# 7) cd bootstrap; rm -r demo man release sample src.zip -# 8) When preparing kits for NetBSD 7 and above with gcc, copy libgcc_s.so.* -# and libstdc++.so.* from base to bootstrap/jre/lib/${LIBDIR_ARCH}. -# This will ensure that MKLLVM=yes/MKGCC=no user in the future can run -# the bootstrap toolchain. For targets that use jdk-zero-vm you need -# to include libffi.so.* as well. -# 9) tar cf - bootstrap | xz -9c > bootstrap-xxx.tar.xz -# 10) gpg2 -a --detach-sign bootstrap-xxx.tar.xz -# 11) Upload archive and signature to ${MASTER_SITE_LOCAL:=openjdk7/} -# -# All binary kits from now on MUST have an accompanying PGP signature from -# the person who prepared the kit. Unsigned binaries on ftp will be purged. - -ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 -ONLY_FOR_PLATFORM+= NetBSD-*-sparc64 NetBSD-*-earmv[67]hf -ONLY_FOR_PLATFORM+= NetBSD-*-aarch64 -ONLY_FOR_PLATFORM+= DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64 - -BOOT.nb5-i386= bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz -BOOT.nb5-amd64= bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz -BOOT.nb6-i386= bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz -BOOT.nb6-amd64= bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz -BOOT.nb7-i386= bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz -BOOT.nb7-amd64= bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz -BOOT.nb7-sparc64= bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz -BOOT.nb7-earmv6hf= bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz -BOOT.nb8-aarch64= bootstrap-jdk-1.7.141-netbsd-8-aarch64-20180914.tar.xz -BOOT.fbsd10-amd64= bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz - -#XXX should be regenerated -BOOT.dfly3.6-amd64= bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2 -BOOT.dfly3.8-amd64= bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2 - -.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) -DISTFILES+= ${BOOT.nb7-i386} -EXTRACT_ONLY+= ${BOOT.nb7-i386} -.endif - -.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) -DISTFILES+= ${BOOT.nb7-amd64} -EXTRACT_ONLY+= ${BOOT.nb7-amd64} -.endif - -.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) -DISTFILES+= ${BOOT.nb7-sparc64} -EXTRACT_ONLY+= ${BOOT.nb7-sparc64} -.endif - -.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo) -DISTFILES+= ${BOOT.nb7-earmv6hf} -EXTRACT_ONLY+= ${BOOT.nb7-earmv6hf} -.endif - -.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) -DISTFILES+= ${BOOT.nb8-aarch64} -EXTRACT_ONLY+= ${BOOT.nb8-aarch64} -.endif - -.if !empty(MACHINE_PLATFORM:MDragonFly-3.6*-x86_64) || make(distinfo) -DISTFILES+= ${BOOT.dfly3.6-amd64} -EXTRACT_ONLY+= ${BOOT.dfly3.6-amd64} -.endif - -.if !empty(MACHINE_PLATFORM:MDragonFly-3.[8-9]*-x86_64) || !empty(MACHINE_PLATFORM:MDragonFly-4.*-x86_64) || make(distinfo) -DISTFILES+= ${BOOT.dfly3.8-amd64} -EXTRACT_ONLY+= ${BOOT.dfly3.8-amd64} -.endif - -.if !empty(MACHINE_PLATFORM:MFreeBSD-10.*-x86_64) || make(distinfo) -DISTFILES+= ${BOOT.fbsd10-amd64} -EXTRACT_ONLY+= ${BOOT.fbsd10-amd64} -.endif - -.if ${OPSYS} == "SunOS" -BUILDLINK_DEPMETHOD.sun-jdk7?= build -.include "../../lang/sun-jdk7/buildlink3.mk" -#NB: sun-jdk7 includes sun-jre7/buildlink3.mk -post-extract: copy-bootstrap-jdk -.PHONY: copy-bootstrap-jdk -copy-bootstrap-jdk: - ${MKDIR} ${ALT_BOOTDIR} - cd ${BUILDLINK_JAVA_PREFIX.sun-jre7:tA} && pax -rw . ${ALT_BOOTDIR} -.endif - -ALT_BOOTDIR= ${WRKDIR}/bootstrap diff --git a/lang/openjdk7/buildlink3.mk b/lang/openjdk7/buildlink3.mk deleted file mode 100644 index 504616229fe..00000000000 --- a/lang/openjdk7/buildlink3.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/14 11:26:15 tnn Exp $ - -BUILDLINK_TREE+= openjdk7 - -.if !defined(OPENJDK7_BUILDLINK3_MK) -OPENJDK7_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.openjdk7+= openjdk7>=1.7.0.72.20090924 -BUILDLINK_PKGSRCDIR.openjdk7?= ../../lang/openjdk7 - -.endif # OPENJDK7_BUILDLINK3_MK - -BUILDLINK_TREE+= -openjdk7 diff --git a/lang/openjdk7/builtin.mk b/lang/openjdk7/builtin.mk deleted file mode 100644 index a7317c7a443..00000000000 --- a/lang/openjdk7/builtin.mk +++ /dev/null @@ -1,75 +0,0 @@ -# $NetBSD: builtin.mk,v 1.4 2019/11/03 19:04:04 rillig Exp $ - -BUILTIN_PKG:= openjdk7 - -BUILTIN_FIND_FILES_VAR:= OJDK7 -BUILTIN_FIND_FILES.OJDK7= \ - /usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/bin/javac - -.include "../../mk/buildlink3/bsd.builtin.mk" - -### -### Determine if there is a built-in implementation of the package and -### set IS_BUILTIN.<pkg> appropriately ("yes" or "no"). -### -.if !defined(IS_BUILTIN.openjdk7) -. if empty(OJDK7:M__nonexistent__) -IS_BUILTIN.openjdk7= yes -. else -IS_BUILTIN.openjdk7= no -. endif -.endif -MAKEVARS+= IS_BUILTIN.openjdk7 - -### -### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to -### a package name to represent the built-in package. -### -.if !defined(BUILTIN_PKG.openjdk7) && \ - !empty(IS_BUILTIN.openjdk7:M[yY][eE][sS]) -BUILTIN_VERSION.openjdk7!= ${OJDK7} -version 2>&1 | ${SED} -Ee 's:^[^0-9]*([0-9._]+)$$:\1:' -e 's/_/./g' -e 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.\4/' -BUILTIN_PKG.openjdk7= openjdk7-${BUILTIN_VERSION.openjdk7} -.endif -MAKEVARS+= BUILTIN_PKG.openjdk7 - -### -### Determine whether we should use the built-in implementation if it -### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). -### -.if !defined(USE_BUILTIN.openjdk7) -. if ${PREFER.openjdk7} == "pkgsrc" -USE_BUILTIN.openjdk7= no -. else -USE_BUILTIN.openjdk7= ${IS_BUILTIN.openjdk7} -. if defined(BUILTIN_PKG.openjdk7) && \ - !empty(IS_BUILTIN.openjdk7:M[yY][eE][sS]) -USE_BUILTIN.openjdk7= yes -. for _dep_ in ${BUILDLINK_API_DEPENDS.openjdk7} -. if !empty(USE_BUILTIN.openjdk7:M[yY][eE][sS]) -USE_BUILTIN.openjdk7!= \ - if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.openjdk7:Q}; then \ - ${ECHO} "yes"; \ - else \ - ${ECHO} "no"; \ - fi -. endif -. endfor -. endif -. endif -.endif -MAKEVARS+= USE_BUILTIN.openjdk7 - -### -### The section below only applies if we are not including this file -### solely to determine whether a built-in implementation exists. -### -CHECK_BUILTIN.openjdk7?= no -.if !empty(CHECK_BUILTIN.openjdk7:M[nN][oO]) -# -# Here we place code that depends on whether USE_BUILTIN.openjdk7 is -# set to "yes" or "no". -# -. if !empty(USE_BUILTIN.openjdk7:M[yY][eE][sS]) -PKG_JAVA_HOME= ${OJDK7:H:H} -. endif -.endif # CHECK_BUILTIN.openjdk7 diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo deleted file mode 100644 index f06e252daaf..00000000000 --- a/lang/openjdk7/distinfo +++ /dev/null @@ -1,170 +0,0 @@ -$NetBSD: distinfo,v 1.95 2020/05/16 14:09:24 rillig Exp $ - -SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 -RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 -SHA512 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = a7481218cf12b0c46cad87ec0fd7be1ae4ba5443c151528a5ec6d1b681e6afba08fd0344e3e97a3c7f8f6a0c948e39e8a714379824568cf83fa18a5276adb16b -Size (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 4351965 bytes -SHA1 (openjdk7/bootstrap-jdk-1.7.141-netbsd-8-aarch64-20180914.tar.xz) = df24cbd6fb2ae529c80ab9d80b30680c24f43f44 -RMD160 (openjdk7/bootstrap-jdk-1.7.141-netbsd-8-aarch64-20180914.tar.xz) = e755550ef882116ea9d8e1d272d07e7b297deec8 -SHA512 (openjdk7/bootstrap-jdk-1.7.141-netbsd-8-aarch64-20180914.tar.xz) = a1f9dcb60e384f6e08bc65547dbe40ac0cd7709f340241f9fd6a9cf252c9fe07be86b84fee3cf75c5183c7fee8ee95c08679db15c2998734df0b2f4bb46793e5 -Size (openjdk7/bootstrap-jdk-1.7.141-netbsd-8-aarch64-20180914.tar.xz) = 23413672 bytes -SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 -RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 -SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4 -Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes -SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e56a0334417146a4db8c23938a0c19ada3e3847d -RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e9a88901ed05bec37c63f235cc7c4b09aaaf1ba3 -SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 664d1f987af6b7271a5c6553a606beae09de3e77cea44ae8dd9327f78ac07afc9d81335ee342bd564617a3e54982d2ec75a827dcfc1ab4a2c54a041dd571f4fb -Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 26955712 bytes -SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 629f8d98530067dc78ba6521f37195ab819dc0d7 -RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 95fca1e15af0f48b529b525262f84b7a3c4f76fd -SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 6514db6e244214169b85d37ea0a41655822a8db11922574e287802aef684cd753237521a5bffa6be1cd1e26e23c19851a5ea89fea54dbc935485903d524dd152 -Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-earmv6hf-20150306.tar.xz) = 23104564 bytes -SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = ff3a3e65c8317017b7f83d688a19630f928e86c7 -RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 627914b2c853da7a2d86e8a8b24fef1e36f25251 -SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 8c809f505435672f478036ddab436acdae032a2eed17698d36d74960fb17bde6f98b460c5904ac4737259e5e59d1a5447973a40085c633687d4b76ac3feda53c -Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz) = 27615992 bytes -SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 69375362b2638d803c71392008a73f956d315085 -RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 06b40db72e7154daff49093f3b6e8aa39cae27b3 -SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 5391de2d35934b79462b603cd19c65b21712891d59afe9d6e5319ea479fe2bc528e4f423648cd6fc9bcaec97ed57b9e01d1c46d04bc4edb9ed5ae7131b7cd5d7 -Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz) = 23041084 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 98fdb66b429148ae3922a2f9b2db736a1708e337 -RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 4835c6361f66138d73f583c40df0e04a31257157 -SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 15ee0583de67df94c980eec197e5279344eaf94d4830e2030f8c8cbc795bce1e0abdf435be4be4c5da271a41d5441e9ebf4bd4f088b17698b5a1e4cc685ebf3a -Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2) = 37910104 bytes -SHA1 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 29bd7aa925941933b2da671340e1d325d9603e5d -RMD160 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = b13d0e42839fb746d41f9001e488162b47803140 -SHA512 (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 1403e582dacd0474e57d9aa8f1333060c50d099ef5d2c5a992ff7f63dcde2e538ff1e7fb78e45d12fd5aea6daf0704672e7f326399d415ee0d6bb53b6f925e9f -Size (openjdk7/bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2) = 37883700 bytes -SHA1 (openjdk7/openjdk-1.7.141-20170813.tar.xz) = c9c53863a4131db5662e85b01325593f2720dd5f -RMD160 (openjdk7/openjdk-1.7.141-20170813.tar.xz) = 9631011e7c11e1f53cf3757a75dc139f98dcb088 -SHA512 (openjdk7/openjdk-1.7.141-20170813.tar.xz) = f4a1189c7d46632a5e5d2dbacd82a49e100a041376d677d1053c8a7beb9560b1c5ada555f6d1f8b88232738067ae752fa1a06596f655931116d28f222d6e0f20 -Size (openjdk7/openjdk-1.7.141-20170813.tar.xz) = 43218080 bytes -SHA1 (openjdk7/rhino1_7R5.zip) = 39ada4cca8c7f651a68eda3f307ff9b68808f0ce -RMD160 (openjdk7/rhino1_7R5.zip) = 04d47e3b108cfb62d8252c358b6f785c8268fc45 -SHA512 (openjdk7/rhino1_7R5.zip) = 0f89d76dd5dee348b4d0593f3ee46e4a3918770991cd5752ae92fa31958b49407f5beeb258d44241411d8cc4f1ce09193791c001f19b6423ddcfe128a184f863 -Size (openjdk7/rhino1_7R5.zip) = 10227088 bytes -SHA1 (patch-Makefile) = a9e415d19c2a8edb96a60ffdf81c804476a8e2f6 -SHA1 (patch-aa) = 6a3ce474e5a42a6ab80a469a66a09c6d87c7ea1e -SHA1 (patch-ab) = 35d5a4a4aa32f8b92ba82f583a2d31f2b7af7998 -SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 -SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 -SHA1 (patch-ah) = 8ec88b2a871b5d964323d5be169bb2370a221b07 -SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897 -SHA1 (patch-al) = 9df456ae11f1c11f885ed3881dc4ef2aa4585b6e -SHA1 (patch-am) = 77185fb77c7b569f1d1a389a15eb8aca76f51c92 -SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd -SHA1 (patch-ao) = 5eba16fc16c9a54a855951a153dc9138956dcf08 -SHA1 (patch-ap) = bb88b3004190160f143ffa5c52e323e566b58686 -SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d -SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec -SHA1 (patch-ba) = 97e42aea28e4d7b63f41596690cd9f21c85622bf -SHA1 (patch-bd) = 74c9f16002ad168c0575ac48ba9d86c6f0c71630 -SHA1 (patch-bg) = 90328bd927c52e62d97c72fade2ceb70d42fe273 -SHA1 (patch-bh) = 33b56c77da352e710350a9e210660a78b11930a6 -SHA1 (patch-bi) = 9323d54054e5b3112e96ba311014c8228009de1a -SHA1 (patch-bn) = 880785559645be0fc2a93dbb14695d83631f3620 -SHA1 (patch-corba_make_common_shared_Defs-utils.gmk) = e3b6d4683f1128bc1b2e5d8453608228da54e3d2 -SHA1 (patch-corba_make_common_shared_Platform.gmk) = 057af9ea52ca257750267289e4f1a950df0ed756 -SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java) = e2cca3e2d6a81ca077d23c49a55b228a65f20b58 -SHA1 (patch-hotspot_make_bsd_Makefile) = 6e7ddd879726f4780c7fae691674fbf5259a3b81 -SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 0606206a28b741ee7c3c34cf62a3a227238fb98c -SHA1 (patch-hotspot_make_bsd_makefiles_zeroshark.make) = fe0e3d001f2ff996c44dd977595e08c06f911773 -SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14 -SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd -SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 28be4be89a94373ed5f8bee67b581df6d5f2a28c -SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 03bc8db5ac6623b63860a76d2d5cc4f26c44617b -SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = c9410ce77a10565e2a811ae053704d9e58978c02 -SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 8028a9aa009ce34e434a62a231747143bd16966a -SHA1 (patch-hotspot_make_solaris_makefiles_jvmg.make) = 4b14c61707d739f612943c41ab7f3ccc34106a18 -SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 5163ebc52439f6fe1cdfde87b9b930744a485e70 -SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 690c750d9c0469cd6b71afed2633aa13373c2a7b -SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc) = 9fbe6b4e8d4ef9e4ffc8361aa469a9ceacb331ff -SHA1 (patch-hotspot_make_solaris_makefiles_optimized.make) = 78d64fe6cb7c3420889884a450c0803d56e44850 -SHA1 (patch-hotspot_make_solaris_makefiles_product.make) = 6105c8e7f8b612e70957bccf7313384488388aa5 -SHA1 (patch-hotspot_make_solaris_makefiles_saproc.make) = 8a034088ca3c9f5a625849b772dd51f65fad0b43 -SHA1 (patch-hotspot_make_solaris_makefiles_vm.make) = d72c16b90479c5df0dc33f3b30916b0552dcc17a -SHA1 (patch-hotspot_src_cpu_x86_vm_jni__x86.h) = 30c4e22a666f9155032bff3c61f77ead61a77b14 -SHA1 (patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp) = 273e588661fd82411c9f7b48f2bf142bbc8caebb -SHA1 (patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp) = 9f7acf1eff3baba430880be9fd0f6148056dd088 -SHA1 (patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp) = dcd83b65a7d74e153a3e1c44f8c7980827ec20c7 -SHA1 (patch-hotspot_src_cpu_zero_vm_stubGenerator__zero.cpp) = fe4ea1c55e686d67714c37baa0605f58a3becdb7 -SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp) = e87224f8b67dc78fa411d30beff82ce5ccbb4cc5 -SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp) = 6311d68db9064afc470f1d9fd37e63011899659a -SHA1 (patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp) = f99c0d7981f4479b8d738079a9f08abdbbeecd4a -SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp) = 2bf9147643be4ac711d1bf94eb0e6ae4abad20c6 -SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp) = 82818bc8d8fee46403b88cf52a7c978b5ea0005c -SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp) = b2ffc4679a4abe581c6ef3aef630b6570e5cfc41 -SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp) = 5679710d8dc743b5e9820057cc1800471c6ac40b -SHA1 (patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp) = 062a3cf87793867b68d497b75f5fef55ed6e1666 -SHA1 (patch-hotspot_src_os_posix_vm_os__posix.cpp) = cea59006e61c00c90608e131ed1346966be4e495 -SHA1 (patch-hotspot_src_os_solaris_dtrace_jhelper.d) = 43ae9934ce7cf477f7968bcf9ba3c57e98f65cc8 -SHA1 (patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp) = 3be8a96525ead1df18a40b18dccfad4ef2765d47 -SHA1 (patch-hotspot_src_os_solaris_vm_os__solaris.cpp) = ea09ffd080fcf4c12b0b69cb622ee3945000cb68 -SHA1 (patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp) = 1bc67dd849eec122162b71f21d204e5489555738 -SHA1 (patch-hotspot_src_share_vm_classfile_symbolTable.cpp) = cf0880b33cee7d1439347faeea2306082b49d36c -SHA1 (patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp) = e5e00d4a7643c6b339a818dceeebf5b050492abd -SHA1 (patch-hotspot_src_share_vm_oops_klass.hpp) = 8f25f2df28e4d644cd0408cc6c198d6e9d8b9155 -SHA1 (patch-hotspot_src_share_vm_opto_library__call.cpp) = 86ba7f86ba769a444484f3c586e8b039079d2456 -SHA1 (patch-hotspot_src_share_vm_opto_node.cpp) = 869d8ec9dc6dae6e0b8a23fe44f2583747059553 -SHA1 (patch-hotspot_src_share_vm_runtime_os.cpp) = c7a33e791e3b5fec5cca9a5343c6d1f685e0cd4b -SHA1 (patch-hotspot_src_share_vm_runtime_virtualspace.cpp) = 56ddcfee0be132aad47feb3191377c49b2eb68e9 -SHA1 (patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp) = 1935e8225e08870fd912737de6dee3d599d260ab -SHA1 (patch-hotspot_src_share_vm_utilities_hashtable.cpp) = 30084c64570e420fbda8fbd36fcd4aa2641eab8e -SHA1 (patch-jdk_make_com_sun_Makefile) = 5826c64eb1971d69e8b874d6b8a60d25e0d02c5b -SHA1 (patch-jdk_make_com_sun_java_pack_Makefile) = bb258d4c2235ea780810d980b84b90a0380f3b46 -SHA1 (patch-jdk_make_com_sun_jmx_Makefile) = 13c85421b59aa6a98201d9760e28eec76e691f37 -SHA1 (patch-jdk_make_com_sun_nio_Makefile) = 82baf043563d790170809594ff69086ba5cec8e8 -SHA1 (patch-jdk_make_com_sun_script_Makefile) = ae6408118933387f4ac7a4f13c1fc4a73b44a2a3 -SHA1 (patch-jdk_make_common_Defs-solaris-gcc.gmk) = d813b39d23cc90c9f51c4714e6f066cc7804e61d -SHA1 (patch-jdk_make_common_Defs-solaris.gmk) = ea0bef0fd67a1ff809a17005458dadaed202ba70 -SHA1 (patch-jdk_make_common_Mapfile-vers.gmk) = 7115ec8e0fc25f952a6c72ee78df33901040a7b6 -SHA1 (patch-jdk_make_common_Program.gmk) = 727a1f2281910c8b9354713ac0a12156ddfc3594 -SHA1 (patch-jdk_make_common_Rules.gmk) = 371fcc33fd44d62d2490bb454abf21815ce2e1ce -SHA1 (patch-jdk_make_common_shared_Compiler-gcc.gmk) = e180383490d6c0a8bec4626ed96ad1741c8fb3a2 -SHA1 (patch-jdk_make_common_shared_Defs-utils.gmk) = d0ae37a032be6bf60da4be11bd38185e89d4ee91 -SHA1 (patch-jdk_make_common_shared_Defs-versions.gmk) = 20a9492180db88cf78bc107f1e2fc4a9101d2eab -SHA1 (patch-jdk_make_java_Makefile) = c670455f8979b14fe44f0a285d0adfb2666d0005 -SHA1 (patch-jdk_make_java_instrument_Makefile) = 62490121b7e934568542f44cd6e2ae1352b1ce0c -SHA1 (patch-jdk_make_java_net_FILES__c.gmk) = 31aefe6781989d98bdb23433fc5b6ed6ab559d0d -SHA1 (patch-jdk_make_java_nio_Makefile) = d4b8b830ce73841ae107f8485400ab6116b9ca3c -SHA1 (patch-jdk_make_java_npt_Makefile) = 91903de199e8546bb17c8dc30ae616eeb7c8b906 -SHA1 (patch-jdk_make_sun_awt_Makefile) = 981082d4dfda204f09a66b9fc452bea218d3ce6a -SHA1 (patch-jdk_make_sun_awt_mawt.gmk) = 5379efff76c3cbb1bf56554aaa7890f169b6fc7d -SHA1 (patch-jdk_make_sun_rmi_rmi_Makefile) = ef42db5c61e940b66dfead0e9fcf328d125b3460 -SHA1 (patch-jdk_make_sun_security_ec_Makefile) = 84e99a4e28e505e0cc76210d13d98f602c809b95 -SHA1 (patch-jdk_make_sun_splashscreen_Makefile) = 81d6fb29a2063667ac153f723330663c0e71f2c2 -SHA1 (patch-jdk_make_sun_xawt_Makefile) = 735cf251798c2b6a638fc57dc90fe0750433f26d -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java) = 9e9c0254740742cd103c0cb33d3aa564ad7de01f -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java) = 85ddae5aa955ef951b2a9964b5f475f559c3c335 -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java) = d8327c56a99ef6af8b3dfaf31e20bdebab5d6d44 -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java) = 75f2112f9b0295511b134122b1254cb51f961cda -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java) = c7bbf14f618095e1340849d14ccf130b5d8e0a00 -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java) = 6bc7612c49c5878e6d87c565872b1009cdcc9507 -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java) = 64659b0845bf19680bc5d3d2d34b8eac5ada3994 -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java) = 9663c73cb02170040256fd880ae51dd1353747e5 -SHA1 (patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java) = b34d66405825fb4173eb5b517e004ae724686155 -SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da308daafc135db38e4513347a39368ba -SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb -SHA1 (patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h) = 3b5333206892e8ff31220ef434549cea25d1d53f -SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 667b1d15778a701e8f60fc0a8452cb49596e2e6c -SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716 -SHA1 (patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd) = dfa4eae8f6e0296fcba8f1519f11b4de8ac95f36 -SHA1 (patch-jdk_src_solaris_classes_sun_net_PortConfig.java) = 5ac6eaf6b32ad8bef50830364ea1fd455bdbbb3f -SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 2bb10608969e9ef747d1cc0a6b8796fe4b38a4e7 -SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50 -SHA1 (patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c) = 1a7a73c41a35b1719d8a68e9cea2aa47d5e828fc -SHA1 (patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c) = e3e61fd8f81fecfc5a65e070cabff02cbb74a27f -SHA1 (patch-jdk_src_solaris_native_java_lang_java__props__md.c) = 3bc9e099a6c3152645882e4fba128ae8e709efbb -SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = 63af9eee1f5bbc695a14cab51fa7089eb2a0a04b -SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.c) = 883fb8cf76f9a6d47e1c96badb07be162add80f7 -SHA1 (patch-jdk_src_solaris_native_java_net_net__util__md.h) = 9059e8a5eace5ae48dd913e5ce57b9bface68745 -SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480 -SHA1 (patch-jdk_test_Makefile) = 0bdd1af41390bb0e02244c7596d5c35b9771bfb6 -SHA1 (patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java) = a2a13434a4e87730fa96f53efa176fa91d3c1eeb -SHA1 (patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java) = 98a7c2fbccd50da0c879940131901b3937d72c0d -SHA1 (patch-jdk_test_java_beans_Introspector_Test4144543.java) = e003869d924ac3cb326c4093891bd0cfc0f7ff9c -SHA1 (patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java) = 1997194b919a96628568ef469150c1bd39ede295 -SHA1 (patch-jdk_test_jprt.config) = 4eb27e773c564dde79be102e7ccfe2e42ff8f0ca -SHA1 (patch-jdk_test_sun_security_ec_TestEC.java) = 142fa7029bfbdbb63354ce4e315ea7f5fd372a32 -SHA1 (patch-langtools_make_build.xml) = bf951f71b066436331869aded0d778df1b843820 diff --git a/lang/openjdk7/hacks.mk b/lang/openjdk7/hacks.mk deleted file mode 100644 index 6225d452a7e..00000000000 --- a/lang/openjdk7/hacks.mk +++ /dev/null @@ -1,52 +0,0 @@ -# $NetBSD: hacks.mk,v 1.5 2018/09/14 15:53:46 tnn Exp $ - -.if !defined(OPENJDK7_HACKS_MK) -OPENJDK7_HACKS_MK= # empty - -### Ensure we do not pickup external jpeg includes: openjdk uses an internal -### libjpeg with potentially conflicting defines, which breaks at least -### libjpeg-turbo -post-wrapper: - ${RM} -f ${BUILDLINK_DIR}/include/jconfig.h - ${RM} -f ${BUILDLINK_DIR}/include/jerror.h - ${RM} -f ${BUILDLINK_DIR}/include/jmorecfg.h - ${RM} -f ${BUILDLINK_DIR}/include/jpeglib.h - -# Workaround incorrect constant folding of subnormals in javac when the FPU -# does not handle subnormal arithmetic, like on ARM in Flush-to-zero mode. -# These workarounds avoid underflow conditions during the bootstrap so the -# JDK can correctly build itself. Compiling or running programs other than -# openjdk itself on such hardware may still cause unexpected behaviour. -# - -.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) || \ - !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) -PKG_HACKS+= broken-ieee-floats -SUBST_CLASSES+= fpu -SUBST_STAGE.fpu= pre-build -SUBST_MESSAGE.fpu= Broken FPU detected: applying floating point workarounds -SUBST_FILES.fpu= langtools/src/share/classes/com/sun/tools/javac/jvm/Items.java -SUBST_FILES.fpu+= langtools/src/share/classes/com/sun/tools/javac/parser/JavacParser.java -SUBST_FILES.fpu+= jdk/src/share/classes/sun/misc/DoubleConsts.java -SUBST_FILES.fpu+= jdk/src/share/classes/sun/misc/FloatConsts.java -SUBST_FILES.fpu+= jdk/src/share/classes/java/lang/Double.java -SUBST_FILES.fpu+= jdk/src/share/classes/java/lang/Float.java -# Double{,Consts}.java: Replace problematic literals with binary representation -SUBST_SED.fpu= -e 's|2.2250738585072014e-308d*|Double.longBitsToDouble(0x10000000000000L)|ig' # MIN_NORMAL -SUBST_SED.fpu+= -e 's|0x1.0p-1022d*|Double.longBitsToDouble(0x10000000000000L)|ig' # MIN_NORMAL -SUBST_SED.fpu+= -e 's|4.9e-324d*|Double.longBitsToDouble(0x1L)|ig' # MIN_VALUE -SUBST_SED.fpu+= -e 's|0x0.0000000000001p-1022d*|Double.longBitsToDouble(0x1L)|ig' # MIN_VALUE -# Float{,Consts}.java: Replace problematic literals with binary representation -SUBST_SED.fpu+= -e 's|1.17549435e-38f*|Float.intBitsToFloat(0x800000)|ig' # MIN_NORMAL -SUBST_SED.fpu+= -e 's|0x1.0p-126f*|Float.intBitsToFloat(0x800000)|ig' # MIN_NORMAL -SUBST_SED.fpu+= -e 's|1.4e-45f*|Float.intBitsToFloat(0x1)|ig' # MIN_VALUE -SUBST_SED.fpu+= -e 's|0x0.000002P-126f*|Float.intBitsToFloat(0x1)|ig' # MIN_VALUE -# JavacParser.java: avoid bogus "fp.number.too.small" error parsing literals representing Double.MIN_VALUE -SUBST_SED.fpu+= -e 's|n.floatValue() == 0.0f && !isZero(proper)|& \&\& Float.floatToIntBits(n) != 0x1|' -SUBST_SED.fpu+= -e 's|n.doubleValue() == 0.0d && !isZero(proper)|& \&\& Double.doubleToLongBits(n) != 0x1L|' -# Items.java: Avoid invalid constant folding of literal subnormals to positive zero -SUBST_SED.fpu+= -e 's|x == 0.0f && 1.0f / x > 0.0f|Float.floatToIntBits(x) == 0x0|g' -SUBST_SED.fpu+= -e 's|x == 0.0d && 1.0d / x > 0.0d|Double.doubleToLongBits(x) == 0x0L|g' -.endif - -.endif diff --git a/lang/openjdk7/icedtea-extras.mk b/lang/openjdk7/icedtea-extras.mk deleted file mode 100644 index d7f9fcaf9c4..00000000000 --- a/lang/openjdk7/icedtea-extras.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: icedtea-extras.mk,v 1.16 2015/02/23 13:34:56 tnn Exp $ - -RHINO= rhino1_7R5 -RHINO_TGZ= ${RHINO}.zip -SITES.${RHINO_TGZ}= https://github.com/mozilla/rhino/releases/download/Rhino1_7R5_RELEASE/ -DISTFILES+= ${RHINO_TGZ} -EXTRACT_ONLY+= ${RHINO_TGZ} - -# fixme: Should depend on devel/apache-ant? -ANT= apache-ant-1.9.4 -ANT_TGZ= ${ANT}-bin.tar.bz2 -SITES.${ANT_TGZ}= http://archive.apache.org/dist/ant/binaries/ -DISTFILES+= ${ANT_TGZ} -EXTRACT_ONLY+= ${ANT_TGZ} -ANT_BIN= ${WRKDIR}/${ANT}/bin -PREPEND_PATH+= ${ANT_BIN} diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk deleted file mode 100644 index c3a5fa005ea..00000000000 --- a/lang/openjdk7/options.mk +++ /dev/null @@ -1,95 +0,0 @@ -# $NetBSD: options.mk,v 1.13 2019/03/20 11:55:11 wiz Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7 -PKG_OPTIONS_OPTIONAL_GROUPS= variant -PKG_OPTIONS_GROUP.variant= jdk-zero-vm -PKG_SUPPORTED_OPTIONS= debug jre-jce x11 -PKG_SUGGESTED_OPTIONS= jre-jce x11 - -.if !empty(PKGSRC_COMPILER:Mclang) -PKG_OPTIONS_GROUP.variant+= jdk-zeroshark-vm -.endif - -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" -PKG_OPTIONS_GROUP.variant+= jdk-hotspot-vm -PKG_SUGGESTED_OPTIONS+= jdk-hotspot-vm -#notyet -#.elif !empty(PKGSRC_COMPILER:Mclang) -#PKG_SUGGESTED_OPTIONS+= jdk-zeroshark-vm -.else -PKG_SUGGESTED_OPTIONS+= jdk-zero-vm -.endif - -.include "../../mk/bsd.options.mk" - -### -### Java(TM) Cryptography Extension (JCE) -### -.if !empty(PKG_OPTIONS:Mjre-jce) -MAKE_ENV+= UNLIMITED_CRYPTO=true -.endif - -### -### X11 or headless build -### -PLIST_VARS+= x11 -.if !empty(PKG_OPTIONS:Mx11) -PLIST.x11= yes -MAKE_ENV+= ALT_X11_PATH=${X11BASE} -DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf -#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf -#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXi/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt?= build -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/libXtst/buildlink3.mk" -.include "../../x11/libXrender/buildlink3.mk" -.else -MAKE_ENV+= BUILD_HEADLESS_ONLY=true -# We apparently still need the Xlib headers to build headless. why? -MAKE_ENV+= ALT_X11_PATH=${X11BASE} -BUILDLINK_DEPMETHOD.libX11?= build -.include "../../x11/libX11/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXt?= build -.include "../../x11/libXt/buildlink3.mk" -BUILDLINK_DEPMETHOD.libXrender?=build -.include "../../x11/libXrender/buildlink3.mk" -post-configure: remove-x11-classes -remove-x11-classes: - rm ${WRKSRC}/jdk/src/solaris/classes/sun/awt/X11/*.java -.endif - -# -# Debugging -# -.if !empty(PKG_OPTIONS:Mdebug) -PKG_FAIL_REASON+= "The fastdebug build is currently broken due to a linker error" -PLIST_SRC+= PLIST.debug -JDK_MAKE_TARGET= fastdebug_build -MAKE_ENV+= FULL_DEBUG_SYMBOLS=1 -MAKE_ENV+= ZIP_DEBUGINFO_FILES=0 -MAKE_ENV+= USE_PRECOMPILED_HEADER=0 -.else -JDK_MAKE_TARGET= all -MAKE_ENV+= FULL_DEBUG_SYMBOLS=0 -.endif - -# -# Build variant. Zero VM builds a portable JVM without assembly optimization. -# -PLIST_VARS+= native -.if !empty(PKG_OPTIONS:Mjdk-zero-vm) || !empty(PKG_OPTIONS:Mjdk-zeroshark-vm) -MAKE_ENV+= ZERO_BUILD=true -MAKE_ENV+= ZERO_LIBARCH=${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} -MAKE_ENV+= ZERO_ARCHDEF=${MACHINE_ARCH:S/i386/IA32/:S/x86_64/AMD64/:S/sparc64/SPARC/:C/^e?arm.*$/ARM/:S/aarch64/AARCH64/} -.include "../../mk/endian.mk" -MAKE_ENV+= ZERO_ENDIANNESS=${MACHINE_ENDIAN} -.include "../../devel/libffi/buildlink3.mk" -.else -PLIST.native= yes -.endif -.if !empty(PKG_OPTIONS:Mjdk-zeroshark-vm) -MAKE_ENV+= SHARK_BUILD=true -.include "../../lang/libLLVM/buildlink3.mk" -.endif diff --git a/lang/openjdk7/patches/patch-Makefile b/lang/openjdk7/patches/patch-Makefile deleted file mode 100644 index 3dce8ebab15..00000000000 --- a/lang/openjdk7/patches/patch-Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ - -Disable SunOS multiarch. - ---- Makefile.orig 2012-08-10 16:07:00.000000000 +0000 -+++ Makefile -@@ -210,7 +210,7 @@ create_fresh_fastdebug_bootdir: FRC - - # Create boot image? - ifeq ($(SKIP_BOOT_CYCLE),false) -- ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64) -+ ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),NOMULTIARCHsolaris64) - DO_BOOT_CYCLE=true - endif - endif diff --git a/lang/openjdk7/patches/patch-aa b/lang/openjdk7/patches/patch-aa deleted file mode 100644 index 601136b587e..00000000000 --- a/lang/openjdk7/patches/patch-aa +++ /dev/null @@ -1,153 +0,0 @@ -$NetBSD: patch-aa,v 1.15 2018/09/14 15:53:46 tnn Exp $ - -DragonFly support. -Add workaround for missing sem_timedwait() in NetBSD < 6.99.4 -Workaround incomplete libc/no alloca(3) on NetBSD/aarch64 - ---- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2017-08-13 05:55:27.000000000 +0000 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp -@@ -22,6 +22,11 @@ - * - */ - -+#if defined(__NetBSD__) && defined(__aarch64__) -+// there is no alloca(3) yet on this port -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - // no precompiled headers - #include "classfile/classLoader.hpp" - #include "classfile/systemDictionary.hpp" -@@ -126,7 +131,7 @@ - # include <inttypes.h> - # include <sys/ioctl.h> - --#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - # include <elf.h> - #endif - -@@ -327,6 +332,7 @@ void os::Bsd::initialize_system_info() { - size_t len; - int cpu_val; - julong mem_val; -+ struct rlimit limits; - - /* get processors count via hw.ncpus sysctl */ - mib[0] = CTL_HW; -@@ -359,14 +365,11 @@ void os::Bsd::initialize_system_info() { - _physical_memory = 256*1024*1024; // fallback (XXXBSD?) - } - --#ifdef __OpenBSD__ -- { -- // limit _physical_memory memory view on OpenBSD since -- // datasize rlimit restricts us anyway. -- struct rlimit limits; -- getrlimit(RLIMIT_DATA, &limits); -- _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); -- } -+ getrlimit(RLIMIT_DATA, &limits); -+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); -+#if defined(RLIMIT_AS) -+ getrlimit(RLIMIT_AS, &limits); -+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur); - #endif - } - #else -@@ -445,7 +448,7 @@ void os::init_system_properties_values() - * 7: The default directories, normally /lib and /usr/lib. - */ - #ifndef DEFAULT_LIBPATH --#define DEFAULT_LIBPATH "/lib:/usr/lib" -+#define DEFAULT_LIBPATH "@PREFIX@/lib/jni:@PREFIX@/lib:/lib:/usr/lib" - #endif - - #define EXTENSIONS_DIR "/lib/ext" -@@ -2227,9 +2230,16 @@ void * os::dll_load(const char *filename - {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"}, - {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"}, - {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"}, -+#if defined(EM_AARCH64) -+ {EM_AARCH64, EM_AARCH64, ELFCLASS64, ELFDATA2LSB, (char*)"Aarch64"}, -+#endif - {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, -+#if defined(EM_S390) - {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"}, -+#endif -+#if defined(EM_ALPHA) - {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -+#endif - {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"}, - {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"}, - {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"}, -@@ -2252,6 +2262,8 @@ void * os::dll_load(const char *filename - static Elf32_Half running_arch_code=EM_PPC; - #elif (defined ARM) - static Elf32_Half running_arch_code=EM_ARM; -+ #elif (defined AARCH64) -+ static Elf32_Half running_arch_code=EM_AARCH64; - #elif (defined S390) - static Elf32_Half running_arch_code=EM_S390; - #elif (defined ALPHA) -@@ -2825,6 +2837,33 @@ bool Semaphore::timedwait(unsigned int s - - #else - -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 699000400) -+static inline int sem_timedwait(sem_t *sem, struct timespec *ts) { -+ struct timespec onems = { 0, 1000000 }; -+ struct timespec total = { 0, 0 }; -+ struct timespec unslept; -+ struct timespec elapsed; -+ struct timespec tmp; -+ -+ while (timespeccmp(ts, &total, >)) { -+ if (sem_trywait(sem) == 0) -+ return 0; -+ -+ if (errno != EAGAIN) -+ return -1; -+ -+ (void)nanosleep(&onems, &unslept); -+ -+ timespecsub(&onems, &unslept, &elapsed); -+ timespecadd(&total, &elapsed, &tmp); -+ total.tv_sec = tmp.tv_sec; -+ total.tv_nsec = tmp.tv_nsec; -+ } -+ errno = ETIMEDOUT; -+ return -1; -+} -+#endif /* __NetBSD__ */ -+ - bool Semaphore::trywait() { - return sem_trywait(&_semaphore) == 0; - } -@@ -2975,7 +3014,7 @@ static void warn_fail_commit_memory(char - // problem. - bool os::pd_commit_memory(char* addr, size_t size, bool exec) { - int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE; --#ifdef __OpenBSD__ -+#if defined(__OpenBSD__) || defined(__NetBSD__) - // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD - if (::mprotect(addr, size, prot) == 0) { - return true; -@@ -3901,7 +3940,7 @@ OSReturn os::set_native_priority(Thread* - #ifdef __OpenBSD__ - // OpenBSD pthread_setprio starves low priority threads - return OS_OK; --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__DragonFly__) - int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); - return (ret == 0) ? OS_OK : OS_ERR; - #elif defined(__APPLE__) || defined(__NetBSD__) -@@ -3930,7 +3969,7 @@ OSReturn os::get_native_priority(const T - } - - errno = 0; --#if defined(__OpenBSD__) || defined(__FreeBSD__) -+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) - *priority_ptr = pthread_getprio(thread->osthread()->pthread_id()); - #elif defined(__APPLE__) || defined(__NetBSD__) - int policy; diff --git a/lang/openjdk7/patches/patch-ab b/lang/openjdk7/patches/patch-ab deleted file mode 100644 index 81f90cafebf..00000000000 --- a/lang/openjdk7/patches/patch-ab +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2013/06/15 09:31:05 jperkin Exp $ - -We use LD_LIBRARY_PATH. - ---- jdk/make/common/shared/Sanity.gmk.orig 2012-08-10 17:21:34.000000000 +0000 -+++ jdk/make/common/shared/Sanity.gmk -@@ -521,12 +521,7 @@ sane-variant: - # LD_LIBRARY_PATH should not be set, unless you are insane. - ###################################################### - sane-ld_library_path: --ifdef LD_LIBRARY_PATH -- @$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set. This may \n" \ -- " produce binaries binaries incorrectly. Please unset it \n" \ -- " and start your build again. \n" \ -- "" >> $(ERROR_FILE) --endif -+ true - - ###################################################### - # LD_LIBRARY_PATH_64 should not be set, unless you are insane. -@@ -813,7 +808,8 @@ ifdef OPENJDK - @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \ - $(ECHO) "Failed to build freetypecheck." ) > $@ - -- sane-freetype: $(TEMPDIR)/freetypeinfo -+ sane-freetype: -+ sane-freetype_: $(TEMPDIR)/freetypeinfo - @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \ - $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \ - " or higher is required. \n" \ diff --git a/lang/openjdk7/patches/patch-ac b/lang/openjdk7/patches/patch-ac deleted file mode 100644 index 5efe91ae4a1..00000000000 --- a/lang/openjdk7/patches/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2013/06/15 09:31:05 jperkin Exp $ - -__progname support. - ---- jdk/make/java/main/java/mapfile-i586.orig 2012-08-10 17:21:36.000000000 +0000 -+++ jdk/make/java/main/java/mapfile-i586 -@@ -31,6 +31,7 @@ SUNWprivate_1.1 { - global: - main; # Provides basic adb symbol offsets - environ; # Public symbols and required by Java run time -+ __progname; - _environ; - __environ_lock; - ___Argv; # The following are private, but as they are diff --git a/lang/openjdk7/patches/patch-ag b/lang/openjdk7/patches/patch-ag deleted file mode 100644 index c319cbd292e..00000000000 --- a/lang/openjdk7/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -X rpath. - ---- jdk/make/launchers/Makefile.launcher.orig 2012-08-10 17:21:41.000000000 +0000 -+++ jdk/make/launchers/Makefile.launcher -@@ -164,7 +164,7 @@ ifeq ($(GUI_TOOL),true) - ifneq ($(PLATFORM), windows) - ifneq ($(PLATFORM), macosx) - # Anything with a GUI needs X11 to be linked in. -- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -+ OTHER_LDLIBS += -Wl,-R$(OPENWIN_LIB) -L$(OPENWIN_LIB) -lX11 - endif - endif - endif diff --git a/lang/openjdk7/patches/patch-ah b/lang/openjdk7/patches/patch-ah deleted file mode 100644 index c0128117997..00000000000 --- a/lang/openjdk7/patches/patch-ah +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2018/09/14 15:53:46 tnn Exp $ - -DragonFly support. -Disable SunOS multiarch. -Add ARM support. - ---- jdk/make/common/shared/Platform.gmk.orig 2017-08-13 05:55:12.000000000 +0000 -+++ jdk/make/common/shared/Platform.gmk -@@ -119,7 +119,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) - ARCH := $(shell isainfo -n) - # ISA_DIR is used to locate 64-bit specific libraries which are generally - # in the same general place as other libraries under the ./$(ARCH) directory -- ISA_DIR = /$(ARCH) -+ NOMULTIARCHISA_DIR = /$(ARCH) - endif - # Need to maintain the jre/lib/i386 location for 32-bit Intel - ifeq ($(ARCH), i586) -@@ -241,6 +241,13 @@ ifeq ($(SYSTEM_UNAME), Linux) - MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' ) - endif - -+ifeq ($(SYSTEM_UNAME), DragonFly) -+ PLATFORM = bsd -+ OS_NAME = dragonfly -+ OS_VENDOR = DragonFlyBSD -+ REQUIRED_OS_VERSION = 2.4 -+endif -+ - ifeq ($(SYSTEM_UNAME), Darwin) - PLATFORM = macosx - OS_NAME = darwin -@@ -340,7 +347,7 @@ endif - ifeq ($(PLATFORM), bsd) - OS_VERSION := $(shell uname -r) - # Arch and OS name/version -- mach := $(shell uname -m) -+ mach := $(shell uname -p) - archExpr = case "$(mach)" in \ - i[3-9]86) \ - echo i586 \ -@@ -357,6 +364,12 @@ ifeq ($(PLATFORM), bsd) - "Power Macintosh") \ - echo ppc \ - ;; \ -+ *arm*) \ -+ echo arm \ -+ ;; \ -+ aarch64) \ -+ echo aarch64 \ -+ ;; \ - *) \ - echo $(mach) \ - ;; \ -@@ -365,7 +378,7 @@ ifeq ($(PLATFORM), bsd) - ARCH_FAMILY := $(ARCH) - - # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64 -- ifneq (,$(findstring $(ARCH), i586 sparc ppc)) -+ ifneq (,$(findstring $(ARCH), i586 sparc ppc arm)) - ARCH_DATA_MODEL=32 - else - ARCH_DATA_MODEL=64 -@@ -388,9 +401,9 @@ ifeq ($(PLATFORM), bsd) - REQUIRED_FREE_SPACE=1500000 - # How much RAM does this machine have: - ifeq ($(OS_VENDOR), OpenBSD) -- MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) -+ MB_OF_MEMORY=$(shell /sbin/sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) - else -- MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) -+ MB_OF_MEMORY=$(shell (/sbin/sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) - endif - endif - diff --git a/lang/openjdk7/patches/patch-ak b/lang/openjdk7/patches/patch-ak deleted file mode 100644 index 38d7a39bb60..00000000000 --- a/lang/openjdk7/patches/patch-ak +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-ak,v 1.7 2014/07/25 20:35:14 ryoon Exp $ - -Additional rpaths. - ---- jdk/make/common/Defs-bsd.gmk.orig 2014-06-14 20:38:28.000000000 +0000 -+++ jdk/make/common/Defs-bsd.gmk -@@ -328,8 +328,8 @@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink - - LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY)) - --LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN --LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%) -+LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} -+ - - # - # -L paths for finding and -ljava -@@ -380,6 +380,11 @@ endif - - # Using map files currently break compilation on FreeBSD during shared library - # checks for some of the AWT native libraries. -+ifeq ($(OS_VENDOR), DragonFly) -+LDNOMAP=true -+endif -+ -+# - ifeq ($(OS_VENDOR), FreeBSD) - LDNOMAP=true - endif -@@ -391,7 +396,7 @@ endif - # the library itself should not. - # - VM_NAME = server --JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm -+JVMLIB = -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm - JAVALIB = -ljava $(JVMLIB) - - # -@@ -454,6 +459,14 @@ ifeq ($(OS_VENDOR), OpenBSD) - SYSTEM_ZLIB = true - endif - -+ifeq ($(OS_VENDOR), NetBSD) -+ SYSTEM_ZLIB = true -+endif -+ -+ifeq ($(OS_VENDOR), DragonFlyBSD) -+ SYSTEM_ZLIB = true -+endif -+ - # - # Japanese manpages - # diff --git a/lang/openjdk7/patches/patch-al b/lang/openjdk7/patches/patch-al deleted file mode 100644 index 4182b2c346f..00000000000 --- a/lang/openjdk7/patches/patch-al +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-al,v 1.6 2017/08/14 00:02:16 ryoon Exp $ - -DragonFly support. - ---- jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.orig 2017-08-13 05:55:21.000000000 +0000 -+++ jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java -@@ -28,6 +28,8 @@ package sun.nio.fs; - import java.nio.file.spi.FileSystemProvider; - import java.security.AccessController; - import java.security.PrivilegedAction; -+import java.util.Set; -+import java.util.HashSet; - import sun.security.action.GetPropertyAction; - - /** -@@ -37,6 +39,14 @@ import sun.security.action.GetPropertyAc - public class DefaultFileSystemProvider { - private DefaultFileSystemProvider() { } - -+ private static final Set<String> validFileSystemProviders -+ = new HashSet<String>(); -+ static { -+ validFileSystemProviders.add("sun.nio.fs.SolarisFileSystemProvider"); -+ validFileSystemProviders.add("sun.nio.fs.LinuxFileSystemProvider"); -+ validFileSystemProviders.add("sun.nio.fs.BsdFileSystemProvider"); -+ } -+ - @SuppressWarnings("unchecked") - private static FileSystemProvider createProvider(final String cn) { - return AccessController -@@ -64,13 +74,17 @@ public class DefaultFileSystemProvider { - public static FileSystemProvider create() { - String osname = AccessController - .doPrivileged(new GetPropertyAction("os.name")); -+ String fileSystemProvider = System -+ .getProperty("java.nio.file.spi.DefaultFileSystemProvider"); -+ if (validFileSystemProviders.contains(fileSystemProvider)) -+ return createProvider(fileSystemProvider); - if (osname.equals("SunOS")) - return createProvider("sun.nio.fs.SolarisFileSystemProvider"); - if (osname.equals("Linux")) - return createProvider("sun.nio.fs.LinuxFileSystemProvider"); - if (osname.equals("Darwin") || osname.contains("OS X")) - return createProvider("sun.nio.fs.MacOSXFileSystemProvider"); -- if (osname.endsWith("BSD")) -+ if (osname.endsWith("BSD") || osname.equals("DragonFly")) - return createProvider("sun.nio.fs.BsdFileSystemProvider"); - if (osname.equals("AIX") || osname.equals("OS400")) - return createProvider("sun.nio.fs.AixFileSystemProvider"); diff --git a/lang/openjdk7/patches/patch-am b/lang/openjdk7/patches/patch-am deleted file mode 100644 index 279d1f9ce92..00000000000 --- a/lang/openjdk7/patches/patch-am +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-am,v 1.7 2015/03/02 03:53:26 tnn Exp $ - -Set username to pkgsrc. - ---- jdk/make/common/shared/Defs.gmk.orig 2014-01-01 05:53:33.000000000 +0000 -+++ jdk/make/common/shared/Defs.gmk -@@ -301,7 +301,7 @@ ifndef BUILD_NUMBER - BUILD_NUMBER = b00 - ifndef USER_RELEASE_SUFFIX - BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M') -- CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]') -+ CLEAN_USERNAME := pkgsrc - USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' ) - endif - export USER_RELEASE_SUFFIX diff --git a/lang/openjdk7/patches/patch-an b/lang/openjdk7/patches/patch-an deleted file mode 100644 index 967f9f02e60..00000000000 --- a/lang/openjdk7/patches/patch-an +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-an,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -NetBSD fix. - ---- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.orig 2012-08-10 16:24:31.000000000 +0000 -+++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp -@@ -43,6 +43,7 @@ - # define bswap_32(x) swap32(x) - # define bswap_64(x) swap64(x) - # elif defined(__NetBSD__) -+# include <machine/bswap.h> - # define bswap_16(x) bswap16(x) - # define bswap_32(x) bswap32(x) - # define bswap_64(x) bswap64(x) diff --git a/lang/openjdk7/patches/patch-ao b/lang/openjdk7/patches/patch-ao deleted file mode 100644 index 1919a3ed6f1..00000000000 --- a/lang/openjdk7/patches/patch-ao +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-ao,v 1.5 2015/02/08 23:40:09 tnn Exp $ - -- Support rhino -- Disable SunOS multiarch -- Building japanese manpages crashes bootstrap JVM - ---- jdk/make/common/Release.gmk.orig 2015-01-26 15:20:57.000000000 +0000 -+++ jdk/make/common/Release.gmk -@@ -66,7 +66,7 @@ EXPORTED_PRIVATE_PKGS = com.oracle.net \ - # 64-bit solaris has a few special cases. We define the variable - # SOLARIS64 for use in this Makefile to easily test those cases - ifeq ($(PLATFORM), solaris) -- ifeq ($(ARCH_DATA_MODEL), 64) -+ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64) - SOLARIS64 = true - IMAGE_BINDIR = bin/$(ARCH) - endif -@@ -193,6 +193,7 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1S - if [ -f $${manbase}/$${manpage} ] ; then \ - $(CP) $${manbase}/$${manpage} $1/man/man1 ; \ - for ja_encoding in $(JA_TARGET_ENCODINGS); do \ -+ continue; \ - ja_dir="ja"; \ - if [ "$${ja_encoding}" != "$(JA_SOURCE_ENCODING)" ]; then \ - ja_dir="ja_JP.$${ja_encoding}"; \ -@@ -229,7 +230,7 @@ endif - INITIAL_IMAGE_JRE=initial-image-jre - INITIAL_IMAGE_JDK=initial-image-jdk - ifeq ($(PLATFORM), solaris) -- ifeq ($(ARCH_DATA_MODEL), 64) -+ ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64) - INITIAL_IMAGE_JRE=initial-image-jre-sol64 - INITIAL_IMAGE_JDK=initial-image-jdk-sol64 - endif -@@ -830,6 +831,7 @@ initial-image-jre:: initial-image-jre-se - $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar - $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar - $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar -+ $(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar - ifneq ($(JFR_JAR),) - $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar - endif -@@ -931,6 +933,7 @@ ifeq ($(PLATFORM), macosx) - $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/man/man1/javaws.1 - else - $(RM) -r $(JDK_SERVER_IMAGE_DIR) -+ $(RM) -rf $(JDK_IMAGE_DIR)/man/ja - $(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_IMAGE_DIR) - $(RM) -r $(JDK_SERVER_IMAGE_DIR)/demo - $(RM) -r $(JDK_SERVER_IMAGE_DIR)/sample -@@ -1159,7 +1162,8 @@ initial-image-jdk:: initial-image-jdk-se - @# - @# Swing BeanInfo generation - @# -- $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans -+ @# XXX javadoc -+ @# $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans - ifneq ($(PLATFORM), windows) - $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES)) - endif # !windows diff --git a/lang/openjdk7/patches/patch-ap b/lang/openjdk7/patches/patch-ap deleted file mode 100644 index 149b296c307..00000000000 --- a/lang/openjdk7/patches/patch-ap +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-ap,v 1.7 2017/08/14 00:02:16 ryoon Exp $ - -Use pkgsrc fontconfig. - ---- jdk/src/solaris/native/sun/awt/fontpath.c.orig 2017-08-13 05:55:21.000000000 +0000 -+++ jdk/src/solaris/native/sun/awt/fontpath.c -@@ -73,8 +73,8 @@ extern Display *awt_display; - #define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1") - #define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig") - #else --#define FONTCONFIG_DLL_VERSIONED VERSIONED_JNI_LIB_NAME("fontconfig", "1") --#define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig") -+#define FONTCONFIG_DLL_VERSIONED "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig") -+#define FONTCONFIG_DLL "@BUILDLINK_PREFIX.fontconfig@/lib/" JNI_LIB_NAME("fontconfig") - #endif - - #define MAXFDIRS 512 /* Max number of directories that contain fonts */ -@@ -190,6 +190,27 @@ static char *fullAixFontPath[] = { - NULL, /* terminates the list */ - }; - #endif -+static char *pkgsrcFontPath[] = { -+ "@PREFIX@/share/fonts/X11/100dpi", -+ "@PREFIX@/share/fonts/X11/75dpi", -+ "@PREFIX@/share/fonts/X11/Type1", -+ "@PREFIX@/share/fonts/X11/cyrillic", -+ "@PREFIX@/share/fonts/X11/misc", -+ "@PREFIX@/share/fonts/X11/TTF", -+ "/usr/X11R7/lib/X11/fonts/100dpi", -+ "/usr/X11R7/lib/X11/fonts/75dpi", -+ "/usr/X11R7/lib/X11/fonts/Type1", -+ "/usr/X11R7/lib/X11/fonts/cyrillic", -+ "/usr/X11R7/lib/X11/fonts/misc", -+ "/usr/X11R7/lib/X11/fonts/TTF", -+ "/usr/X11R6/lib/X11/fonts/100dpi", -+ "/usr/X11R6/lib/X11/fonts/75dpi", -+ "/usr/X11R6/lib/X11/fonts/Type1", -+ "/usr/X11R6/lib/X11/fonts/cyrillic", -+ "/usr/X11R6/lib/X11/fonts/misc", -+ "/usr/X11R6/lib/X11/fonts/TTF", -+ NULL -+}; - - static char **getFontConfigLocations(); - -@@ -561,6 +582,7 @@ static char *getPlatformFontPathChars(JN - #elif defined(AIX) - knowndirs = fullAixFontPath; - #endif -+ knowndirs = pkgsrcFontPath; - - /* REMIND: this code requires to be executed when the GraphicsEnvironment - * is already initialised. That is always true, but if it were not so, diff --git a/lang/openjdk7/patches/patch-aq b/lang/openjdk7/patches/patch-aq deleted file mode 100644 index 90452511112..00000000000 --- a/lang/openjdk7/patches/patch-aq +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aq,v 1.6 2013/06/15 09:31:05 jperkin Exp $ - -Support __progname. - ---- jdk/make/java/main/java/mapfile-amd64.orig 2012-08-10 17:21:36.000000000 +0000 -+++ jdk/make/java/main/java/mapfile-amd64 -@@ -31,6 +31,7 @@ SUNWprivate_1.1 { - global: - main; # Provides basic adb symbol offsets - environ; # Public symbols and required by Java run time -+ __progname; - _environ; - __environ_lock; - diff --git a/lang/openjdk7/patches/patch-ar b/lang/openjdk7/patches/patch-ar deleted file mode 100644 index 5b831b7c8c5..00000000000 --- a/lang/openjdk7/patches/patch-ar +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ar,v 1.4 2013/06/15 09:31:05 jperkin Exp $ - -freetype rpath. - ---- jdk/make/sun/font/Makefile.orig 2013-05-29 03:57:57.000000000 +0000 -+++ jdk/make/sun/font/Makefile -@@ -134,7 +134,7 @@ else - ifeq ($(USING_SYSTEM_FT_LIB), false) - FREETYPE_LIB = $(LIB_LOCATION)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX).6 - endif -- OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -lfreetype -+ OTHER_LDLIBS += -L$(FREETYPE_LIB_PATH) -Wl,-R$(FREETYPE_LIB_PATH) -lfreetype - endif - - library:: $(FREETYPE_LIB) diff --git a/lang/openjdk7/patches/patch-ba b/lang/openjdk7/patches/patch-ba deleted file mode 100644 index d211aacd963..00000000000 --- a/lang/openjdk7/patches/patch-ba +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- hotspot/src/share/vm/utilities/macros.hpp.orig 2012-08-10 16:28:55.000000000 +0000 -+++ hotspot/src/share/vm/utilities/macros.hpp -@@ -161,7 +161,7 @@ - #define NOT_WINDOWS(code) code - #endif - --#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) - #define BSD_ONLY(code) code - #define NOT_BSD(code) - #else diff --git a/lang/openjdk7/patches/patch-bd b/lang/openjdk7/patches/patch-bd deleted file mode 100644 index 753285de606..00000000000 --- a/lang/openjdk7/patches/patch-bd +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bd,v 1.5 2017/08/14 00:02:16 ryoon Exp $ - -Support __progname and environ. - ---- jdk/make/com/sun/java/pack/mapfile-vers.orig 2017-08-13 05:55:12.000000000 +0000 -+++ jdk/make/com/sun/java/pack/mapfile-vers -@@ -33,6 +33,8 @@ - - { - global: -+ __progname; -+ environ; - Java_com_sun_java_util_jar_pack_NativeUnpack_finish; - Java_com_sun_java_util_jar_pack_NativeUnpack_getNextFile; - Java_com_sun_java_util_jar_pack_NativeUnpack_getOption; diff --git a/lang/openjdk7/patches/patch-bg b/lang/openjdk7/patches/patch-bg deleted file mode 100644 index cf03ffe023c..00000000000 --- a/lang/openjdk7/patches/patch-bg +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-bg,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c.orig 2013-05-29 03:57:58.000000000 +0000 -+++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c -@@ -357,7 +357,7 @@ Java_java_net_PlainDatagramSocketImpl_di - #ifdef AF_INET6 - if (ipv6_available()) { - struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&addr; --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - him6->sin6_family = AF_INET6; - #else - him6->sin6_family = AF_UNSPEC; -@@ -367,7 +367,7 @@ Java_java_net_PlainDatagramSocketImpl_di - #endif - { - struct sockaddr_in *him4 = (struct sockaddr_in*)&addr; --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - him4->sin_family = AF_INET; - #else - him4->sin_family = AF_UNSPEC; diff --git a/lang/openjdk7/patches/patch-bh b/lang/openjdk7/patches/patch-bh deleted file mode 100644 index 2591b6ff8db..00000000000 --- a/lang/openjdk7/patches/patch-bh +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bh,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- hotspot/make/defs.make.orig 2012-08-10 16:23:01.000000000 +0000 -+++ hotspot/make/defs.make -@@ -124,6 +124,9 @@ ifeq ($(OS),) - ifeq ($(OS), Darwin) - OS=bsd - endif -+ ifeq ($(OS), DragonFly) -+ OS=bsd -+ endif - HOST := $(shell uname -n) - endif - diff --git a/lang/openjdk7/patches/patch-bi b/lang/openjdk7/patches/patch-bi deleted file mode 100644 index 114328ea931..00000000000 --- a/lang/openjdk7/patches/patch-bi +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-bi,v 1.4 2013/06/15 09:31:05 jperkin Exp $ - -DragonFly support. - ---- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.orig 2012-08-10 16:24:31.000000000 +0000 -+++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp -@@ -94,7 +94,7 @@ - #define SPELL_REG_FP "ebp" - #endif // AMD64 - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - # define context_trapno uc_mcontext.mc_trapno - # ifdef AMD64 - # define context_pc uc_mcontext.mc_rip -@@ -279,13 +279,8 @@ address os::current_stack_pointer() { - register void *esp; - __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp)); - return (address) esp; --#elif defined(SPARC_WORKS) -- register void *esp; -- __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp)); -- return (address) ((char*)esp + sizeof(long)*2); - #else -- register void *esp __asm__ (SPELL_REG_SP); -- return (address) esp; -+ return (address)__builtin_frame_address(0); - #endif - } - -@@ -362,13 +357,7 @@ frame os::get_sender_for_C_frame(frame* - } - - intptr_t* _get_previous_fp() { --#if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__) -- register intptr_t **ebp; -- __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp)); --#else -- register intptr_t **ebp __asm__ (SPELL_REG_FP); --#endif -- return (intptr_t*) *ebp; // we want what it points to. -+ return (intptr_t *)__builtin_frame_address(1); - } - - diff --git a/lang/openjdk7/patches/patch-bn b/lang/openjdk7/patches/patch-bn deleted file mode 100644 index b4af4cdefe1..00000000000 --- a/lang/openjdk7/patches/patch-bn +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-bn,v 1.5 2014/06/01 17:55:33 wiz Exp $ - -Use pkgsrc fonts. - ---- jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.orig 2014-01-01 05:53:43.000000000 +0000 -+++ jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties -@@ -166,24 +166,24 @@ sequence.fallback=chinese-big5,chinese-g - - # Font File Names - --filename.DejaVu_LGC_Sans=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans.ttf --filename.DejaVu_LGC_Sans_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Bold.ttf --filename.DejaVu_LGC_Sans_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-Oblique.ttf --filename.DejaVu_LGC_Sans_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSans-BoldOblique.ttf -+filename.DejaVu_LGC_Sans=@PREFIX@/share/fonts/X11/TTF/DejaVuSans.ttf -+filename.DejaVu_LGC_Sans_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-Bold.ttf -+filename.DejaVu_LGC_Sans_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-Oblique.ttf -+filename.DejaVu_LGC_Sans_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSans-BoldOblique.ttf - --filename.DejaVu_LGC_Sans_Mono=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono.ttf --filename.DejaVu_LGC_Sans_Mono_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Bold.ttf --filename.DejaVu_LGC_Sans_Mono_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-Oblique.ttf --filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSansMono-BoldOblique.ttf -+filename.DejaVu_LGC_Sans_Mono=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-Bold.ttf -+filename.DejaVu_LGC_Sans_Mono_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-Oblique.ttf -+filename.DejaVu_LGC_Sans_Mono_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSansMono-BoldOblique.ttf - --filename.DejaVu_LGC_Serif=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif.ttf --filename.DejaVu_LGC_Serif_Bold=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Bold.ttf --filename.DejaVu_LGC_Serif_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-Oblique.ttf --filename.DejaVu_LGC_Serif_Bold_Oblique=/usr/share/fonts/dejavu-lgc/DejaVuLGCSerif-BoldOblique.ttf -+filename.DejaVu_LGC_Serif=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif.ttf -+filename.DejaVu_LGC_Serif_Bold=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-Bold.ttf -+filename.DejaVu_LGC_Serif_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-Italic.ttf -+filename.DejaVu_LGC_Serif_Bold_Oblique=@PREFIX@/share/fonts/X11/TTF/DejaVuSerif-BoldItalic.ttf - --filename.Sazanami_Gothic=/usr/share/fonts/japanese/TrueType/sazanami-gothic.ttf --filename.Sazanami_Mincho=/usr/share/fonts/japanese/TrueType/sazanami-mincho.ttf --filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/chinese/TrueType/uming.ttf --filename.AR_PL_ZenKai_Uni=/usr/share/fonts/chinese/TrueType/ukai.ttf --filename.Baekmuk_Gulim=/usr/share/fonts/korean/TrueType/gulim.ttf --filename.Baekmuk_Batang=/usr/share/fonts/korean/TrueType/batang.ttf -+filename.Sazanami_Gothic=@PREFIX@/share/fonts/X11/TTF/sazanami-gothic.ttf -+filename.Sazanami_Mincho=@PREFIX@/share/fonts/X11/TTF/sazanami-mincho.ttf -+filename.AR_PL_ShanHeiSun_Uni=@PREFIX@/share/fonts/X11/TTF/uming.ttf -+filename.AR_PL_ZenKai_Uni=@PREFIX@/share/fonts/X11/TTF/ukai.ttf -+filename.Baekmuk_Gulim=@PREFIX@/share/fonts/X11/TTF/gulim.ttf -+filename.Baekmuk_Batang=@PREFIX@/share/fonts/X11/TTF/batang.ttf diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-utils.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-utils.gmk deleted file mode 100644 index bd63421cacc..00000000000 --- a/lang/openjdk7/patches/patch-corba_make_common_shared_Defs-utils.gmk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-corba_make_common_shared_Defs-utils.gmk,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -Use pkgsrc unzip. - ---- corba/make/common/shared/Defs-utils.gmk.orig 2013-02-20 04:35:29.000000000 +0000 -+++ corba/make/common/shared/Defs-utils.gmk -@@ -136,7 +136,7 @@ TR = $(UTILS_USR_BIN_PATH)tr - TRUE = $(UTILS_COMMAND_PATH)true - UNAME = $(UTILS_COMMAND_PATH)uname - UNIQ = $(UTILS_USR_BIN_PATH)uniq --UNZIP = $(UTILS_USR_BIN_PATH)unzip -+UNZIP = $(UTILS_DEVTOOL_PATH)unzip - UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx - WC = $(UTILS_USR_BIN_PATH)wc - WHICH = $(UTILS_USR_BIN_PATH)which diff --git a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk b/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk deleted file mode 100644 index 33241cf3554..00000000000 --- a/lang/openjdk7/patches/patch-corba_make_common_shared_Platform.gmk +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-corba_make_common_shared_Platform.gmk,v 1.3 2014/01/02 01:16:35 ryoon Exp $ - -Avoid warnings when building in a zone. - -Disable multiarch support. - ---- corba/make/common/shared/Platform.gmk.orig 2014-01-01 05:49:21.000000000 +0000 -+++ corba/make/common/shared/Platform.gmk -@@ -115,7 +115,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) - ARCH := $(shell isainfo -n) - # ISA_DIR is used to locate 64-bit specific libraries which are generally - # in the same general place as other libraries under the ./$(ARCH) directory -- ISA_DIR = /$(ARCH) -+ NOMULTIARCHISA_DIR = /$(ARCH) - endif - # Need to maintain the jre/lib/i386 location for 32-bit Intel - ifeq ($(ARCH), i586) -@@ -143,7 +143,7 @@ ifeq ($(SYSTEM_UNAME), SunOS) - REQUIRED_FREE_SPACE=1040000 - endif - # How much RAM does this machine have: -- MB_OF_MEMORY=$(shell /etc/prtconf | fgrep 'Memory size:' | expand | cut -d' ' -f3) -+ MB_OF_MEMORY=$(shell /usr/sbin/prtconf 2>&1 | fgrep 'Memory size:' | expand | cut -d' ' -f3) - endif - - # Platform settings specific to Linux -@@ -238,6 +238,13 @@ ifeq ($(SYSTEM_UNAME), FreeBSD) - REQUIRED_OS_VERSION = 6.0 - endif - -+ifeq ($(SYSTEM_UNAME), DragonFly) -+ PLATFORM = bsd -+ OS_NAME = dragonfly -+ OS_VENDOR = DragonFlyBSD -+ REQUIRED_OS_VERSION = 2.4 -+endif -+ - ifeq ($(SYSTEM_UNAME), Darwin) - PLATFORM = bsd - OS_NAME = darwin -@@ -318,9 +325,9 @@ ifeq ($(PLATFORM), bsd) - REQUIRED_FREE_SPACE=1500000 - # How much RAM does this machine have: - ifeq ($(OS_VENDOR), OpenBSD) -- MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) -+ MB_OF_MEMORY=$(shell /sbin/sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' ) - else -- MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) -+ MB_OF_MEMORY=$(shell (/sbin/sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' ) - endif - endif - diff --git a/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java b/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java deleted file mode 100644 index f4d7d56473b..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java,v 1.1 2014/07/25 20:35:14 ryoon Exp $ - ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.orig 2014-06-14 20:38:20.000000000 +0000 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java -@@ -45,6 +45,8 @@ public class PlatformInfo { - return "bsd"; - } else if (os.equals("Darwin") || os.contains("OS X")) { - return "bsd"; -+ } else if (os.equals("DragonFlyBSD")) { -+ return "bsd"; - } else if (os.startsWith("Windows")) { - return "win32"; - } else { diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_Makefile b/lang/openjdk7/patches/patch-hotspot_make_bsd_Makefile deleted file mode 100644 index ee2ae0e7ea3..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_bsd_Makefile +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-hotspot_make_bsd_Makefile,v 1.1 2017/08/14 00:02:16 ryoon Exp $ - -* Disable run of test_gamma to fix invocation failure from PaX MPROTECT - Partially from http://hg.openjdk.java.net/hsx/hsx25/hotspot/rev/98f3af397705 - ---- hotspot/make/bsd/Makefile.orig 2017-08-13 05:55:27.000000000 +0000 -+++ hotspot/make/bsd/Makefile -@@ -290,54 +290,36 @@ platform_zero: $(GAMMADIR)/make/$(OSNAME - - $(TARGETS_C2): $(SUBDIRS_C2) - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) --ifeq ($(TEST_IN_BUILD),true) -- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma --endif - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_TIERED): $(SUBDIRS_TIERED) - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) --ifeq ($(TEST_IN_BUILD),true) -- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma --endif - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_C1): $(SUBDIRS_C1) - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) --ifeq ($(TEST_IN_BUILD),true) -- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma --endif - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_CORE): $(SUBDIRS_CORE) - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) --ifeq ($(TEST_IN_BUILD),true) -- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma --endif - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_ZERO): $(SUBDIRS_ZERO) - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) --ifeq ($(TEST_IN_BUILD),true) -- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma --endif - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_SHARK): $(SUBDIRS_SHARK) - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) --ifeq ($(TEST_IN_BUILD),true) -- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma --endif - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install - endif diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make deleted file mode 100644 index 11cefd84700..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_defs.make +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-hotspot_make_bsd_makefiles_defs.make,v 1.4 2015/02/21 20:21:56 tnn Exp $ - -Fix architecture name. - ---- hotspot/make/bsd/makefiles/defs.make.orig 2015-01-26 15:21:52.000000000 +0000 -+++ hotspot/make/bsd/makefiles/defs.make -@@ -29,7 +29,7 @@ - SLASH_JAVA ?= /java - - # Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name --ARCH:=$(shell uname -m) -+ARCH:=$(shell uname -m | sed -e 's,x86_64,amd64,' -e 's,.*arm.*,arm,') - PATH_SEP = : - ifeq ($(LP64), 1) - ARCH_DATA_MODEL ?= 64 diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make deleted file mode 100644 index 945c829bf69..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-hotspot_make_bsd_makefiles_zeroshark.make,v 1.1 2015/02/08 23:40:09 tnn Exp $ - ---- hotspot/make/bsd/makefiles/zeroshark.make.orig 2015-01-26 15:21:52.000000000 +0000 -+++ hotspot/make/bsd/makefiles/zeroshark.make -@@ -57,6 +57,6 @@ else - endif - - CFLAGS += -I$(PACKAGE_PATH)/include --LIBS += -L$(PACKAGE_PATH)/lib -lffi -+LIBS += -Wl,-R$(PACKAGE_PATH)/lib -L$(PACKAGE_PATH)/lib -lffi - - OPT_CFLAGS/compactingPermGenGen.o = -O1 diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_adlc.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_adlc.make deleted file mode 100644 index 55338811c66..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_adlc.make +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_adlc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/adlc.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/adlc.make -@@ -75,9 +75,11 @@ endif - - # CFLAGS_WARN holds compiler options to suppress/enable warnings. - # Compiler warnings are treated as errors -+ifeq ("${Platform_compiler}", "sparcWorks") - ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) - CFLAGS_WARN = +w -errwarn - endif -+endif - CFLAGS += $(CFLAGS_WARN) - - ifeq ("${Platform_compiler}", "sparcWorks") diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_debug.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_debug.make deleted file mode 100644 index 7309b89576e..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_debug.make +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_debug.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/debug.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/debug.make -@@ -45,7 +45,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef - - # This mapfile is only needed when compiling with dtrace support, - # and mustn't be otherwise. --MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+ifdef USE_GCC -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc -+else -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+endif # USE_GCC - - _JUNK_ := $(shell echo >&2 ""\ - "-------------------------------------------------------------------------\n" \ diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make deleted file mode 100644 index d78864fff0c..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_dtrace.make +++ /dev/null @@ -1,56 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_dtrace.make,v 1.2 2014/01/02 01:16:35 ryoon Exp $ - -Enable DTrace support with GCC. - ---- hotspot/make/solaris/makefiles/dtrace.make.orig 2014-01-01 05:50:04.000000000 +0000 -+++ hotspot/make/solaris/makefiles/dtrace.make -@@ -29,13 +29,6 @@ - - ifneq ("${TYPE}", "CORE") - --ifdef USE_GCC -- --dtraceCheck: -- $(QUIETLY) echo "**NOTICE** Dtrace support disabled for gcc builds" -- --else -- - JVM_DB = libjvm_db - LIBJVM_DB = libjvm_db.so - LIBJVM_DB_G = libjvm$(G_SUFFIX)_db.so -@@ -62,14 +55,23 @@ DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Pla - DTRACE = dtrace - DTRACE.o = $(DTRACE).o - --# to remove '-g' option which causes link problems --# also '-z nodefs' is used as workaround --GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';) -+ifdef USE_GCC -+ # solaris linker does not like gcc and -fvisibility=hidden without mapfiles -+ GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g' -e 's/ -fvisibility=hidden / /g';) -+else -+ # to remove '-g' option which causes link problems -+ # also '-z nodefs' is used as workaround -+ GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';) -+endif - - ifdef LP64 - DTRACE_OPTS = -64 -D_LP64 - endif - -+ifdef USE_GCC -+ DTRACE_OPTS = -D_GNU_SOURCE -+endif # USE_GCC -+ - # making libjvm_db - - # Use mapfile with libjvm_db.so -@@ -383,8 +385,6 @@ dtraceCheck: - - endif # ifneq ("${dtraceFound}", "") - --endif # ifdef USE_GCC -- - else # CORE build - - dtraceCheck: diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make deleted file mode 100644 index b9a45c75328..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_fastdebug.make +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_fastdebug.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/fastdebug.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/fastdebug.make -@@ -116,7 +116,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef - - # This mapfile is only needed when compiling with dtrace support, - # and mustn't be otherwise. --MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+ifdef USE_GCC -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc -+else -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+endif # USE_GCC - - G_SUFFIX = _g - VERSION = optimized diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make deleted file mode 100644 index 3e24fd528ad..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_gcc.make +++ /dev/null @@ -1,130 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.3 2014/01/02 01:16:35 ryoon Exp $ - -GCC support. - -Disable SunOS multiarch. - ---- hotspot/make/solaris/makefiles/gcc.make.orig 2014-01-01 05:50:04.000000000 +0000 -+++ hotspot/make/solaris/makefiles/gcc.make -@@ -70,11 +70,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) - VM_PICFLAG/AOUT = - VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO)) - -+ifeq ($(JVM_VARIANT_ZERO), true) -+ CFLAGS += $(LIBFFI_CFLAGS) -+endif -+ifeq ($(JVM_VARIANT_ZEROSHARK), true) -+ CFLAGS += $(LIBFFI_CFLAGS) -+ CFLAGS += $(LLVM_CFLAGS) -+endif - CFLAGS += $(VM_PICFLAG) - CFLAGS += -fno-rtti - CFLAGS += -fno-exceptions - CFLAGS += -D_REENTRANT - CFLAGS += -fcheck-new -+# version 4 and above support fvisibility=hidden (matches jni_x86.h file) -+# except 4.1.2 gives pointless warnings that can't be disabled (afaik) -+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" -+ CFLAGS += -fvisibility=hidden -+endif - - ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) - -@@ -86,7 +98,8 @@ ARCHFLAG/amd64 = -m64 -march=k8 - - # Optional sub-directory in /usr/lib where BUILDARCH libraries are kept. - ISA_DIR=$(ISA_DIR/$(BUILDARCH)) --ISA_DIR/amd64=/amd64 -+ISA_DIR/amd64= -+NOMULTIARCHISA_DIR/amd64=/amd64 - ISA_DIR/i486= - ISA_DIR/sparcv9=/64 - -@@ -107,6 +120,11 @@ ifdef CC_INTERP - CFLAGS += -DCC_INTERP - endif - -+# Build for embedded targets -+ifdef JAVASE_EMBEDDED -+ CFLAGS += -DJAVASE_EMBEDDED -+endif -+ - # Keep temporary files (.ii, .s) - ifdef NEED_ASM - CFLAGS += -save-temps -@@ -117,9 +135,18 @@ endif - - # Compiler warnings are treated as errors - WARNINGS_ARE_ERRORS = -Werror --# Enable these warnings. See 'info gcc' about details on these options --ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare --CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS) -+ -+# Except for a few acceptable ones -+# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit -+# conversions which might affect the values. To avoid that, we need to turn -+# it off explicitly. -+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" -+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare -+else -+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare -+endif -+ -+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) - # Special cases - CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) - -@@ -177,7 +204,7 @@ MAPFLAG = -Xlinker -M -Xlinker FILENAME - endif - - # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj --SONAMEFLAG = -Xlinker -soname=SONAME -+SONAMEFLAG = -Wl,-soname=SONAME - - # Build shared library - SHARED_FLAG = -shared -@@ -185,15 +212,32 @@ SHARED_FLAG = -shared - #------------------------------------------------------------------------ - # Debug flags - --# Use the stabs format for debugging information (this is the default --# on gcc-2.91). It's good enough, has all the information about line --# numbers and local variables, and libjvm_g.so is only about 16M. --# Change this back to "-g" if you want the most expressive format. --# (warning: that could easily inflate libjvm_g.so to 150M!) --# Note: The Itanium gcc compiler crashes when using -gstabs. --DEBUG_CFLAGS/ia64 = -g --DEBUG_CFLAGS/amd64 = -g --DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) --ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) --DEBUG_CFLAGS += -gstabs --endif -+# DEBUG_BINARIES uses full -g debug information for all configs -+ifeq ($(DEBUG_BINARIES), true) -+ CFLAGS += -g -+else -+# Use the stabs format for debugging information (this is the default -+# on gcc-2.91). It's good enough, has all the information about line -+# numbers and local variables, and libjvm_g.so is only about 16M. -+# Change this back to "-g" if you want the most expressive format. -+# (warning: that could easily inflate libjvm_g.so to 150M!) -+# Note: The Itanium gcc compiler crashes when using -gstabs. -+DEBUG_CFLAGS/ia64 = -g -+DEBUG_CFLAGS/amd64 = -g -+DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) -+ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) -+DEBUG_CFLAGS += -gstabs -+endif -+endif -+ -+# If we are building HEADLESS, pass on to VM -+# so it can set the java.awt.headless property -+ifdef HEADLESS -+ CFLAGS += -DHEADLESS -+endif -+ -+# We are building Embedded for a small device -+# favor code space over speed -+ifdef MINIMIZE_RAM_USAGE -+ CFLAGS += -DMINIMIZE_RAM_USAGE -+endif diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jsig.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jsig.make deleted file mode 100644 index 44baa264dfe..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jsig.make +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_jsig.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/jsig.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/jsig.make -@@ -47,15 +47,25 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfi - LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE)) - - ifdef USE_GCC --LFLAGS_JSIG += -D_REENTRANT -+ LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT - else --LFLAGS_JSIG += -mt -xnolib -+ LFLAGS_JSIG += -mt -xnolib -+endif -+ -+# DEBUG_BINARIES overrides everything, use full -g debug information -+ifeq ($(DEBUG_BINARIES), true) -+ JSIG_DEBUG_CFLAGS = -g - endif - - $(LIBJSIG): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) - @echo Making signal interposition lib... -+ifdef USE_GCC -+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ -+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $(JSIGSRCDIR)/jsig.c -ldl -+else - $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ - $(LFLAGS_JSIG) -o $@ $(JSIGSRCDIR)/jsig.c -ldl -+endif - [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jvmg.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jvmg.make deleted file mode 100644 index cc946f13be1..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_jvmg.make +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_jvmg.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/jvmg.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/jvmg.make -@@ -49,7 +49,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef - - # This mapfile is only needed when compiling with dtrace support, - # and mustn't be otherwise. --MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+ifdef USE_GCC -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc -+else -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+endif # USE_GCC - - G_SUFFIX = _g - VERSION = debug diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc deleted file mode 100644 index 54b5a139e72..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc.orig 2013-03-10 22:22:12.895432470 +0000 -+++ hotspot/make/solaris/makefiles/mapfile-vers-COMPILER1.gcc -@@ -0,0 +1,43 @@ -+# -+ -+# -+# Copyright (c) 2003, 2008, 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. -+# -+# -+ -+# Define public interface. -+ -+SUNWprivate_1.1 { -+ global: -+ # Dtrace support -+ _ZN8Universe15_methodKlassObjE; -+ _ZN9CodeCache5_heapE; -+ _ZN8Universe14_collectedHeapE; -+ _ZTV7nmethod; -+ _ZTV8CodeBlob; -+ _ZTV10BufferBlob; -+ _ZTV11RuntimeStub; -+ _ZTV13SafepointBlob; -+ _ZTV18DeoptimizationBlob; -+ -+ __JvmOffsets; -+}; diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc deleted file mode 100644 index 10a4d47dd4a..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc.orig 2013-03-10 22:22:12.896595236 +0000 -+++ hotspot/make/solaris/makefiles/mapfile-vers-COMPILER2.gcc -@@ -0,0 +1,46 @@ -+# -+ -+# -+# Copyright (c) 2003, 2008, 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. -+# -+# -+ -+# Define public interface. -+ -+SUNWprivate_1.1 { -+ global: -+ # Dtrace support -+ _ZN8Universe15_methodKlassObjE; -+ _ZN9CodeCache5_heapE; -+ _ZN8Universe14_collectedHeapE; -+ _ZTV7nmethod; -+ _ZTV8CodeBlob; -+ _ZTV10BufferBlob; -+ _ZTV11RuntimeStub; -+ _ZTV13SafepointBlob; -+ _ZTV18DeoptimizationBlob; -+ -+ _ZTV13ExceptionBlob; -+ _ZTV16UncommonTrapBlob; -+ -+ __JvmOffsets; -+}; diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc deleted file mode 100644 index f840ef0847a..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_mapfile-vers-TIERED.gcc,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc.orig 2013-03-10 22:22:12.897768214 +0000 -+++ hotspot/make/solaris/makefiles/mapfile-vers-TIERED.gcc -@@ -0,0 +1,45 @@ -+# -+ -+# -+# Copyright (c) 2006, 2008, 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. -+# -+# -+ -+# Define public interface. -+ -+SUNWprivate_1.1 { -+ global: -+ # Dtrace support -+ _ZN8Universe15_methodKlassObjE; -+ _ZN9CodeCache5_heapE; -+ _ZN8Universe14_collectedHeapE; -+ _ZTV7nmethod; -+ _ZTV8CodeBlob; -+ _ZTV10BufferBlob; -+ _ZTV11RuntimeStub; -+ _ZTV13SafepointBlob; -+ _ZTV18DeoptimizationBlob; -+ _ZTV13ExceptionBlob; -+ _ZTV16UncommonTrapBlob; -+ -+ __JvmOffsets; -+}; diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_optimized.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_optimized.make deleted file mode 100644 index 6f702aac9b1..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_optimized.make +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_optimized.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/optimized.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/optimized.make -@@ -57,7 +57,11 @@ MAPFILE = $(GAMMADIR)/make/solaris/makef - - # This mapfile is only needed when compiling with dtrace support, - # and mustn't be otherwise. --MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+ifdef USE_GCC -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc -+else -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+endif # USE_GCC - - # Set the environment variable HOTSPARC_GENERIC to "true" - # to inhibit the effect of the previous line on CFLAGS. diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_product.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_product.make deleted file mode 100644 index bb56402e5c4..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_product.make +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_product.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/product.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/product.make -@@ -65,11 +65,16 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAG - # Linker mapfiles - MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers - --ifndef USE_GCC - # This mapfile is only needed when compiling with dtrace support, - # and mustn't be otherwise. --MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+ifdef USE_GCC -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE).gcc -+else -+ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE) -+endif # USE_GCC - -+# reorder is not used with gcc -+ifndef USE_GCC - REORDERFILE = $(GAMMADIR)/make/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH) - endif - diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_saproc.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_saproc.make deleted file mode 100644 index eed134319a4..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_saproc.make +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_saproc.make,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -Only use libdemangle for Sun Studio builds. - ---- hotspot/make/solaris/makefiles/saproc.make.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/make/solaris/makefiles/saproc.make -@@ -61,6 +61,7 @@ ifdef USE_GCC - SA_LFLAGS += -D_REENTRANT - else - SA_LFLAGS += -mt -xnolib -norunpath -+LIBDEMANGLE = -ldemangle - endif - - # The libproc Pstack_iter() interface changed in Nevada-B159. -@@ -106,7 +107,7 @@ $(LIBSAPROC): $(ADD_GNU_DEBUGLINK) $(FIX - $(SASRCFILES) \ - $(SA_LFLAGS) \ - -o $@ \ -- -ldl -ldemangle -lthread -lc -+ -ldl ${LIBDEMANGLE} -lthread -lc - [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. diff --git a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make b/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make deleted file mode 100644 index 06a27a720ff..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_make_solaris_makefiles_vm.make +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_vm.make,v 1.2 2014/01/02 01:16:35 ryoon Exp $ - -GCC support. - ---- hotspot/make/solaris/makefiles/vm.make.orig 2014-01-01 05:50:04.000000000 +0000 -+++ hotspot/make/solaris/makefiles/vm.make -@@ -59,7 +59,11 @@ INCLUDES += $(Src_Dirs_I:%=-I%) - ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) - # always build with debug info when we can create .debuginfo files - # and disable 'lazy debug info' so the .so has everything. -- SYMFLAG = -g -xs -+ ifdef USE_GCC -+ SYMFLAG = -g -+ else -+ SYMFLAG = -g -xs -+ endif - else - ifeq (${VERSION}, debug) - SYMFLAG = -g -@@ -137,7 +141,7 @@ LIBS += -ldl -lthread -lsocket $(LIBM) - - endif # 502 - endif # 505 - else --LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc -ldemangle -+LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc - endif # sparcWorks - - LIBS += -lkstat -@@ -271,16 +275,19 @@ ifeq ($(LINK_INTO),AOUT) - LIBS_VM = $(LIBS) - else - LIBJVM.o = $(JVM_OBJ_FILES) -- LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder -- LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) - LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM)) - ifndef USE_GCC - LIBS_VM = $(LIBS) -+ LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder -+ LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE)) - else - # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to - # get around library dependency and compatibility issues. Must use gcc not - # g++ to link. - LFLAGS_VM += $(STATIC_LIBGCC) -+ ifeq ($(BUILDARCH),i486) -+ LFLAGS_VM += -mimpure-text -+ endif - LIBS_VM += $(STATIC_STDCXX) $(LIBS) - endif - endif diff --git a/lang/openjdk7/patches/patch-hotspot_src_cpu_x86_vm_jni__x86.h b/lang/openjdk7/patches/patch-hotspot_src_cpu_x86_vm_jni__x86.h deleted file mode 100644 index 8d80eb1d559..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_cpu_x86_vm_jni__x86.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-hotspot_src_cpu_x86_vm_jni__x86.h,v 1.1 2020/03/22 21:22:20 joerg Exp $ - ---- hotspot/src/cpu/x86/vm/jni_x86.h.orig 2020-03-22 17:50:27.459024653 +0000 -+++ hotspot/src/cpu/x86/vm/jni_x86.h -@@ -28,7 +28,7 @@ - - #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE) - --#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2) -+#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2) || defined(__clang__)) - #define JNIEXPORT __attribute__((visibility("default"))) - #define JNIIMPORT __attribute__((visibility("default"))) - #else diff --git a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp b/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp deleted file mode 100644 index fb88e33b2b5..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-hotspot_src_cpu_zero_vm_cppInterpreter__zero.cpp,v 1.1 2018/09/14 15:53:46 tnn Exp $ - -mcs is undefined ... - ---- hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp.orig 2017-08-13 05:55:27.000000000 +0000 -+++ hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp -@@ -250,7 +250,7 @@ int CppInterpreter::native_entry(methodO - if ((UseCompiler || CountCompiledCalls) && !method->is_synchronized()) { - InvocationCounter *counter = method->invocation_counter(); - counter->increment(); -- if (counter->reached_InvocationLimit(mcs->backedge_counter())) { -+ if (counter->reached_InvocationLimit(method->backedge_counter())) { - CALL_VM_NOCHECK( - InterpreterRuntime::frequency_counter_overflow(thread, NULL)); - if (HAS_PENDING_EXCEPTION) diff --git a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp b/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp deleted file mode 100644 index d9ccb6ce6fa..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-hotspot_src_cpu_zero_vm_methodHandles__zero.cpp,v 1.1 2015/02/21 10:44:14 tnn Exp $ - -Fix zero build w/ debug enabled - ---- hotspot/src/cpu/zero/vm/methodHandles_zero.cpp.orig 2015-02-02 15:32:37.000000000 +0000 -+++ hotspot/src/cpu/zero/vm/methodHandles_zero.cpp -@@ -24,8 +24,8 @@ - */ - - #include "precompiled.hpp" --#include "interpreter/interpreterGenerator.hpp" - #include "interpreter/interpreter.hpp" -+#include "interpreter/interpreterGenerator.hpp" - #include "memory/allocation.inline.hpp" - #include "prims/methodHandles.hpp" - diff --git a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp b/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp deleted file mode 100644 index 181702ad4e4..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-hotspot_src_cpu_zero_vm_nativeInst__zero.cpp,v 1.1 2015/02/21 10:44:14 tnn Exp $ - -Fix zero build w/ debug enabled - ---- hotspot/src/cpu/zero/vm/nativeInst_zero.cpp.orig 2015-02-02 15:32:37.000000000 +0000 -+++ hotspot/src/cpu/zero/vm/nativeInst_zero.cpp -@@ -24,6 +24,7 @@ - */ - - #include "precompiled.hpp" -+#include "interpreter/interpreter.hpp" - #include "assembler_zero.inline.hpp" - #include "memory/resourceArea.hpp" - #include "nativeInst_zero.hpp" diff --git a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_stubGenerator__zero.cpp b/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_stubGenerator__zero.cpp deleted file mode 100644 index 97147cbb5d0..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_cpu_zero_vm_stubGenerator__zero.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-hotspot_src_cpu_zero_vm_stubGenerator__zero.cpp,v 1.1 2018/09/14 15:53:46 tnn Exp $ - -Workaround incomplete libc/no alloca(3) on NetBSD/aarch64 - ---- hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp.orig 2017-08-13 05:55:27.000000000 +0000 -+++ hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp -@@ -23,6 +23,11 @@ - * - */ - -+#if defined(__NetBSD__) && defined(__aarch64__) -+// there is no alloca(3) yet on this port -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - #include "precompiled.hpp" - #include "asm/assembler.hpp" - #include "assembler_zero.inline.hpp" diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp deleted file mode 100644 index 0a9a1d01966..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_atomic__bsd__zero.inline.hpp,v 1.1 2015/02/21 10:44:14 tnn Exp $ - -ARM: Substitute Linux atomic ops with NetBSD atomic ops - ---- hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp.orig 2015-02-02 15:32:37.000000000 +0000 -+++ hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp -@@ -112,8 +112,13 @@ static inline int m68k_lock_test_and_set - * - */ - -+#ifdef __NetBSD__ -+#include <sys/atomic.h> -+#define __kernel_cmpxchg(oldval, newval, ptr) ((unsigned int)(oldval) != atomic_cas_uint((volatile unsigned int*)(ptr), (unsigned int)(oldval), (unsigned int)(newval))) -+#else - typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr); - #define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0) -+#endif - - - -@@ -189,7 +194,7 @@ - - inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { - #ifdef ARM -- return arm_add_and_fetch(dest, add_value); -+ return arm_add_and_fetch((volatile int*)dest, add_value); - #else - #ifdef M68K - return m68k_add_and_fetch(dest, add_value); -@@ -246,7 +251,7 @@ - inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, - volatile intptr_t* dest) { - #ifdef ARM -- return arm_lock_test_and_set(dest, exchange_value); -+ return arm_lock_test_and_set((volatile int*)dest, exchange_value); - #else - #ifdef M68K - return m68k_lock_test_and_set(dest, exchange_value); -@@ -286,7 +291,7 @@ - volatile intptr_t* dest, - intptr_t compare_value) { - #ifdef ARM -- return arm_compare_and_swap(dest, compare_value, exchange_value); -+ return arm_compare_and_swap((volatile int*)dest, compare_value, exchange_value); - #else - #ifdef M68K - return m68k_compare_and_swap(dest, compare_value, exchange_value); diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp deleted file mode 100644 index ee83c92c60c..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_orderAccess__bsd__zero.inline.hpp,v 1.1 2015/02/21 10:44:14 tnn Exp $ - -ARM: Substitute Linux atomic ops with NetBSD atomic ops - ---- hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp.orig 2015-02-02 15:32:37.000000000 +0000 -+++ hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp -@@ -37,8 +37,13 @@ - * and gcc __sync_synchronize(); implementation does not use the kernel - * helper for all gcc versions so it is unreliable to use as well. - */ -+#ifdef __NetBSD__ -+#include <sys/atomic.h> -+#define __kernel_dmb membar_sync -+#else - typedef void (__kernel_dmb_t) (void); - #define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0) -+#endif - - #define FULL_MEM_BARRIER __kernel_dmb() - #define READ_MEM_BARRIER __kernel_dmb() diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp deleted file mode 100644 index b1ce636befc..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_bsd__zero_vm_os__bsd__zero.cpp,v 1.3 2018/09/14 15:53:46 tnn Exp $ - -SpinPause() needs to return a proper value, or we can apparently crash. -Already fixed in upstream openjdk8, but not in openjdk7. -Fix for JDK-8087120 stack frame pointer issue. - ---- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.orig 2017-08-13 05:55:27.000000000 +0000 -+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp -@@ -60,8 +60,8 @@ - #include "utilities/vmError.hpp" - - address os::current_stack_pointer() { -- address dummy = (address) &dummy; -- return dummy; -+ // return the address of the current function -+ return (address)__builtin_frame_address(0); - } - - frame os::get_sender_for_C_frame(frame* fr) { -@@ -464,6 +464,7 @@ void os::print_register_info(outputStrea - - extern "C" { - int SpinPause() { -+ return 1; - } - - int SafeFetch32(int *adr, int errValue) { -@@ -542,21 +543,6 @@ extern "C" { - } - }; - --///////////////////////////////////////////////////////////////////////////// --// Implementations of atomic operations not supported by processors. --// -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html -- --#ifndef _LP64 --extern "C" { -- long long unsigned int __sync_val_compare_and_swap_8( -- volatile void *ptr, -- long long unsigned int oldval, -- long long unsigned int newval) { -- ShouldNotCallThis(); -- } --}; --#endif // !_LP64 -- - #ifndef PRODUCT - void os::verify_stack_alignment() { - } diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp deleted file mode 100644 index 0d0189083aa..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp +++ /dev/null @@ -1,92 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_atomic__solaris__x86.inline.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp -@@ -59,6 +59,8 @@ inline void Atomic::dec_ptr(volatile voi - // facilitate this, os::is_MP() is passed as an additional argument. 64-bit - // processors are assumed to be multi-threaded and/or multi-core, so the extra - // argument is unnecessary. -+// This needs cleaning up - gcc always requires is_mp due to laziness of porter. -+#ifndef _GNU_SOURCE - #ifndef _LP64 - #define IS_MP_DECL() , int is_mp - #define IS_MP_ARG() , (int) os::is_MP() -@@ -66,6 +68,11 @@ inline void Atomic::dec_ptr(volatile voi - #define IS_MP_DECL() - #define IS_MP_ARG() - #endif // _LP64 -+#else -+#define IS_MP_DECL() , int is_mp -+#define IS_MP_ARG() , (int) os::is_MP() -+#endif // _GNU_SOURCE -+ - - extern "C" { - jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL()); -@@ -96,15 +103,27 @@ inline jlong Atomic::cmpxchg (jlon - #ifdef AMD64 - inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; } - inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; } -+#ifndef _GNU_SOURCE - extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest); -+#else -+extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest IS_MP_DECL()); -+#endif // _GNU_SOURCE - extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest); - - inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { -+#ifndef _GNU_SOURCE - return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); -+#else -+ return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest IS_MP_ARG()); -+#endif // _GNU_SOURCE - } - - inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) { -+#ifndef _GNU_SOURCE - return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); -+#else -+ return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest IS_MP_ARG()); -+#endif // _GNU_SOURCE - } - - inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { -@@ -116,11 +135,19 @@ inline void* Atomic::xchg_ptr(void* - } - - inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) { -+#ifndef _GNU_SOURCE - return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); -+#else -+ return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value IS_MP_ARG()); -+#endif // _GNU_SOURCE - } - - inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) { -+#ifndef _GNU_SOURCE - return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); -+#else -+ return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value IS_MP_ARG()); -+#endif // _GNU_SOURCE - } - - inline jlong Atomic::load(volatile jlong* src) { return *src; } -@@ -257,6 +284,16 @@ extern "C" { - #endif // if 0 - #endif // AMD64 - } -+ -+ inline void _Atomic_move_long(volatile jlong* src, volatile jlong* dst) { -+ __asm__ volatile ( -+ "fildll (%0)" "\n\t" -+ "fistpll (%1)" -+ : -+ :"r" (src), "r" (dst) -+ :"memory"); -+ } -+ - } - #undef LOCK_IF_MP - diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp deleted file mode 100644 index 4315d165abd..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_orderAccess__solaris__x86.inline.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp -@@ -71,7 +71,11 @@ extern "C" { - } - inline void _OrderAccess_fence() { - // Always use locked addl since mfence is sometimes expensive -+#ifdef AMD64 -+ __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory"); -+#else - __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory"); -+#endif // AMD64 - } - - } diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp deleted file mode 100644 index f174127ac1a..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_os__solaris__x86.cpp,v 1.3 2014/01/08 13:09:38 jperkin Exp $ - -GCC support. - ---- hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.orig 2014-01-01 05:50:05.000000000 +0000 -+++ hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp -@@ -235,13 +235,43 @@ frame os::get_sender_for_C_frame(frame* - return frame(fr->sender_sp(), fr->link(), fr->sender_pc()); - } - -+#ifdef AMD64 -+#define SPELL_REG_SP "rsp" -+#else -+#define SPELL_REG_SP "esp" -+#endif -+ -+#ifdef SPARC_WORKS - extern "C" intptr_t *_get_current_sp(); // in .il file -+#else -+#ifdef _GNU_SOURCE -+extern "C" intptr_t *_get_current_sp() { -+ register intptr_t *rsp __asm__ (SPELL_REG_SP); -+ return rsp; -+} -+#endif // _GNU_SOURCE -+#endif // SPARC_WORKS - - address os::current_stack_pointer() { - return (address)_get_current_sp(); - } - -+#ifdef AMD64 -+#define SPELL_REG_FP "rbp" -+#else -+#define SPELL_REG_FP "ebp" -+#endif -+ -+#ifdef SPARC_WORKS - extern "C" intptr_t *_get_current_fp(); // in .il file -+#else -+#ifdef _GNU_SOURCE -+extern "C" intptr_t *_get_current_fp() { -+ register intptr_t **rbp __asm__ (SPELL_REG_FP); -+ return (intptr_t*) *rbp; // we want what it points to. -+} -+#endif // _GNU_SOURCE -+#endif // SPARC_WORKS - - frame os::current_frame() { - intptr_t* fp = _get_current_fp(); // it's inlined so want current fp -@@ -937,7 +967,12 @@ add_func_t* os::atomic_add_func - extern "C" void _solaris_raw_setup_fpu(address ptr); - void os::setup_fpu() { - address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std(); -+#ifndef _GNU_SOURCE - _solaris_raw_setup_fpu(fpu_cntrl); -+#else -+ // same as hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp : os::setup_fpu() -+ __asm__ volatile("fldcw (%0)"::"r"(fpu_cntrl):"memory"); -+#endif - } - #endif // AMD64 - diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp deleted file mode 100644 index 93c53a0e6aa..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_prefetch__solaris__x86.inline.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC compatability. - ---- hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp -@@ -34,14 +34,28 @@ extern "C" { - - inline void Prefetch::read (void *loc, intx interval) { - #ifdef AMD64 -+#ifdef SPARC_WORKS - _Prefetch_read(loc, interval); -+#else -+#ifdef _GNU_SOURCE -+ __asm__ ("prefetcht0 (%0,%1,1)" : : "r" (loc), "r" (interval)); -+#endif // _GNU_SOURCE -+#endif // SPARC_WORKS - #endif // AMD64 - } - - // Use of this method should be gated by VM_Version::has_prefetchw. - inline void Prefetch::write(void *loc, intx interval) { - #ifdef AMD64 -+#ifdef SPARC_WORKS - _Prefetch_write(loc, interval); -+#else -+#ifdef _GNU_SOURCE -+ // Do not use the 3dnow prefetchw instruction. It isn't supported on em64t. -+ // __asm__ ("prefetchw (%0,%1,1)" : : "r" (loc), "r" (interval)); -+ __asm__ ("prefetcht0 (%0,%1,1)" : : "r" (loc), "r" (interval)); -+#endif // _GNU_SOURCE -+#endif // SPARC_WORKS - #endif // AMD64 - } - diff --git a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp b/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp deleted file mode 100644 index e8b234db5fc..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-hotspot_src_os__cpu_solaris__x86_vm_threadLS__solaris__x86.hpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC support. - ---- hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp -@@ -65,7 +65,10 @@ public: - __asm__ __volatile__ ("movq %%fs:0, %0" : "=r"(rv)); - return rv; - #else -- return gs_thread(); -+ uintptr_t rv; -+ __asm__ __volatile__ ("movl %%gs:0, %0" : "=r"(rv)); -+ return rv; -+// return gs_thread(); - #endif // AMD64 - #else //_GNU_SOURCE - return _raw_thread_id(); diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp deleted file mode 100644 index 23e04e8a1a5..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os_posix_vm_os__posix.cpp +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-hotspot_src_os_posix_vm_os__posix.cpp,v 1.2 2017/08/14 00:02:16 ryoon Exp $ - -rlim_t fixes. - ---- hotspot/src/os/posix/vm/os_posix.cpp.orig 2017-08-13 05:55:27.000000000 +0000 -+++ hotspot/src/os/posix/vm/os_posix.cpp -@@ -162,12 +162,12 @@ void os::Posix::print_rlimit_info(output - - st->print(" STACK "); - getrlimit(RLIMIT_STACK, &rlim); -- if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); -+ if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); - else st->print("%uk", rlim.rlim_cur >> 10); - - st->print(", CORE "); - getrlimit(RLIMIT_CORE, &rlim); -- if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); -+ if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); - else st->print("%uk", rlim.rlim_cur >> 10); - - // Isn't there on solaris and aix. -@@ -180,7 +180,7 @@ void os::Posix::print_rlimit_info(output - - st->print(", NOFILE "); - getrlimit(RLIMIT_NOFILE, &rlim); -- if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); -+ if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); - else st->print("%d", rlim.rlim_cur); - - #ifdef __OpenBSD__ -@@ -192,7 +192,7 @@ void os::Posix::print_rlimit_info(output - #else - st->print(", AS "); - getrlimit(RLIMIT_AS, &rlim); -- if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity"); -+ if (rlim.rlim_cur == (rlim_t)RLIM_INFINITY) st->print("infinity"); - else st->print("%uk", rlim.rlim_cur >> 10); - st->cr(); - #endif diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d deleted file mode 100644 index da9ab0404e4..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_dtrace_jhelper.d +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-hotspot_src_os_solaris_dtrace_jhelper.d,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -GCC compatability. - ---- hotspot/src/os/solaris/dtrace/jhelper.d.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/src/os/solaris/dtrace/jhelper.d -@@ -43,16 +43,33 @@ - - extern pointer __JvmOffsets; - --extern pointer __1cJCodeCacheF_heap_; --extern pointer __1cIUniverseP_methodKlassObj_; --extern pointer __1cIUniverseO_collectedHeap_; --extern pointer __1cIUniverseL_narrow_oop_; -+/* name mangling depends on the compiler used */ -+#ifndef _GNU_SOURCE -+#define SYMBOL_JCODECACHE_HEAP __1cJCodeCacheF_heap_ -+#define SYMBOL_UNIVERSE_METHODKLASSOBJ __1cIUniverseP_methodKlassObj_ -+#define SYMBOL_UNIVERSE_COLLECTEDHEAP __1cIUniverseO_collectedHeap_ -+#define SYMBOL_UNIVERSE_NARROW_OOP __1cIUniverseL_narrow_oop_ -+#define SYMBOL_NMETHOD_VTBL __1cHnmethodG__vtbl_ -+#define SYMBOL_BUFFERBLOB_VTBL __1cKBufferBlobG__vtbl_ -+#else -+#define SYMBOL_JCODECACHE_HEAP _ZN9CodeCache5_heapE -+#define SYMBOL_UNIVERSE_METHODKLASSOBJ _ZN8Universe15_methodKlassObjE -+#define SYMBOL_UNIVERSE_COLLECTEDHEAP _ZN8Universe14_collectedHeapE -+#define SYMBOL_UNIVERSE_NARROW_OOP _ZN8Universe11_narrow_oopE -+#define SYMBOL_NMETHOD_VTBL _ZTV7nmethod -+#define SYMBOL_BUFFERBLOB_VTBL _ZTV10BufferBlob -+#endif /* ! _GNU_SOURCE */ -+ -+extern pointer SYMBOL_JCODECACHE_HEAP; -+extern pointer SYMBOL_UNIVERSE_METHODKLASSOBJ; -+extern pointer SYMBOL_UNIVERSE_COLLECTEDHEAP; -+extern pointer SYMBOL_UNIVERSE_NARROW_OOP; - #ifdef _LP64 - extern pointer UseCompressedOops; - #endif - --extern pointer __1cHnmethodG__vtbl_; --extern pointer __1cKBufferBlobG__vtbl_; -+extern pointer SYMBOL_NMETHOD_VTBL; -+extern pointer SYMBOL_BUFFERBLOB_VTBL; - - #define copyin_ptr(ADDR) *(pointer*) copyin((pointer) (ADDR), sizeof(pointer)) - #define copyin_uchar(ADDR) *(uchar_t*) copyin((pointer) (ADDR), sizeof(uchar_t)) -@@ -156,8 +173,8 @@ dtrace:helper:ustack: - #error "Don't know architecture" - #endif - -- this->Universe_methodKlassOop = copyin_ptr(&``__1cIUniverseP_methodKlassObj_); -- this->CodeCache_heap_address = copyin_ptr(&``__1cJCodeCacheF_heap_); -+ this->Universe_methodKlassOop = copyin_ptr(&``SYMBOL_UNIVERSE_METHODKLASSOBJ); -+ this->CodeCache_heap_address = copyin_ptr(&``SYMBOL_JCODECACHE_HEAP); - - /* Reading volatile values */ - #ifdef _LP64 -@@ -166,9 +183,9 @@ dtrace:helper:ustack: - this->Use_Compressed_Oops = 0; - #endif - -- this->Universe_narrow_oop_base = copyin_ptr(&``__1cIUniverseL_narrow_oop_ + -+ this->Universe_narrow_oop_base = copyin_ptr(&``SYMBOL_UNIVERSE_NARROW_OOP + - OFFSET_NarrowOopStruct_base); -- this->Universe_narrow_oop_shift = copyin_int32(&``__1cIUniverseL_narrow_oop_ + -+ this->Universe_narrow_oop_shift = copyin_int32(&``SYMBOL_UNIVERSE_NARROW_OOP + - OFFSET_NarrowOopStruct_shift); - - this->CodeCache_low = copyin_ptr(this->CodeCache_heap_address + -@@ -189,7 +206,7 @@ dtrace:helper:ustack: - /* - * Get Java heap bounds - */ -- this->Universe_collectedHeap = copyin_ptr(&``__1cIUniverseO_collectedHeap_); -+ this->Universe_collectedHeap = copyin_ptr(&``SYMBOL_UNIVERSE_COLLECTEDHEAP); - this->heap_start = copyin_ptr(this->Universe_collectedHeap + - OFFSET_CollectedHeap_reserved + - OFFSET_MemRegion_start); -@@ -290,8 +307,8 @@ dtrace:helper:ustack: - this->start = this->block + SIZE_HeapBlockHeader; - this->vtbl = copyin_ptr(this->start); - -- this->nmethod_vtbl = (pointer) &``__1cHnmethodG__vtbl_; -- this->BufferBlob_vtbl = (pointer) &``__1cKBufferBlobG__vtbl_; -+ this->nmethod_vtbl = (pointer) &``SYMBOL_NMETHOD_VTBL; -+ this->BufferBlob_vtbl = (pointer) &``SYMBOL_BUFFERBLOB_VTBL; - } - - dtrace:helper:ustack: diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp deleted file mode 100644 index 6d54786d695..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-hotspot_src_os_solaris_vm_decoder__solaris.cpp,v 1.1 2013/06/15 09:31:05 jperkin Exp $ - -Avoid libdemangle with GCC. - ---- hotspot/src/os/solaris/vm/decoder_solaris.cpp.orig 2013-02-19 23:21:59.000000000 +0000 -+++ hotspot/src/os/solaris/vm/decoder_solaris.cpp -@@ -27,6 +27,11 @@ - #include <demangle.h> - - bool ElfDecoder::demangle(const char* symbol, char *buf, int buflen) { -+#ifdef SPARC_WORKS - return !cplus_demangle(symbol, buf, (size_t)buflen); -+#else -+ memcpy(buf, symbol, (size_t)buflen); -+ return 0; -+#endif - } - diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp deleted file mode 100644 index bc211c6d8c2..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_os__solaris.cpp +++ /dev/null @@ -1,115 +0,0 @@ -$NetBSD: patch-hotspot_src_os_solaris_vm_os__solaris.cpp,v 1.2 2014/01/02 01:16:35 ryoon Exp $ - -Misc SunOS casts. - ---- hotspot/src/os/solaris/vm/os_solaris.cpp.orig 2014-01-01 05:50:05.000000000 +0000 -+++ hotspot/src/os/solaris/vm/os_solaris.cpp -@@ -650,7 +650,7 @@ static bool assign_distribution(processo - // ... find the next available processor in the board. - for (uint slot = 0; slot < processors_per_board; slot += 1) { - uint try_id = board * processors_per_board + slot; -- if ((try_id < limit_id) && (available_id[try_id] == true)) { -+ if ((try_id < (uint)limit_id) && (available_id[try_id] == true)) { - distribution[assigned] = try_id; - available_id[try_id] = false; - assigned += 1; -@@ -658,7 +658,7 @@ static bool assign_distribution(processo - } - } - board += 1; -- if (board * processors_per_board + 0 >= limit_id) { -+ if (board * processors_per_board + 0 >= (uint)limit_id) { - board = 0; - } - } -@@ -715,7 +715,7 @@ bool os::bind_to_processor(uint processo - bool os::getenv(const char* name, char* buffer, int len) { - char* val = ::getenv( name ); - if ( val == NULL -- || strlen(val) + 1 > len ) { -+ || strlen(val) + 1 > (size_t)len ) { - if (len > 0) buffer[0] = 0; // return a null string - return false; - } -@@ -922,7 +922,7 @@ void os::init_system_properties_values() - strcpy(library_path, common_path); - } else { - int inserted = 0; -- for (i = 0; i < info->dls_cnt; i++, path++) { -+ for (i = 0; (uint_t)i < info->dls_cnt; i++, path++) { - uint_t flags = path->dls_flags & LA_SER_MASK; - if (((flags & LA_SER_LIBPATH) == 0) && !inserted) { - strcat(library_path, common_path); -@@ -1047,7 +1047,8 @@ extern "C" void* java_start(void* thread - // in java_to_os_priority. So we save the native priority - // in the osThread and recall it here. - -- if ( osthr->thread_id() != -1 ) { -+ // thread_id_t ("osThread_solaris.hpp") == thread_t (<thread.h>) == unsigned int -+ if ( osthr->thread_id() != (unsigned int)-1 ) { - if ( UseThreadPriorities ) { - int prio = osthr->native_priority(); - if (ThreadPriorityVerbose) { -@@ -2994,7 +2995,7 @@ void os::numa_make_global(char *addr, si - // Get the number of the locality groups. - size_t os::numa_get_groups_num() { - size_t n = Solaris::lgrp_nlgrps(Solaris::lgrp_cookie()); -- return n != -1 ? n : 1; -+ return n != (size_t) -1 ? n : 1; - } - - // Get a list of leaf locality groups. A leaf lgroup is group that -@@ -3006,7 +3007,7 @@ size_t os::numa_get_leaf_groups(int *ids - return 1; - } - int result_size = 0, top = 1, bottom = 0, cur = 0; -- for (int k = 0; k < size; k++) { -+ for (size_t k = 0; k < size; k++) { - int r = Solaris::lgrp_children(Solaris::lgrp_cookie(), ids[cur], - (Solaris::lgrp_id_t*)&ids[top], size - top); - if (r == -1) { -@@ -3126,7 +3127,7 @@ char *os::scan_pages(char *start, char* - } - - if ((validity[i] & 2) != 0 && page_expected->lgrp_id > 0) { -- if (outdata[types * i] != page_expected->lgrp_id) { -+ if (outdata[types * i] != (uint64_t)page_expected->lgrp_id) { - break; - } - } -@@ -5025,7 +5026,7 @@ const char * signames[] = { - const char* os::exception_name(int exception_code, char* buf, size_t size) { - if (0 < exception_code && exception_code <= SIGRTMAX) { - // signal -- if (exception_code < sizeof(signames)/sizeof(const char*)) { -+ if ((size_t)exception_code < sizeof(signames)/sizeof(const char*)) { - jio_snprintf(buf, size, "%s", signames[exception_code]); - } else { - jio_snprintf(buf, size, "SIG%d", exception_code); -@@ -5362,7 +5363,7 @@ void os::init(void) { - // If the pagesize of the VM is greater than 8K determine the appropriate - // number of initial guard pages. The user can change this with the - // command line arguments, if needed. -- if (vm_page_size() > 8*K) { -+ if ((size_t)vm_page_size() > 8*K) { - StackYellowPages = 1; - StackRedPages = 1; - StackShadowPages = round_to((StackShadowPages*8*K), vm_page_size()) / vm_page_size(); -@@ -5383,7 +5384,7 @@ jint os::init_2(void) { - - // Allocate a single page and mark it as readable for safepoint polling. Also - // use this first mmap call to check support for MAP_ALIGN. -- address polling_page = (address)Solaris::mmap_chunk((char*)page_size, -+ address polling_page = (address)Solaris::mmap_chunk((char*)(uintptr_t)page_size, - page_size, - MAP_PRIVATE | MAP_ALIGN, - PROT_READ); -@@ -5437,7 +5438,7 @@ jint os::init_2(void) { - // stack on a power of 2 boundary. The real fix for this - // should be to fix the guard page mechanism. - -- if (vm_page_size() > 8*K) { -+ if ((size_t)vm_page_size() > 8*K) { - threadStackSizeInBytes = (threadStackSizeInBytes != 0) - ? threadStackSizeInBytes + - ((StackYellowPages + StackRedPages) * vm_page_size()) diff --git a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp b/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp deleted file mode 100644 index ba23bb2ab62..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-hotspot_src_os_solaris_vm_perfMemory__solaris.cpp,v 1.1 2015/02/10 14:57:35 tnn Exp $ - -dirent->dd_fd is legacy, dirent->d_fd is POSIX, dirfd(dirent) is better. - ---- hotspot/src/os/solaris/vm/perfMemory_solaris.cpp.orig 2015-01-26 15:21:44.000000000 +0000 -+++ hotspot/src/os/solaris/vm/perfMemory_solaris.cpp -@@ -334,7 +334,7 @@ static DIR *open_directory_secure(const - } - - // Check to make sure fd and dirp are referencing the same file system object. -- if (!is_same_fsobject(fd, dirp->dd_fd)) { -+ if (!is_same_fsobject(fd, dirfd(dirp))) { - // The directory is not secure. - os::close(fd); - os::closedir(dirp); -@@ -366,7 +366,7 @@ static DIR *open_directory_secure_cwd(co - // Directory doesn't exist or is insecure, so there is nothing to cleanup. - return dirp; - } -- int fd = dirp->dd_fd; -+ int fd = dirfd(dirp); - - // Open a fd to the cwd and save it off. - int result; diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp deleted file mode 100644 index 567288a0c13..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_classfile_symbolTable.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_classfile_symbolTable.cpp,v 1.1 2017/09/04 16:00:19 joerg Exp $ - -Static member variables of templates must be defined. C++11 inline -definitions would be an alternative. - ---- hotspot/src/share/vm/classfile/symbolTable.cpp.orig 2017-08-13 05:55:28.000000000 +0000 -+++ hotspot/src/share/vm/classfile/symbolTable.cpp -@@ -37,6 +37,9 @@ - #include "utilities/hashtable.inline.hpp" - #include "utilities/numberSeq.hpp" - -+template <> jint Hashtable<Symbol *, mtSymbol>::_seed = 0; -+template <> jint Hashtable<oopDesc *, mtSymbol>::_seed = 0; -+ - // -------------------------------------------------------------------------- - - // the number of buckets a thread claims diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp deleted file mode 100644 index 9ddfbc1c8f6..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_gc__implementation_g1_heapRegionSet.hpp,v 1.1 2017/09/04 16:00:19 joerg Exp $ - -defined() in macros is UB. - ---- hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.orig 2017-09-04 13:24:02.725351260 +0000 -+++ hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp -@@ -35,7 +35,11 @@ typedef FormatBuffer<HRS_ERR_MSG_BUFSZ> - // HEAP_REGION_SET_FORCE_VERIFY to be 1, or in builds in which - // asserts are compiled in. - #ifndef HEAP_REGION_SET_FORCE_VERIFY --#define HEAP_REGION_SET_FORCE_VERIFY defined(ASSERT) -+#if defined(ASSERT) -+#define HEAP_REGION_SET_FORCE_VERIFY 1 -+#else -+#define HEAP_REGION_SET_FORCE_VERIFY 0 -+#endif - #endif // HEAP_REGION_SET_FORCE_VERIFY - - //////////////////// HeapRegionSetBase //////////////////// diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_oops_klass.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_oops_klass.hpp deleted file mode 100644 index fd30bab46e6..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_oops_klass.hpp +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_oops_klass.hpp,v 1.1 2015/09/12 16:56:48 joerg Exp $ - -Left shift of negative values is UB. - ---- hotspot/src/share/vm/oops/klass.hpp.orig 2015-06-09 13:46:56.000000000 +0000 -+++ hotspot/src/share/vm/oops/klass.hpp -@@ -419,11 +419,11 @@ class Klass : public Klass_vtbl { - } - static bool layout_helper_is_typeArray(jint lh) { - // _lh_array_tag_type_value == (lh >> _lh_array_tag_shift); -- return (juint)lh >= (juint)(_lh_array_tag_type_value << _lh_array_tag_shift); -+ return (juint)lh >= ((juint)_lh_array_tag_type_value << _lh_array_tag_shift); - } - static bool layout_helper_is_objArray(jint lh) { - // _lh_array_tag_obj_value == (lh >> _lh_array_tag_shift); -- return (jint)lh < (jint)(_lh_array_tag_type_value << _lh_array_tag_shift); -+ return (jint)lh < (jint)((juint)_lh_array_tag_type_value << _lh_array_tag_shift); - } - static int layout_helper_header_size(jint lh) { - assert(lh < (jint)_lh_neutral_value, "must be array"); diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_library__call.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_library__call.cpp deleted file mode 100644 index 185a6d16ce8..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_library__call.cpp +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_opto_library__call.cpp,v 1.1 2015/09/12 16:56:48 joerg Exp $ - -Left shift of negative values is UB. - ---- hotspot/src/share/vm/opto/library_call.cpp.orig 2015-06-09 13:47:01.000000000 +0000 -+++ hotspot/src/share/vm/opto/library_call.cpp -@@ -3454,8 +3454,8 @@ Node* LibraryCallKit::generate_array_gua - } - // Now test the correct condition. - jint nval = (obj_array -- ? ((jint)Klass::_lh_array_tag_type_value -- << Klass::_lh_array_tag_shift) -+ ? (jint)((juint)Klass::_lh_array_tag_type_value -+ << Klass::_lh_array_tag_shift) - : Klass::_lh_neutral_value); - Node* cmp = _gvn.transform( new(C) CmpINode(layout_val, intcon(nval)) ); - BoolTest::mask btest = BoolTest::lt; // correct for testing is_[obj]array diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_node.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_node.cpp deleted file mode 100644 index 6a611e253b6..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_opto_node.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_opto_node.cpp,v 1.1 2014/01/20 19:25:11 joerg Exp $ - ---- hotspot/src/share/vm/opto/node.cpp.orig 2014-01-06 00:27:19.000000000 +0000 -+++ hotspot/src/share/vm/opto/node.cpp -@@ -285,6 +285,10 @@ void DUIterator_Last::verify_step(uint n - #pragma warning( disable:4355 ) // 'this' : used in base member initializer list - #endif - -+#ifdef __GNUC__ -+#pragma GCC diagnostic ignored "-Wuninitialized" -+#endif -+ - // Out-of-line code from node constructors. - // Executed only when extra debug info. is being passed around. - static void init_node_notes(Compile* C, int idx, Node_Notes* nn) { diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_os.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_os.cpp deleted file mode 100644 index 345c7ce9297..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_os.cpp +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_runtime_os.cpp,v 1.3 2014/06/03 03:20:15 ryoon Exp $ - ---- hotspot/src/share/vm/runtime/os.cpp.orig 2014-05-01 13:10:09.000000000 +0000 -+++ hotspot/src/share/vm/runtime/os.cpp -@@ -1132,6 +1132,7 @@ bool os::set_boot_path(char fileSep, cha - "%/lib/jce.jar:" - "%/lib/charsets.jar:" - "%/lib/jfr.jar:" -+ "%/lib/rhino.jar:" - "%/classes"; - char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); - if (sysclasspath == NULL) return false; diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp deleted file mode 100644 index 092727d9223..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_runtime_virtualspace.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_runtime_virtualspace.cpp,v 1.1 2017/09/04 16:00:19 joerg Exp $ - -Pointers are not ordered relative to 0. - ---- hotspot/src/share/vm/runtime/virtualspace.cpp.orig 2017-09-04 13:40:41.223301418 +0000 -+++ hotspot/src/share/vm/runtime/virtualspace.cpp -@@ -527,7 +527,7 @@ ReservedHeapSpace::ReservedHeapSpace(siz - (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && - Universe::narrow_oop_use_implicit_null_checks()) ? - lcm(os::vm_page_size(), alignment) : 0) { -- if (base() > 0) { -+ if (base()) { - MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); - } - -@@ -546,7 +546,7 @@ ReservedHeapSpace::ReservedHeapSpace(con - (UseCompressedOops && (Universe::narrow_oop_base() != NULL) && - Universe::narrow_oop_use_implicit_null_checks()) ? - lcm(os::vm_page_size(), prefix_align) : 0) { -- if (base() > 0) { -+ if (base()) { - MemTracker::record_virtual_memory_type((address)base(), mtJavaHeap); - } - diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp deleted file mode 100644 index 64fe1ba153b..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_utilities_globalDefinitions__gcc.hpp,v 1.5 2015/03/02 03:53:26 tnn Exp $ - ---- hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig 2015-01-26 15:21:49.000000000 +0000 -+++ hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp -@@ -76,7 +76,7 @@ - # include <sys/procfs.h> - # endif - --#if defined(LINUX) || defined(_ALLBSD_SOURCE) -+#if defined(LINUX) || defined(_ALLBSD_SOURCE) || defined(SOLARIS) - #ifndef __STDC_LIMIT_MACROS - #define __STDC_LIMIT_MACROS - #endif // __STDC_LIMIT_MACROS diff --git a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp b/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp deleted file mode 100644 index 32f31e90540..00000000000 --- a/lang/openjdk7/patches/patch-hotspot_src_share_vm_utilities_hashtable.cpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-hotspot_src_share_vm_utilities_hashtable.cpp,v 1.1 2014/01/08 13:09:38 jperkin Exp $ - -Delete obsolete (and now harmful) SunOS code. - ---- hotspot/src/share/vm/utilities/hashtable.cpp.orig 2014-01-01 05:50:08.000000000 +0000 -+++ hotspot/src/share/vm/utilities/hashtable.cpp -@@ -318,9 +318,6 @@ template class Hashtable<constantPoolOop - template class Hashtable<Symbol*, mtSymbol>; - template class Hashtable<klassOop, mtClass>; - template class Hashtable<oop, mtClass>; --#ifdef SOLARIS --template class Hashtable<oop, mtSymbol>; --#endif - template class Hashtable<oopDesc*, mtSymbol>; - template class Hashtable<Symbol*, mtClass>; - template class HashtableEntry<Symbol*, mtSymbol>; diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile deleted file mode 100644 index 4737d90502d..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_Makefile +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-jdk_make_com_sun_Makefile,v 1.2 2014/01/02 01:16:35 ryoon Exp $ - -* From rhino.patch. - ---- jdk/make/com/sun/Makefile.orig 2014-01-01 05:53:33.000000000 +0000 -+++ jdk/make/com/sun/Makefile -@@ -31,13 +31,6 @@ BUILDDIR = ../.. - PRODUCT = sun - include $(BUILDDIR)/common/Defs.gmk - --ifndef OPENJDK -- ORG_EXISTS := $(call DirExists,$(CLOSED_SRC)/share/classes/sun/org,,) -- ifneq ("$(ORG_EXISTS)", "") -- SCRIPT_SUBDIR = script -- endif --endif -- - # jarsigner is part of JRE - SUBDIRS = java security net/ssl jarsigner - -@@ -45,7 +38,7 @@ SUBDIRS_management = jmx - SUBDIRS_desktop = image - SUBDIRS_enterprise = crypto/provider jndi \ - org rowset net/httpserver --SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing nio demo -+SUBDIRS_misc = script tracing nio demo - - # Omit mirror since it's built with the apt tool. - SUBDIRS_tools = tools diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_java_pack_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_java_pack_Makefile deleted file mode 100644 index 21f97a86786..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_java_pack_Makefile +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-jdk_make_com_sun_java_pack_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -GCC support. - ---- jdk/make/com/sun/java/pack/Makefile.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/make/com/sun/java/pack/Makefile -@@ -109,6 +109,15 @@ endif - endif #LINUX - endif #PLATFORM - -+# gcc on solaris; this makes a library, too, so the -Wl, will appear on the LDDFLAGS. it needs to be removed for the exe build -+LINKER_EXE = $(LINKER) -+ifeq ($(PLATFORM), solaris) -+ ifeq ($(CC_VERSION), gcc) -+ REPLACE=-Wl,-soname=lib$(LIBRARY).so -+ LINKER_EXE = $(subst $(REPLACE),,$(LINKER)) -+ endif # CC_VERSION -+endif # PLATFORM -+ - UNPACK_EXE = $(BINDIR)/unpack200$(EXE_SUFFIX) - - UNPACK_EXE_FILES_cpp = $(filter-out jni.cpp,$(FILES_cpp)) -@@ -157,7 +166,7 @@ $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) upd - $(prep-target) - $(RM) $(TEMPDIR)/mapfile-vers - $(CP) mapfile-vers-unpack200 $(TEMPDIR)/mapfile-vers -- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) -+ $(LINKER_EXE) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX) - ifdef MT - $(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1 - endif diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile deleted file mode 100644 index c7269c05113..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_jmx_Makefile +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-jdk_make_com_sun_jmx_Makefile,v 1.3 2017/08/14 00:02:16 ryoon Exp $ - -Disable SunOS multiarch. -Let the build find intermediate libs when it wants to run intermediate rmic. - ---- jdk/make/com/sun/jmx/Makefile.orig 2017-08-13 05:55:12.000000000 +0000 -+++ jdk/make/com/sun/jmx/Makefile -@@ -106,7 +106,7 @@ FILES_ties = $(subst javax/management/ - - RMIC_JAVA = $(OUTPUTDIR)/bin/java - # need to treat 64bit solaris differently --ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) -+ifeq ($(PLATFORM)-$(LIBARCH), NOMULTIARCHsolaris-amd64) - RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java - endif - ifeq ($(PLATFORM)-$(LIBARCH), solaris-sparcv9) -@@ -118,7 +118,7 @@ RMIC_VM = $(RMIC_JAVA) - else - RMIC_VM = $(BOOT_JAVA_CMD) - endif --RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main -+RMIC = env LD_LIBRARY_PATH=$(OUTPUTDIR)/lib/$(LIBARCH):$(OUTPUTDIR)/lib/$(LIBARCH)/jli:$(LD_LIBRARY_PATH) $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main - - $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class - $(prep-target) diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile deleted file mode 100644 index a4949df61cf..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_nio_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_make_com_sun_nio_Makefile,v 1.2 2017/08/14 00:02:16 ryoon Exp $ - -* NetBSD has no SCTP support. - ---- jdk/make/com/sun/nio/Makefile.orig 2017-08-13 05:55:12.000000000 +0000 -+++ jdk/make/com/sun/nio/Makefile -@@ -31,7 +31,7 @@ BUILDDIR = ../../.. - include $(BUILDDIR)/common/Defs.gmk - - # MMM: disable for now --ifeq (, $(findstring $(PLATFORM), macosx aix)) -+ifeq (, $(findstring $(PLATFORM), macosx aix netbsd)) - include $(BUILDDIR)/common/Subdirs.gmk - SUBDIRS = sctp - endif diff --git a/lang/openjdk7/patches/patch-jdk_make_com_sun_script_Makefile b/lang/openjdk7/patches/patch-jdk_make_com_sun_script_Makefile deleted file mode 100644 index 6d19e1c3b7b..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_com_sun_script_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_make_com_sun_script_Makefile,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/make/com/sun/script/Makefile.orig 2012-08-10 17:21:32.000000000 +0000 -+++ jdk/make/com/sun/script/Makefile -@@ -31,6 +31,8 @@ include $(BUILDDIR)/common/Defs.gmk - - AUTO_FILES_JAVA_DIRS = com/sun/script - -+OTHER_JAVACFLAGS = -classpath $(RHINO_JAR) -+ - # - # Files that need to be copied - # diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris-gcc.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris-gcc.gmk deleted file mode 100644 index 0005d1b7a28..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris-gcc.gmk +++ /dev/null @@ -1,511 +0,0 @@ -$NetBSD: patch-jdk_make_common_Defs-solaris-gcc.gmk,v 1.2 2015/10/07 10:07:11 jperkin Exp $ - -GCC support. - ---- jdk/make/common/Defs-solaris-gcc.gmk.orig 2013-03-11 12:55:10.407557389 +0000 -+++ jdk/make/common/Defs-solaris-gcc.gmk -@@ -0,0 +1,504 @@ -+# -+# Copyright (c) 1999, 2012, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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. -+# -+ -+# -+# Makefile to specify compiler flags for programs and libraries -+# targeted to Solaris. Should not contain any rules. -+# -+# WARNING: This file is shared with other workspaces. -+# So when it includes other files, it must use JDK_TOPDIR. -+# -+ -+# Warning: the following variables are overriden by Defs.gmk. Set -+# values will be silently ignored: -+# CFLAGS (set $(OTHER_CFLAGS) instead) -+# CPPFLAGS (set $(OTHER_CPPFLAGS) instead) -+# CXXFLAGS (set $(OTHER_CXXFLAGS) instead) -+# LDFLAGS (set $(OTHER_LDFAGS) instead) -+# LDLIBS (set $(EXTRA_LIBS) instead) -+# LDLIBS_COMMON (set $(EXTRA_LIBS) instead) -+ -+# Get shared JDK settings -+include $(JDK_MAKE_SHARED_DIR)/Defs.gmk -+ -+# Part of INCREMENTAL_BUILD mechanism. -+# Compiler emits things like: path/file.o: file.h -+# We want something like: relative_path/file.o relative_path/file.d: file.h -+CC_DEPEND = -MM -+CC_DEPEND_FILTER = $(SED) -e 's!$*\.$(OBJECT_SUFFIX)!$(dir $@)& $(dir $@)$*.$(DEPEND_SUFFIX)!g' -+ -+ifndef PLATFORM_SRC -+ PLATFORM_SRC = $(BUILDDIR)/../src/solaris -+endif # PLATFORM_SRC -+ -+# Location of the various .properties files specific to Solaris platform -+ifndef PLATFORM_PROPERTIES -+ PLATFORM_PROPERTIES = $(BUILDDIR)/../src/solaris/lib -+endif # PLATFORM_SRC -+ -+# Platform specific closed sources -+ifndef OPENJDK -+ ifndef CLOSED_PLATFORM_SRC -+ CLOSED_PLATFORM_SRC = $(BUILDDIR)/../src/closed/solaris -+ endif -+endif -+ -+# platform specific include files -+PLATFORM_INCLUDE_NAME = $(PLATFORM) -+PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) -+ -+# suffix used for make dependencies files. -+DEPEND_SUFFIX = d -+# The suffix applied to the library name for FDLIBM -+FDDLIBM_SUFFIX = a -+# The suffix applied to scripts (.bat for windows, nothing for unix) -+SCRIPT_SUFFIX = -+# CC compiler object code output directive flag value -+CC_OBJECT_OUTPUT_FLAG = -o #trailing blank required! -+CC_PROGRAM_OUTPUT_FLAG = -o #trailing blank required! -+ -+# The Full Debug Symbols (FDS) default for VARIANT == OPT builds is -+# enabled with debug info files ZIP'ed to save space. For VARIANT != -+# OPT builds, FDS is always enabled, after all a debug build without -+# debug info isn't very useful. The ZIP_DEBUGINFO_FILES option only has -+# meaning when FDS is enabled. -+# -+# If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be -+# disabled for a VARIANT == OPT build. -+# -+# Note: Use of a different variable name for the FDS override option -+# versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS -+# versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass -+# in options via environment variables, use of distinct variables -+# prevents strange behaviours. For example, in a VARIANT != OPT build, -+# the FULL_DEBUG_SYMBOLS environment variable will be 0, but the -+# ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If the same -+# variable name is used, then different values can be picked up by -+# different parts of the build. Just to be clear, we only need two -+# variable names because the incoming option value can be overridden -+# in some situations, e.g., a VARIANT != OPT build. -+ -+ADD_GNU_DEBUGLINK = $(ABS_BUILDTOOLBINDIR)/add_gnu_debuglink -+FIX_EMPTY_SEC_HDR_FLAGS = $(ABS_BUILDTOOLBINDIR)/fix_empty_sec_hdr_flags -+ -+ifeq ($(VARIANT), OPT) -+ FULL_DEBUG_SYMBOLS ?= 1 -+ ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) -+else -+ # debug variants always get Full Debug Symbols (if available) -+ ENABLE_FULL_DEBUG_SYMBOLS = 1 -+endif -+_JUNK_ := $(shell \ -+ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") -+# since objcopy is optional, we set ZIP_DEBUGINFO_FILES later -+ -+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifndef CROSS_COMPILE_ARCH -+ # Default OBJCOPY comes from GNU Binutils on Solaris: -+ DEF_OBJCOPY=/opt/local/bin/objcopy -+ else -+ # Assume objcopy is part of the cross-compilation toolkit -+ DEF_OBJCOPY=$(COMPILER_PATH)/objcopy -+ endif -+ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) -+ ifneq ($(ALT_OBJCOPY),) -+ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") -+ # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path -+ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) -+ endif -+ -+ # Setting ENABLE_FULL_DEBUG_SYMBOLS=1 (and OBJCOPY) above enables the -+ # JDK build to import .debuginfo or .diz files from the HotSpot build. -+ # However, adding FDS support to the JDK build will occur in phases -+ # so a different make variable (LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS -+ # and PROGRAM_SUPPORTS_FULL_DEBUG_SYMBOLS) is used to indicate that a -+ # particular library or program supports FDS. -+ -+ ifeq ($(OBJCOPY),) -+ _JUNK_ := $(shell \ -+ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files. You may need to set ALT_OBJCOPY.") -+ ENABLE_FULL_DEBUG_SYMBOLS=0 -+ else -+ _JUNK_ := $(shell \ -+ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.") -+ -+ # Library stripping policies for .debuginfo configs: -+ # all_strip - strips everything from the library -+ # min_strip - strips most stuff from the library; leaves minimum symbols -+ # no_strip - does not strip the library at all -+ # -+ # Oracle security policy requires "all_strip". A waiver was granted on -+ # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. -+ # -+ # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. -+ STRIP_POLICY ?= min_strip -+ -+ _JUNK_ := $(shell \ -+ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") -+ -+ ZIP_DEBUGINFO_FILES ?= 1 -+ -+ _JUNK_ := $(shell \ -+ echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)") -+ endif -+endif -+ -+# -+# Default optimization -+# -+ -+ifndef OPTIMIZATION_LEVEL -+ ifeq ($(PRODUCT), java) -+ OPTIMIZATION_LEVEL = HIGHER -+ else -+ OPTIMIZATION_LEVEL = LOWER -+ endif -+endif -+ifndef FASTDEBUG_OPTIMIZATION_LEVEL -+ FASTDEBUG_OPTIMIZATION_LEVEL = LOWER -+endif -+ -+CC_OPT/NONE = -+CC_OPT/LOWER = -O2 -+CC_OPT/HIGHER = -O2 -+CC_OPT/HIGHEST = -O3 -+ -+CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) -+ -+# For all platforms, do not omit the frame pointer register usage. -+# We need this frame pointer to make it easy to walk the stacks. -+# This should be the default on X86, but ia64 and amd64 may not have this -+# as the default. -+CFLAGS_REQUIRED_amd64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+LDFLAGS_COMMON_amd64 += -m64 -+CFLAGS_REQUIRED_i586 += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+LDFLAGS_COMMON_i586 += -m32 -+CFLAGS_REQUIRED_ia64 += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 -+LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 -+CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9 -+LDFLAGS_COMMON_sparc += -m32 -mcpu=v9 -+CFLAGS_REQUIRED_arm += -fsigned-char -D_LITTLE_ENDIAN -+CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN -+ifeq ($(ZERO_BUILD), true) -+ CFLAGS_REQUIRED = $(ZERO_ARCHFLAG) -+ ifeq ($(ZERO_ENDIANNESS), little) -+ CFLAGS_REQUIRED += -D_LITTLE_ENDIAN -+ endif -+ LDFLAGS_COMMON += $(ZERO_ARCHFLAG) -+else -+ CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH)) -+ LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) -+endif -+ -+# If this is a --hash-style=gnu system, use --hash-style=both -+# The gnu .hash section won't work on some Linux 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 -+LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE) -+ -+# -+# Selection of warning messages -+# -+GCC_INHIBIT = -Wno-unused -Wno-parentheses -+GCC_STYLE = -+GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(GCC_INHIBIT) -+ -+# -+# Treat compiler warnings as errors, if warnings not allowed -+# -+ifeq ($(COMPILER_WARNINGS_FATAL),true) -+ GCC_WARNINGS += -Werror -+endif -+ -+# -+# Misc compiler options -+# -+ifneq ($(ARCH),ppc) -+ CFLAGS_COMMON = -fno-strict-aliasing -+endif -+PIC_CODE_LARGE = -fPIC -+PIC_CODE_SMALL = -fpic -+GLOBAL_KPIC = $(PIC_CODE_LARGE) -+CFLAGS_COMMON += $(GLOBAL_KPIC) $(GCC_WARNINGS) -+ifeq ($(ARCH), amd64) -+ CFLAGS_COMMON += -pipe -+endif -+ -+# Linux 64bit machines use Dwarf2, which can be HUGE, have fastdebug use -g1 -+DEBUG_FLAG = -g -+ifeq ($(FASTDEBUG), true) -+ ifeq ($(ARCH_DATA_MODEL), 64) -+ DEBUG_FLAG = -g1 -+ endif -+endif -+ -+# DEBUG_BINARIES overrides everything, use full -g debug information -+ifeq ($(DEBUG_BINARIES), true) -+ DEBUG_FLAG = -g -+ CFLAGS_REQUIRED += $(DEBUG_FLAG) -+endif -+ -+# If Full Debug Symbols is enabled, then we want the same debug and -+# optimization flags as used by FASTDEBUG. -+# -+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) -+ ifeq ($(LIBRARY_SUPPORTS_FULL_DEBUG_SYMBOLS),1) -+ ifeq ($(VARIANT), OPT) -+ CC_OPT = $(DEBUG_FLAG) $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) -+ endif -+ endif -+endif -+ -+CFLAGS_OPT = $(CC_OPT) -+CFLAGS_DBG = $(DEBUG_FLAG) -+CFLAGS_COMMON += $(CFLAGS_REQUIRED) -+ -+CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) -+CXXFLAGS_OPT = $(CC_OPT) -+CXXFLAGS_DBG = $(DEBUG_FLAG) -+CXXFLAGS_COMMON += $(CFLAGS_REQUIRED) -+ -+# FASTDEBUG: Optimize the code in the -g versions, gives us a faster debug java -+ifeq ($(FASTDEBUG), true) -+ CFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) -+ CXXFLAGS_DBG += $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL)) -+endif -+ -+CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"' -+ -+# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here) -+ifneq ($(ARCH),alpha) -+ CPP_ARCH_FLAGS += -D$(ARCH) -+else -+ CPP_ARCH_FLAGS += -D_$(ARCH)_ -+endif -+ -+CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D__solaris__ $(VERSION_DEFINES) -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -+ -+ifeq ($(ARCH_DATA_MODEL), 64) -+CPPFLAGS_COMMON += -D_LP64=1 -+endif -+ -+CPPFLAGS_OPT = -DNDEBUG -+CPPFLAGS_DBG = -DDEBUG -+ifneq ($(PRODUCT), java) -+ CPPFLAGS_DBG += -DLOGGING -+endif -+ -+ifdef LIBRARY -+ # Libraries need to locate other libraries at runtime, and you can tell -+ # a library where to look by way of the dynamic runpaths (RPATH or RUNPATH) -+ # buried inside the .so. The $ORIGIN says to look relative to where -+ # the library itself is and it can be followed with relative paths from -+ # that. By default we always look in $ORIGIN, optionally we add relative -+ # paths if the Makefile sets LD_RUNPATH_EXTRAS to those relative paths. -+ # On Linux we add a flag -z origin, not sure if this is necessary, but -+ # doesn't seem to hurt. -+ # The environment variable LD_LIBRARY_PATH will over-ride these runpaths. -+ # Try: 'readelf -d lib*.so' to see these settings in a library. -+ # -+ifndef USE_GCC -+ Z_ORIGIN_FLAG/sparc = -Xlinker -z -Xlinker origin -+ Z_ORIGIN_FLAG/i586 = -Xlinker -z -Xlinker origin -+ Z_ORIGIN_FLAG/amd64 = -Xlinker -z -Xlinker origin -+ Z_ORIGIN_FLAG/ia64 = -Xlinker -z -Xlinker origin -+ Z_ORIGIN_FLAG/arm = -+ Z_ORIGIN_FLAG/ppc = -+ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlinker origin -+ -+ LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY)) -+ -+ LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN -+ LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%) -+else -+ LDFLAGS_COMMON += -Wl,-R${PREFIX}/lib -+ LDFLAGS_COMMON += -Wl,-R${PREFIX}/java/openjdk7/jre/lib/$(LIBARCH) -+ LDFLAGS_COMMON += -Wl,-R${PREFIX}/java/openjdk7/jre/lib/$(LIBARCH)/jli -+endif # USE_GCC -+endif # LIBRARY -+ -+EXTRA_LIBS += -lc -+ -+LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs -+LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) -+ -+# -+# -L paths for finding and -ljava -+# -+#LDFLAGS_OPT = -Xlinker -O1 -+LDFLAGS_OPT = -+LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) -+ifdef LIBRARY -+LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) -+endif -+ -+# -+# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always -+# statically link libgcc but will print a warning with the flag. We don't -+# want the warning, so check gcc version first. -+# -+ifeq ($(CC_MAJORVER),3) -+ OTHER_LDFLAGS += -static-libgcc -+endif -+ -+# Automatic precompiled header option to use (if COMPILE_APPROACH=batch) -+# (See Rules.gmk) The gcc 5 compiler might have an option for this? -+AUTOMATIC_PCH_OPTION = -+ -+# -+# Post Processing of libraries/executables -+# -+ifeq ($(VARIANT), OPT) -+ ifneq ($(NO_STRIP), true) -+ ifneq ($(DEBUG_BINARIES), true) -+ # Debug 'strip -g' leaves local function Elf symbols (better stack -+ # traces) -+ POST_STRIP_PROCESS = $(STRIP) -g -+ endif -+ endif -+endif -+ -+# -+# Use: ld $(LD_MAPFILE_FLAG) mapfile *.o -+# -+# actually if linker = illumos -+ifeq ($(CC_VERSION),gcc) -+LD_MAPFILE_FLAG = -Xlinker -M -Xlinker -+else -+LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker -+#LD_MAPFILE_FLAG = -M -+endif -+ -+# -+# Support for Quantify. -+# -+ifdef QUANTIFY -+QUANTIFY_CMD = quantify -+QUANTIFY_OPTIONS = -cache-dir=/tmp/quantify -always-use-cache-dir=yes -+LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS) -+endif -+ -+# -+# Path and option to link against the VM, if you have to. Note that -+# there are libraries that link against only -ljava, but they do get -+# -L to the -ljvm, this is because -ljava depends on -ljvm, whereas -+# the library itself should not. -+# -+VM_NAME = server -+JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -Wl,-R${PREFIX}/java/openjdk7/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm -+JAVALIB = -ljava $(JVMLIB) -+ -+# -+# We want to privatize JVM symbols on Solaris. This is so the user can -+# write a function called FindClass and this should not override the -+# FindClass that is inside the JVM. At this point in time we are not -+# concerned with other JNI libraries because we hope that there will -+# not be as many clashes there. -+# -+PRIVATIZE_JVM_SYMBOLS = false -+ -+#USE_PTHREADS = true -+#override ALT_CODESET_KEY = _NL_CTYPE_CODESET_NAME -+override AWT_RUNPATH = -+#override HAVE_ALTZONE = false -+#override HAVE_FILIOH = false -+#override HAVE_GETHRTIME = false -+#override HAVE_GETHRVTIME = false -+#override HAVE_SIGIGNORE = true -+#override LEX_LIBRARY = -lfl -+ifeq ($(STATIC_CXX),true) -+override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic -+else -+override LIBCXX = -lstdc++ -+endif -+#override LIBPOSIX4 = -+override LIBM = /usr/lib$(ISA_DIR)/libm.so.2 -+override LIBSOCKET = -lsocket -+override LIBNSL = -lnsl -+override LIBSCF = -lscf -+#override LIBTHREAD = -+override LIBDL = -ldl -+#override MOOT_PRIORITIES = true -+#override NO_INTERRUPTIBLE_IO = true -+override OPENWIN_HOME = /opt/local -+override OPENWIN_LIB = $(OPENWIN_HOME)/lib$(ISA_DIR) -+override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER -+#override SUN_CMM_SUBDIR = -+override THREADS_FLAG = native -+#override USE_GNU_M4 = true -+override USING_GNU_TAR = true -+#override WRITE_LIBVERSION = false -+ -+# assuming that solaris && gcc equals a system with modular X11 header location -+ifeq ($(PLATFORM), solaris) -+ ifeq ($(CC_VERSION), gcc) -+ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include -+ endif # CC_VERSION -+endif # PLATFORM -+ -+# USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the -+# resulting resolved absolute name of the executable in the environment -+# variable EXECNAME. That executable name is then used that to locate the -+# installation area. -+#override USE_EXECNAME = true -+ -+# If your platform has DPS, it will have Type1 fonts too, in which case -+# it is best to enable DPS support until such time as 2D's rasteriser -+# can fully handle Type1 fonts in all cases. Default is "yes". -+# HAVE_DPS should only be "no" if the platform has no DPS headers or libs -+# DPS (Displayable PostScript) is available on Solaris machines -+HAVE_DPS = no -+ -+SYSTEM_ZLIB = true -+ -+# -+# Japanese manpages -+# -+JA_SOURCE_ENCODING = eucJP -+JA_TARGET_ENCODINGS = UTF-8 -+ -+# Settings for the JDI - Serviceability Agent binding. -+HOTSPOT_SALIB_PATH = $(HOTSPOT_IMPORT_PATH)/jre/lib/$(LIBARCH) -+SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX) -+SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc.debuginfo -+SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz -+ -+# The JDI - Serviceability Agent binding is not currently supported -+# on Linux-ia64. -+#ifeq ($(ARCH), ia64) -+# INCLUDE_SA = false -+#else -+ INCLUDE_SA = true -+#endif -+ -+ifdef CROSS_COMPILE_ARCH -+ # X11 headers are not under /usr/include -+ OTHER_CFLAGS += -I$(OPENWIN_HOME)/include -+ OTHER_CXXFLAGS += -I$(OPENWIN_HOME)/include -+ OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include -+endif diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris.gmk deleted file mode 100644 index f89dea27f68..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_Defs-solaris.gmk +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-jdk_make_common_Defs-solaris.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -GCC support. - ---- jdk/make/common/Defs-solaris.gmk.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/make/common/Defs-solaris.gmk -@@ -44,6 +44,10 @@ - # Note: CPPFLAGS are used in C and C++ compiles. - # - -+ifdef USE_GCC -+ include $(JDK_TOPDIR)/make/common/Defs-$(PLATFORM)-gcc.gmk -+else -+ - # Get shared JDK settings - include $(JDK_MAKE_SHARED_DIR)/Defs.gmk - -@@ -799,3 +803,5 @@ SA_DEBUGINFO_NAME = $(LIB_PREFIX)saproc. - SA_DIZ_NAME = $(LIB_PREFIX)saproc.diz - INCLUDE_SA=true - -+endif # USE_GCC -+ diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Mapfile-vers.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Mapfile-vers.gmk deleted file mode 100644 index cbda9610494..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_Mapfile-vers.gmk +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-jdk_make_common_Mapfile-vers.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -GCC support. - ---- jdk/make/common/Mapfile-vers.gmk.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/make/common/Mapfile-vers.gmk -@@ -50,14 +50,16 @@ ifeq ($(VARIANT), OPT) - ifndef FILES_m - FILES_m = mapfile-vers - endif -- -+ -+ifneq ($(CC_VERSION), gcc) - # If we are re-ordering functions in this solaris library, we need to make - # sure that -xF is added to the compile lines. This option is critical and - # enables the functions to be reordered. - ifdef FILES_reorder - CFLAGS_OPT += -xF - CXXFLAGS_OPT += -xF -- endif -+ endif # FILES_reorder -+endif # USE_GCC - - INIT += $(TEMPDIR)/mapfile-vers - -@@ -70,9 +72,15 @@ $(TEMPDIR)/mapfile-vers : $(FILES_m) $(F - endif # VARIANT - - ifndef LDNOMAP -+ifneq ($(CC_VERSION), gcc) - LDMAPFLAGS_OPT = -M$(TEMPDIR)/mapfile-vers - LDMAPFLAGS_DBG = $(FILES_m:%=-M%) --endif -+else -+ ## proper passthrough for gcc -+ LDMAPFLAGS_OPT = -Xlinker -M$(TEMPDIR)/mapfile-vers -+ LDMAPFLAGS_DBG = $(FILES_m:%=-Xlinker -M%) -+endif # USE_GCC -+endif # LDNOMAP - - endif # PLATFORM - diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk deleted file mode 100644 index 8c4f2f6647e..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_Program.gmk +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-jdk_make_common_Program.gmk,v 1.4 2017/08/14 00:02:16 ryoon Exp $ - -GCC support. - ---- jdk/make/common/Program.gmk.orig 2017-08-13 05:55:12.000000000 +0000 -+++ jdk/make/common/Program.gmk -@@ -65,7 +65,10 @@ program: $(ACTUAL_PROGRAM) - ifndef CROSS_COMPILE_ARCH - # reuse the mapfiles in the launcher's directory, the same should - # be applicable to the tool launchers as well. -- FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) -+ # Except when the makefile requests a specific mapfile. -+ ifndef FILES_m -+ FILES_m = $(BUILDDIR)/java/main/java/mapfile-$(ARCH) -+ endif # ! FILES_m - include $(BUILDDIR)/common/Mapfile-vers.gmk - endif - -@@ -110,10 +113,11 @@ ifneq (,$(findstring $(PLATFORM), linux - LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli - OTHER_LDLIBS += -ljli - ifeq ($(PLATFORM), solaris) -+ LDFLAGS += -R ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/jli - ifeq ($(ARCH_DATA_MODEL), 32) -- LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli -+# LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli - else # ! ARCH_DATA_MODEL 64-bit -- LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli -+# LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli - endif # ARCH_DATA_MODEL - endif # PLATFORM SOLARIS - ifeq ($(PLATFORM), linux) -@@ -121,6 +125,9 @@ ifneq (,$(findstring $(PLATFORM), linux - LDFLAGS += -Wl,--allow-shlib-undefined - LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli - endif # PLATFORM LINUX -+ ifeq ($(SYSTEM_ZLIB),true) -+ OTHER_LDLIBS += $(ZLIB_LIBS) -+ endif # SYSTEM_ZLIB - endif # PLATFORM linux solaris - - # AIX can not handle $ORIGIN so we have to link with the static JLI version (libjli.a) diff --git a/lang/openjdk7/patches/patch-jdk_make_common_Rules.gmk b/lang/openjdk7/patches/patch-jdk_make_common_Rules.gmk deleted file mode 100644 index c7df98bc0a0..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_Rules.gmk +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-jdk_make_common_Rules.gmk,v 1.1 2014/11/03 12:25:36 ryoon Exp $ - -* add '-encoding UTF-8' to JAVAC_CMD to support the " ˇ" character string in -* classes/net/sourceforge/jnlp/security/policyeditor/PolicyEditorPermissions.java -* avoiding "unmappable character for encoding ascii" error - ---- jdk/make/common/Rules.gmk.orig 2014-01-01 05:53:33.000000000 +0000 -+++ jdk/make/common/Rules.gmk -@@ -256,7 +256,7 @@ classes : $(CLASSES_INIT) .delete.classl - $(CAT) $<.filtered; \ - $(ECHO) "# Running javac:"; \ - $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ -- $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \ -+ $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -encoding UTF-8 -d $(CLASSDESTDIR) @$<.filtered; \ - fi - @$(java-vm-cleanup) - diff --git a/lang/openjdk7/patches/patch-jdk_make_common_shared_Compiler-gcc.gmk b/lang/openjdk7/patches/patch-jdk_make_common_shared_Compiler-gcc.gmk deleted file mode 100644 index 437a4d4ffaf..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_shared_Compiler-gcc.gmk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_make_common_shared_Compiler-gcc.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -GCC needs -shared not -G. - ---- jdk/make/common/shared/Compiler-gcc.gmk.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/make/common/shared/Compiler-gcc.gmk -@@ -80,7 +80,7 @@ ifeq ($(PLATFORM), solaris) - CXX = $(COMPILER_PATH)g++ - - # Option used to create a shared library -- SHARED_LIBRARY_FLAG = -G -+ SHARED_LIBRARY_FLAG = -shared - - endif - diff --git a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk deleted file mode 100644 index b1b43d9bc01..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-utils.gmk +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-jdk_make_common_shared_Defs-utils.gmk,v 1.2 2014/01/02 01:16:35 ryoon Exp $ - -Use pkgsrc zip commands. - ---- jdk/make/common/shared/Defs-utils.gmk.orig 2014-01-01 05:53:33.000000000 +0000 -+++ jdk/make/common/shared/Defs-utils.gmk -@@ -259,6 +259,10 @@ ifeq ($(PLATFORM), macosx) - ECHO = echo - endif - -+ZIPEXE = $(PKGSRC_ZIPEXE) -+UNZIP = $(PKGSRC_UNZIP) -+UNZIPSFX = $(PKGSRC_UNZIPSFX) -+ - # BSD specific - ifeq ($(PLATFORM),bsd) - BASENAME = $(UTILS_USR_BIN_PATH)basename -@@ -286,7 +290,14 @@ ifeq ($(PLATFORM),bsd) - endif - ifeq ($(OS_VENDOR), NetBSD) - NAWK = $(UTILS_USR_BIN_PATH)awk -- ZIPEXE = $(UTILS_DEVTOOL_PATH)zip -- UNZIP = $(UTILS_DEVTOOL_PATH)unzip -+ ZIPEXE = $(PKGSRC_ZIPEXE) -+ UNZIP = $(PKGSRC_UNZIP) -+ UNZIPSFX = $(PKGSRC_UNZIPSFX) -+ endif -+ ifeq ($(OS_VENDOR), DragonFlyBSD) -+ NAWK = $(UTILS_USR_BIN_PATH)awk -+ ZIPEXE = $(PKGSRC_ZIPEXE) -+ UNZIP = $(PKGSRC_UNZIP) -+ UNZIPSFX = $(PKGSRC_UNZIPSFX) - endif - endif diff --git a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-versions.gmk b/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-versions.gmk deleted file mode 100644 index ee6a38ed688..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_common_shared_Defs-versions.gmk +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-jdk_make_common_shared_Defs-versions.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Add GCC support. - ---- jdk/make/common/shared/Defs-versions.gmk.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/make/common/shared/Defs-versions.gmk -@@ -36,7 +36,11 @@ endif - - # Solaris uses Sun Studio compilers by default - ifeq ($(PLATFORM), solaris) -- override CC_VERSION = sun -+ ifdef USE_GCC -+ override CC_VERSION = gcc -+ else -+ override CC_VERSION = sun -+ endif - endif - - # Linux uses GNU compilers by default diff --git a/lang/openjdk7/patches/patch-jdk_make_java_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_Makefile deleted file mode 100644 index b224d121f23..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_java_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_make_java_Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ - -Disable SunOS multiarch. - ---- jdk/make/java/Makefile.orig 2013-06-18 11:53:51.041002241 +0000 -+++ jdk/make/java/Makefile -@@ -48,7 +48,7 @@ SUBDIRS_misc = npt java_crw_demo j - - - ifeq ($(PLATFORM), solaris) -- ifeq ($(ARCH_DATA_MODEL), 32) -+ ifneq ($(ARCH_DATA_MODEL), NOMULTIARCH64) - SUBDIRS += jexec - endif - endif # PLATFORM diff --git a/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile deleted file mode 100644 index d7b906c3de7..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_java_instrument_Makefile +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-jdk_make_java_instrument_Makefile,v 1.3 2015/04/27 19:24:17 jperkin Exp $ - -Need libiconv. - ---- jdk/make/java/instrument/Makefile.orig 2014-01-01 05:53:33.000000000 +0000 -+++ jdk/make/java/instrument/Makefile -@@ -115,7 +115,7 @@ ifneq (,$(findstring $(PLATFORM), macosx - LDFLAGS += -Wl,--whole-archive - LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a - LDFLAGS += -Wl,--no-whole-archive -- ifneq ($(OS_NAME), netbsd) -+ ifeq ($(OS_NAME), freebsd) - # Use CPPFLAGS instead of OTHER_INCLUDES to force this last - CPPFLAGS += -I$(PACKAGE_PATH)/include - OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv -@@ -131,6 +131,9 @@ else - OTHER_LDLIBS += -ldl - ifeq ($(PLATFORM), solaris) - LDFLAGS += -R \$$ORIGIN/jli -+ ifeq ($(CC_VERSION), gcc) -+ OTHER_LDLIBS += -L${BUILDLINK_PREFIX.iconv}/lib -liconv -+ endif - endif - ifeq ($(PLATFORM), linux) - LDFLAGS += $(LDFLAG_Z_ORIGIN) diff --git a/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk b/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk deleted file mode 100644 index 5304f7623a0..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-jdk_make_java_net_FILES__c.gmk,v 1.2 2015/01/09 16:29:04 rumko Exp $ - -Use bsd_close.c on all BSD platforms, but avoid duplication on fbsd - ---- jdk/make/java/net/FILES_c.gmk.orig 2014-11-02 07:18:20.000000000 +0000 -+++ jdk/make/java/net/FILES_c.gmk -@@ -45,11 +45,7 @@ ifeq ($(PLATFORM), linux) - FILES_c += linux_close.c - endif - --ifeq ($(PLATFORM), macosx) -- FILES_c += bsd_close.c --endif -- --ifeq ($(OS_VENDOR), FreeBSD) -+ifeq ($(PLATFORM), bsd) - FILES_c += bsd_close.c - endif - diff --git a/lang/openjdk7/patches/patch-jdk_make_java_nio_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_nio_Makefile deleted file mode 100644 index 5397a06f94a..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_java_nio_Makefile +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-jdk_make_java_nio_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Ensure we pick up the main flags. - ---- jdk/make/java/nio/Makefile.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/make/java/nio/Makefile -@@ -34,6 +34,9 @@ PRODUCT = java - OTHER_JAVACFLAGS += -Xmaxwarns 1000 -Xlint:serial -Werror - include $(BUILDDIR)/common/Defs.gmk - -+LDDFLAGS += $(LDFLAGS_COMMON_$(ARCH)) -+CPPFLAGS += $(CFLAGS_REQUIRED_$(ARCH)) -+ - NIO_SRC = $(SHARE_SRC)/classes/java/nio - NIO_GEN = $(GENSRCDIR)/java/nio - diff --git a/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile b/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile deleted file mode 100644 index 32de427806a..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_java_npt_Makefile +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-jdk_make_java_npt_Makefile,v 1.3 2015/04/27 19:24:17 jperkin Exp $ - -GCC needs libiconv. - ---- jdk/make/java/npt/Makefile.orig 2014-01-01 05:53:33.000000000 +0000 -+++ jdk/make/java/npt/Makefile -@@ -38,6 +38,12 @@ FILES_m = mapfile-vers - - include $(BUILDDIR)/common/Defs.gmk - -+ifeq ($(PLATFORM), solaris) -+ ifeq ($(CC_VERSION), gcc) -+ OTHER_LDLIBS += -L${BUILDLINK_PREFIX.iconv}/lib -liconv -+ endif # CC_VERSION -+endif # PLATFORM -+ - SRCDIR=$(SHARE_SRC)/npt - PSRCDIR=$(PLATFORM_SRC)/npt - -@@ -76,7 +82,7 @@ endif - - # Add location of iconv headers - ifeq ($(PLATFORM), bsd) -- ifneq ($(OS_NAME), netbsd) -+ ifeq ($(OS_NAME), freebsd) - CPPFLAGS += -I$(PACKAGE_PATH)/include - OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -liconv - endif diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_awt_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_awt_Makefile deleted file mode 100644 index c1e976b5f81..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_sun_awt_Makefile +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -GCC support. - ---- jdk/make/sun/awt/Makefile.orig 2013-06-11 14:02:41.501545894 +0000 -+++ jdk/make/sun/awt/Makefile -@@ -94,6 +94,7 @@ ifeq ($(PLATFORM), solaris) - FILES_c = $(FILES_2D_c) - FILES_c += awt_LoadLibrary.c - OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL) -+ifneq ($(CC_VERSION), gcc) - ifeq ($(CC_VER), 5.8) - ifndef REMOVE_ALL_WORKAROUNDS - ifeq ($(ARCH_FAMILY), i586) -@@ -114,6 +115,7 @@ ifeq ($(CC_VER), 5.8) - endif - endif - endif -+endif # ! CC_VERSION - endif - - ifeq ($(PLATFORM), linux) -@@ -427,7 +429,15 @@ FONTCONFIGS_SRC = $(PLATFORM_SRC)/classe - _FONTCONFIGS = \ - fontconfig.properties - --FONTCONFIGS_SRC_PREFIX = $(PLATFORM). -+ifndef DISTRO -+ DISTRO=$(PLATFORM) -+endif # DISTRO -+ -+ifeq ($(DISTRO), pkgsrc) -+ FONTCONFIGS_SRC_PREFIX = pkgsrc. -+else -+ FONTCONFIGS_SRC_PREFIX = $(PLATFORM). -+endif # DISTRO - - # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS - endif # PLATFORM -@@ -543,12 +553,7 @@ ifneq ($(PLATFORM), windows) - # Other extra flags needed for compiling. - # - --ifeq ($(PLATFORM), linux) --CPPFLAGS += -I$(OPENWIN_HOME)/include \ -- -I$(OPENWIN_HOME)/include/X11/extensions \ -- -I$(PLATFORM_SRC)/native/$(PKGDIR)/font --endif --ifeq ($(PLATFORM), bsd) -+ifneq (,$(findstring $(PLATFORM), linux bsd solaris)) - CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font - endif - CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ -@@ -573,13 +578,10 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGD - $(EVENT_MODEL) - - # include these last so we don't pick up unintentional includes --ifeq ($(PLATFORM), bsd) -+ifneq (,$(findstring $(PLATFORM), linux bsd solaris)) - CPPFLAGS += -I$(OPENWIN_HOME)/include \ -- -I$(OPENWIN_HOME)/include/X11/extensions --endif -- --ifneq (,$(findstring $(PLATFORM), linux bsd)) --LDFLAGS += -L$(OPENWIN_LIB) -+ -I$(OPENWIN_HOME)/include/X11/extensions -+LDFLAGS += -L$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB) - endif - - LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk b/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk deleted file mode 100644 index 32c3a889c68..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_sun_awt_mawt.gmk +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-jdk_make_sun_awt_mawt.gmk,v 1.2 2017/08/14 00:02:16 ryoon Exp $ - -Fix "Extraneous text after `ifeq' directive". - ---- jdk/make/sun/awt/mawt.gmk.orig 2017-08-13 05:55:12.000000000 +0000 -+++ jdk/make/sun/awt/mawt.gmk -@@ -166,7 +166,7 @@ LIBXMU_OPT = - LIBXMU = $(LIBXMU_$(VARIANT)) - - ifeq ($(PLATFORM), solaris) --OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi -+OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -X11 -lXi - endif - - ifneq (,$(findstring $(PLATFORM), bsd linux macosx)) -@@ -193,7 +193,7 @@ endif - # - # Other extra flags needed for compiling. - # --ifneq ($(PLATFORM), bsd)) -+ifneq ($(PLATFORM), bsd) - CPPFLAGS += -I$(CUPS_HEADERS_PATH) - - ifndef HEADLESS -@@ -245,7 +245,7 @@ ifeq ($(PLATFORM), linux) - $(wildcard /usr/include/X11/extensions)) - endif - --ifeq ($(PLATFORM), bsd)) -+ifeq ($(PLATFORM), bsd) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include \ - -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile deleted file mode 100644 index fed4226673a..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_sun_rmi_rmi_Makefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_make_sun_rmi_rmi_Makefile,v 1.1 2013/06/23 17:39:43 jperkin Exp $ - -Disable SunOS multiarch. - ---- jdk/make/sun/rmi/rmi/Makefile.orig 2013-06-18 11:53:51.077890050 +0000 -+++ jdk/make/sun/rmi/rmi/Makefile -@@ -93,7 +93,7 @@ ifeq ($(PLATFORM), linux) - BUILD_TARGETS += bin - endif - ifeq ($(PLATFORM), solaris) -- ifeq ($(ARCH_DATA_MODEL), 32) -+ ifneq ($(ARCH_DATA_MODEL), NOMULTIARCH64) - BUILD_TARGETS += bin - endif - endif diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_security_ec_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_security_ec_Makefile deleted file mode 100644 index 3e8899ea66c..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_sun_security_ec_Makefile +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-jdk_make_sun_security_ec_Makefile,v 1.2 2018/07/24 16:07:25 jperkin Exp $ - -GCC compatability. - ---- jdk/make/sun/security/ec/Makefile.orig 2017-08-13 05:55:16.000000000 +0000 -+++ jdk/make/sun/security/ec/Makefile -@@ -188,6 +188,15 @@ ifeq ($(NATIVE_ECC_AVAILABLE), true) - # - OTHER_CFLAGS += -DMP_API_COMPATIBLE -DNSS_ECC_MORE_THAN_SUITE_B - -+ # gcc on solaris seems to define _POSIX_C_SOURCE or _XOPEN -+ # g++, on the otherhand, does not define either. -+ # It causes problems with g++: _B_FALSE instead of B_FALSE -+ ifeq ($(PLATFORM), solaris) -+ ifeq ($(CC_VERSION), gcc) -+ OTHER_CFLAGS += -D__EXTENSIONS__ -+ endif # CC_VERSION -+ endif # PLATFORM -+ - # - # Libraries to link - # diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile deleted file mode 100644 index 3335f1284bc..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_sun_splashscreen_Makefile +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.3 2017/08/14 00:02:16 ryoon Exp $ - -GCC support. - ---- jdk/make/sun/splashscreen/Makefile.orig 2017-08-13 05:55:16.000000000 +0000 -+++ jdk/make/sun/splashscreen/Makefile -@@ -109,6 +109,11 @@ else ifneq ($(PLATFORM), windows) - OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread - endif - endif -+ ifeq ($(PLATFORM), solaris) -+ ifeq ($(CC_VERSION), gcc) -+ OTHER_LDLIBS += -L${BUILDLINK_PREFIX.iconv}/lib -liconv -+ endif -+ endif - else # PLATFORM - CFLAGS += -DWITH_WIN32 - OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll diff --git a/lang/openjdk7/patches/patch-jdk_make_sun_xawt_Makefile b/lang/openjdk7/patches/patch-jdk_make_sun_xawt_Makefile deleted file mode 100644 index 929b718c120..00000000000 --- a/lang/openjdk7/patches/patch-jdk_make_sun_xawt_Makefile +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-jdk_make_sun_xawt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -GCC support. - ---- jdk/make/sun/xawt/Makefile.orig 2013-06-11 09:37:03.894233474 +0000 -+++ jdk/make/sun/xawt/Makefile -@@ -58,7 +58,7 @@ endif - - # For Xrender extension. - ifeq ($(PLATFORM), solaris) --LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR) -+LDFLAGS += -Wl,-R$(OPENWIN_LIB) - endif - - ifeq ($(PLATFORM), linux) -@@ -170,6 +170,9 @@ endif - # we will set a flag indicating this mismatch and the JDK source file - # will interpret it to resolve the problem. - ifeq ($(PLATFORM), solaris) -+ ifeq ($(CC_VERSION), gcc) -+ CPPFLAGS += -I$(OPENWIN_HOME)/include -+ endif # CC_VERSION - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions - OS_VERSION := $(shell uname -r) - XRENDER_H := $(OPENWIN_HOME)/share/include/X11/extensions/Xrender.h diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java deleted file mode 100644 index 746266c7593..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_ExternalScriptable.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/ExternalScriptable.java -@@ -24,7 +24,7 @@ - */ - - package com.sun.script.javascript; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - import javax.script.*; - import java.util.*; - diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java deleted file mode 100644 index 64c5c82fbac..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_JSAdapter.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/JSAdapter.java -@@ -25,7 +25,7 @@ - - package com.sun.script.javascript; - --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - import java.util.*; - - /** diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java deleted file mode 100644 index b18bba5bac9..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_JavaAdapter.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/JavaAdapter.java -@@ -26,7 +26,7 @@ - package com.sun.script.javascript; - - import javax.script.Invocable; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - - /** - * This class implements Rhino-like JavaAdapter to help implement a Java diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java deleted file mode 100644 index b54c258d2d3..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoClassShutter.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java -@@ -26,7 +26,7 @@ - package com.sun.script.javascript; - - import java.util.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - - /** - * This class prevents script access to certain sensitive classes. diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java deleted file mode 100644 index b23b4eeacd1..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoCompiledScript.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java -@@ -25,7 +25,7 @@ - - package com.sun.script.javascript; - import javax.script.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - - /** - * Represents compiled JavaScript code. diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java deleted file mode 100644 index e64bb5c67d8..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngine.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.orig 2013-05-29 03:57:57.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java -@@ -26,7 +26,7 @@ - package com.sun.script.javascript; - import com.sun.script.util.*; - import javax.script.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - import java.lang.reflect.Method; - import java.io.*; - import java.security.*; diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java deleted file mode 100644 index 6859dc4e79c..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoScriptEngineFactory.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java -@@ -26,7 +26,7 @@ - package com.sun.script.javascript; - import javax.script.*; - import java.util.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - import com.sun.script.util.*; - - /** diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java deleted file mode 100644 index 66797beb3b0..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoTopLevel.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java -@@ -25,7 +25,7 @@ - - package com.sun.script.javascript; - --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - import javax.script.*; - import java.security.AccessControlContext; - diff --git a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java b/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java deleted file mode 100644 index 28beed02435..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_classes_com_sun_script_javascript_RhinoWrapFactory.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.orig 2012-08-10 17:25:37.000000000 +0000 -+++ jdk/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java -@@ -27,7 +27,7 @@ package com.sun.script.javascript; - - import java.lang.reflect.*; - import static sun.security.util.SecurityConstants.*; --import sun.org.mozilla.javascript.internal.*; -+import org.mozilla.javascript.*; - - /** - * This wrap factory is used for security reasons. JSR 223 script diff --git a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c b/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c deleted file mode 100644 index 39a3d698a34..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Ensure we use the bundled jpeg. - ---- jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c -@@ -50,7 +50,7 @@ - #include "com_sun_imageio_plugins_jpeg_JPEGImageWriter.h" - - /* headers from the JPEG library */ --#include <jpeglib.h> -+#include "jpeglib.h" - #include "jerror.h" - - #undef MAX diff --git a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c b/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c deleted file mode 100644 index 9bd8779092e..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Ensure we use the bundled jpeg. - ---- jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c -@@ -44,7 +44,7 @@ - /* undo "system_boolean" hack and undef FAR since we don't use it anyway */ - #undef boolean - #undef FAR --#include <jpeglib.h> -+#include "jpeglib.h" - #include "jerror.h" - - /* The method IDs we cache. Note that the last two belongs to the diff --git a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h b/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h deleted file mode 100644 index 91fde4a168b..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-jdk_src_share_native_sun_awt_libpng_pngpriv.h,v 1.1 2018/07/24 16:07:25 jperkin Exp $ - -Fix build on SunOS with C99. - ---- jdk/src/share/native/sun/awt/libpng/pngpriv.h.orig 2017-08-13 05:55:19.000000000 +0000 -+++ jdk/src/share/native/sun/awt/libpng/pngpriv.h -@@ -63,7 +63,9 @@ - * Windows/Visual Studio) there is no effect; the OS specific tests below are - * still required (as of 2011-05-02.) - */ -+#if !defined(__sun) || (__STDC_VERSION__-0 < 199901L) - #define _POSIX_SOURCE 1 /* Just the POSIX 1003.1 and C89 APIs */ -+#endif - - #ifndef PNG_VERSION_INFO_ONLY - /* Standard library headers not required by png.h: */ diff --git a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h b/lang/openjdk7/patches/patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h deleted file mode 100644 index 995e7fecbd5..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h,v 1.2 2018/07/24 16:07:25 jperkin Exp $ - -GCC compatability. - ---- jdk/src/share/native/sun/security/ec/impl/ecc_impl.h.orig 2017-08-13 05:55:20.000000000 +0000 -+++ jdk/src/share/native/sun/security/ec/impl/ecc_impl.h -@@ -39,12 +39,13 @@ - - #ifndef _ECC_IMPL_H - #define _ECC_IMPL_H -+ -+#include <sys/types.h> - - #ifdef __cplusplus - extern "C" { - #endif - --#include <sys/types.h> - #include "ecl-exp.h" - - /* -@@ -58,6 +59,11 @@ typedef unsigned long ulong_t; - typedef enum { B_FALSE, B_TRUE } boolean_t; - #endif /* __linux__ */ - -+#if defined(__solaris__) && defined(__XOPEN_OR_POSIX) -+#define B_FALSE _B_FALSE -+#define B_TRUE _B_TRUE -+#endif /* __solaris__ && _GNU_SOURCE */ -+ - #ifdef _ALLBSD_SOURCE - #include <stdint.h> - #define B_FALSE FALSE diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_bin_ergo__i586.c b/lang/openjdk7/patches/patch-jdk_src_solaris_bin_ergo__i586.c deleted file mode 100644 index 3360c3abccb..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_bin_ergo__i586.c +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_bin_ergo__i586.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -GCC compatability. - ---- jdk/src/solaris/bin/ergo_i586.c.orig 2013-06-12 00:28:04.421609606 +0000 -+++ jdk/src/solaris/bin/ergo_i586.c -@@ -27,7 +27,7 @@ - - static unsigned long physical_processors(void); - --#ifdef __solaris__ -+#if defined(__solaris__) && !defined(_GNU_SOURCE) - - /* - * A utility method for asking the CPU about itself. -@@ -76,7 +76,9 @@ get_cpuid(uint32_t arg, - asm(" popl %ebx"); - #endif /* LP64 */ - } -+#endif /* __solaris__ && !_GNU_SOURCE */ - -+#ifdef __solaris__ - /* The definition of a server-class machine for solaris-i586/amd64 */ - jboolean - ServerClassMachineImpl(void) { -@@ -106,7 +108,7 @@ ServerClassMachineImpl(void) { - - #endif /* __solaris__ */ - --#if !defined(MACOSX) && (defined(__linux__) || defined(_ALLBSD_SOURCE)) -+#if !defined(MACOSX) && (defined(__linux__) || defined(_ALLBSD_SOURCE)) || (defined(__solaris__) && defined(_GNU_SOURCE)) - - /* - * A utility method for asking the CPU about itself. -@@ -177,6 +179,7 @@ get_cpuid(uint32_t arg, - #define OSNAMEPREFIX "bsd_" - #endif - -+#ifndef __solaris__ - /* The definition of a server-class machine for linux-i586 */ - jboolean - ServerClassMachineImpl(void) { -@@ -203,6 +206,7 @@ ServerClassMachineImpl(void) { - (result == JNI_TRUE ? "true" : "false")); - return result; - } -+#endif /* !__solaris__ */ - #endif /* !MACOSX && (__linux__ || _ALLBSD_SOURCE) */ - - /* diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd deleted file mode 100644 index 48ec7fba74f..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd,v 1.3 2017/08/14 00:02:16 ryoon Exp $ - -* Under NetBSD 5, use fork instead of posix_spawn. NetBSD 5 has no posix_spawn. - -+++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd ---- jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd.orig 2017-08-13 05:55:20.000000000 +0000 -+++ jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd -@@ -103,14 +103,28 @@ final class UNIXProcess extends Process - helperpath = toCString(javahome + "/lib/jspawnhelper"); - } - -- String s = System.getProperty( -- "jdk.lang.Process.launchMechanism", "posix_spawn"); -- -- try { -- return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH)); -- } catch (IllegalArgumentException e) { -- throw new Error(s + " is not a supported " + -- "process launch mechanism on this platform."); -+/* NetBSD 5 does not have posix_spawn. Use fork instead. */ -+ String osversion = System.getProperty("os.version"); -+ if (osname.startsWith("NetBSD") && osversion.startsWith("5")) { -+ String s = System.getProperty( -+ "jdk.lang.Process.launchMechanism", "fork"); -+ -+ try { -+ return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH)); -+ } catch (IllegalArgumentException e) { -+ throw new Error(s + " is not a supported " + -+ "process launch mechanism on this platform."); -+ } -+ } else { -+ String s = System.getProperty( -+ "jdk.lang.Process.launchMechanism", "posix_spawn"); -+ -+ try { -+ return LaunchMechanism.valueOf(s.toUpperCase(Locale.ENGLISH)); -+ } catch (IllegalArgumentException e) { -+ throw new Error(s + " is not a supported " + -+ "process launch mechanism on this platform."); -+ } - } - } - }); diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java deleted file mode 100644 index faf1c5ab618..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_net_PortConfig.java +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_classes_sun_net_PortConfig.java,v 1.3 2017/08/14 00:02:16 ryoon Exp $ - ---- jdk/src/solaris/classes/sun/net/PortConfig.java.orig 2017-08-13 05:55:21.000000000 +0000 -+++ jdk/src/solaris/classes/sun/net/PortConfig.java -@@ -59,7 +59,7 @@ public final class PortConfig { - } else if (os.startsWith("AIX")) { - defaultLower = 32768; - defaultUpper = 65535; -- } else if (os.contains("OS X") || os.endsWith("BSD")) { -+ } else if (os.contains("OS X") || os.endsWith("BSD") || os.contains("DragonFly")) { - defaultLower = 49152; - defaultUpper = 65535; - } else { diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java deleted file mode 100644 index 740e6130b8c..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java,v 1.3 2017/08/14 00:02:16 ryoon Exp $ - -* Fix apache-tomcat7's error, "java.lang.InternalError: platform not recognized" - patch is from http://www.freebsd.org/cgi/query-pr.cgi?pr=183389 - ---- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig 2017-08-13 05:55:21.000000000 +0000 -+++ jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java -@@ -50,7 +50,7 @@ public class DefaultAsynchronousChannelP - return new SolarisAsynchronousChannelProvider(); - if (osname.equals("Linux")) - return new LinuxAsynchronousChannelProvider(); -- if (osname.contains("OS X") || osname.endsWith("BSD")) -+ if (osname.contains("OS X") || osname.endsWith("BSD") || osname.contains("DragonFly")) - return new BsdAsynchronousChannelProvider(); - if (osname.equals("AIX")) - return new AixAsynchronousChannelProvider(); diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java deleted file mode 100644 index 24f000e485c..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java,v 1.1 2013/06/02 06:12:28 ryoon Exp $ - -* From rhino.patch. - ---- jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java.orig 2012-08-10 17:31:24.000000000 +0000 -+++ jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java -@@ -27,6 +27,7 @@ package sun.nio.fs; - - import java.nio.file.*; - import java.nio.file.attribute.*; -+import java.nio.file.spi.FileSystemProvider; - import java.io.IOException; - - /** -@@ -38,6 +39,10 @@ public class BsdFileSystemProvider exten - super(); - } - -+ public BsdFileSystemProvider(FileSystemProvider f) { -+ super(); -+ } -+ - @Override - BsdFileSystem newFileSystem(String dir) { - return new BsdFileSystem(this, dir); diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c deleted file mode 100644 index d004ca9455f..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c,v 1.1 2015/01/09 16:29:04 rumko Exp $ - -On some platforms ESTRPIPE is not defined, make it equal to EPIPE. - ---- jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c.orig 2014-11-02 07:18:19.000000000 +0000 -+++ jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c -@@ -30,6 +30,10 @@ - #include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h" - #include "DirectAudio.h" - -+#ifndef ESTRPIPE -+#define ESTRPIPE EPIPE -+#endif -+ - #if USE_DAUDIO == TRUE - - // GetPosition method 1: based on how many bytes are passed to the kernel driver diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c deleted file mode 100644 index b613d017ca4..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_com_sun_security_auth_module_Unix.c,v 1.1 2018/07/24 16:07:25 jperkin Exp $ - -Fix build on SunOS with C99. - ---- jdk/src/solaris/native/com/sun/security/auth/module/Unix.c.orig 2017-08-13 05:55:21.000000000 +0000 -+++ jdk/src/solaris/native/com/sun/security/auth/module/Unix.c -@@ -24,7 +24,11 @@ - */ - - #ifdef __solaris__ -+# if (__STDC_VERSION__ - 0 < 199901L) - #define _POSIX_C_SOURCE 199506L -+# else -+#define _POSIX_PTHREAD_SEMANTICS -+# endif - #endif - - #include <jni.h> diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c deleted file mode 100644 index 00d99080a51..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_java_lang_java__props__md.c,v 1.1 2014/07/25 20:35:14 ryoon Exp $ - ---- jdk/src/solaris/native/java/lang/java_props_md.c.orig 2014-06-14 20:38:31.000000000 +0000 -+++ jdk/src/solaris/native/java/lang/java_props_md.c -@@ -476,6 +476,11 @@ GetJavaProperties(JNIEnv *env) - { - #ifdef MACOSX - setOSNameAndVersion(&sprops); -+#elif defined(__DragonFly__) -+ struct utsname name; -+ uname(&name); -+ sprops.os_name = "DragonFlyBSD"; -+ sprops.os_version = strdup(name.release); - #else - struct utsname name; - uname(&name); diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c deleted file mode 100644 index 90ab7abc45d..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_NetworkInterface.c +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_java_net_NetworkInterface.c,v 1.3 2014/05/02 10:48:13 ryoon Exp $ - -Zones support. - ---- jdk/src/solaris/native/java/net/NetworkInterface.c.orig 2014-05-01 13:11:40.000000000 +0000 -+++ jdk/src/solaris/native/java/net/NetworkInterface.c -@@ -43,6 +43,7 @@ - #include <fcntl.h> - #include <stropts.h> - #include <sys/sockio.h> -+#include <zone.h> - #endif - - #ifdef __linux__ -@@ -60,14 +61,12 @@ - #include <sys/param.h> - #include <sys/ioctl.h> - #include <sys/sockio.h> --#if defined(__FreeBSD__) || defined(__APPLE__) -+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__) - #include <net/ethernet.h> - #include <net/if_var.h> --#elif defined(__OpenBSD__) -+#elif defined(__OpenBSD__) || defined(__NetBSD__) - #include <netinet/if_ether.h> - #include <netinet6/in6_var.h> --#elif defined(__NetBSD__) --#include <net/if_ether.h> - #endif - #include <net/if_dl.h> - #include <netinet/in_var.h> -@@ -1529,7 +1528,8 @@ static short getSubnet(JNIEnv *env, int - - - --#define DEV_PREFIX "/dev/" -+#define NET_DEV_PREFIX "/dev/" -+#define ZONE_NET_DEV_PREFIX "/dev/net/" - - /** - * Solaris specific DLPI code to get hardware address from a device. -@@ -1546,11 +1546,18 @@ static int getMacFromDevice(JNIEnv *env, - int flags = 0; - - /** -- * Device is in /dev -+ * Device is in /dev in global zone / standalone - * e.g.: /dev/bge0 -+ * Device is in /dev/net in a zone -+ * e.g.: /dev/net/net0 - */ -- strcpy(style1dev, DEV_PREFIX); -+ if (getzoneid()==(zoneid_t)GLOBAL_ZONEID) { -+ strcpy(style1dev, NET_DEV_PREFIX); -+ } else { -+ strcpy(style1dev, ZONE_NET_DEV_PREFIX); -+ } - strcat(style1dev, ifname); -+ - if ((fd = open(style1dev, O_RDWR)) < 0) { - /* - * Can't open it. We probably are missing the privilege. diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.c deleted file mode 100644 index 81e21488f84..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.c,v 1.1 2014/01/20 19:25:11 joerg Exp $ - ---- jdk/src/solaris/native/java/net/net_util_md.c.orig 2014-01-05 21:54:15.000000000 +0000 -+++ jdk/src/solaris/native/java/net/net_util_md.c -@@ -118,9 +118,9 @@ int getDefaultScopeID(JNIEnv *env) { - static jfieldID ni_defaultIndexID; - if (ni_class == NULL) { - jclass c = (*env)->FindClass(env, "java/net/NetworkInterface"); -- CHECK_NULL(c); -+ CHECK_NULL_RETURN(c, 0); - c = (*env)->NewGlobalRef(env, c); -- CHECK_NULL(c); -+ CHECK_NULL_RETURN(c, 0); - ni_defaultIndexID = (*env)->GetStaticFieldID( - env, c, "defaultIndex", "I"); - ni_class = c; diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h b/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h deleted file mode 100644 index bf97323a359..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_java_net_net__util__md.h,v 1.2 2017/08/14 00:02:16 ryoon Exp $ - ---- jdk/src/solaris/native/java/net/net_util_md.h.orig 2017-08-13 05:55:21.000000000 +0000 -+++ jdk/src/solaris/native/java/net/net_util_md.h -@@ -46,7 +46,7 @@ - close subroutine does not return until the select call returns. - ... - */ --#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) || defined (_AIX) -+#if defined(__linux__) || defined(__FreeBSD__) || defined(MACOSX) || defined (_AIX) || defined(__DragonFly__) - extern int NET_Timeout(int s, long timeout); - extern int NET_Read(int s, void* buf, size_t len); - extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags, diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_sun_awt_X11Color.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_sun_awt_X11Color.c deleted file mode 100644 index e6b99e879aa..00000000000 --- a/lang/openjdk7/patches/patch-jdk_src_solaris_native_sun_awt_X11Color.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_src_solaris_native_sun_awt_X11Color.c,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Casting. - ---- jdk/src/solaris/native/sun/awt/X11Color.c.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/src/solaris/native/sun/awt/X11Color.c -@@ -119,7 +119,7 @@ int getVirtCubeSize() { - return LOOKUPSIZE; - } - -- for (i = 0; i < MACHMAPSIZE; i++) { -+ for (i = 0; i < (int)MACHMAPSIZE; i++) { - if (strcmp(name.machine, machinemap[i].machine) == 0) { - #ifdef DEBUG - if (debug_colormap) { diff --git a/lang/openjdk7/patches/patch-jdk_test_Makefile b/lang/openjdk7/patches/patch-jdk_test_Makefile deleted file mode 100644 index 7ace71a97f1..00000000000 --- a/lang/openjdk7/patches/patch-jdk_test_Makefile +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-jdk_test_Makefile,v 1.5 2015/03/02 03:53:26 tnn Exp $ - -Use tools from pkgsrc. - ---- jdk/test/Makefile.orig 2014-01-01 05:53:43.000000000 +0000 -+++ jdk/test/Makefile -@@ -54,6 +54,8 @@ UNAME = uname - UNIQ = uniq - WC = wc - ZIP = zip -+UNZIP = unzip -+WHICH = which - - # Get OS name from uname - UNAME_S := $(shell $(UNAME) -s) -@@ -381,6 +383,12 @@ else - JTREG_TEST_OPTIONS = $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%) - endif - -+# carry over XAUTHORITY -+JTREG_TEST_OPTIONS += -e:XAUTHORITY -+ -+# some tests expect to find zip and unzip on the path -+JTREG_TEST_OPTIONS += -e:PATH=/bin:/usr/bin:$(dir $(shell $(WHICH) $(ZIP))):$(dir $(shell $(WHICH) $(UNZIP))) -+ - ifdef CONCURRENCY - EXTRA_JTREG_OPTIONS += -concurrency:$(CONCURRENCY) - endif diff --git a/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java b/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java deleted file mode 100644 index de3a8c688c8..00000000000 --- a/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_test_java_beans_Introspector_4168475_Test4168475.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Test fixes. - ---- jdk/test/java/beans/Introspector/4168475/Test4168475.java.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/test/java/beans/Introspector/4168475/Test4168475.java -@@ -41,6 +41,8 @@ public class Test4168475 { - private static final String[] PATH = {"infos"}; - - public static void main(String[] args) throws IntrospectionException { -+ // running under jtreg -agentvm: system classloader can't find this class (separate classloader?) -+ Thread.currentThread().setContextClassLoader(Test4168475.class.getClassLoader()); - Introspector.setBeanInfoSearchPath(PATH); - BeanInfo info = Introspector.getBeanInfo(Component.class); - PropertyDescriptor[] pds = info.getPropertyDescriptors(); diff --git a/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java b/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java deleted file mode 100644 index 3da1d4c4c18..00000000000 --- a/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_test_java_beans_Introspector_4520754_Test4520754.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Test fixes. - ---- jdk/test/java/beans/Introspector/4520754/Test4520754.java.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/test/java/beans/Introspector/4520754/Test4520754.java -@@ -56,6 +56,8 @@ public class Test4520754 { - }; - - public static void main(String[] args) { -+ // running under jtreg -agentvm: system classloader can't find this class (separate classloader?) -+ Thread.currentThread().setContextClassLoader(Test4520754.class.getClassLoader()); - // ensure that 4168475 does not regress - test4168475(Component.class); - // AWT classes (com.sun.beans.infos.ComponentBeanInfo) diff --git a/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_Test4144543.java b/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_Test4144543.java deleted file mode 100644 index 7beb19c5abe..00000000000 --- a/lang/openjdk7/patches/patch-jdk_test_java_beans_Introspector_Test4144543.java +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-jdk_test_java_beans_Introspector_Test4144543.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Test fixes. - ---- jdk/test/java/beans/Introspector/Test4144543.java.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/test/java/beans/Introspector/Test4144543.java -@@ -34,7 +34,8 @@ import java.beans.PropertyDescriptor; - - public class Test4144543 { - public static void main(String[] args) throws Exception { -- Class type = Beans.instantiate(null, "Test4144543").getClass(); -+ // running under jtreg -agentvm: system classloader can't find this class (separate classloader?) -+ Class type = Beans.instantiate(Test4144543.class.getClassLoader(), "Test4144543").getClass(); - - // try all the various places that this would break before - diff --git a/lang/openjdk7/patches/patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java b/lang/openjdk7/patches/patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java deleted file mode 100644 index 9ee700d1191..00000000000 --- a/lang/openjdk7/patches/patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_test_java_lang_management_OperatingSystemMXBean_GetSystemLoadAverage.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Test fixes. - ---- jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java -@@ -103,6 +103,8 @@ public class GetSystemLoadAverage { - ? output.split(" ") - : output.split(","); - double expected = Double.parseDouble(lavg[0]); -+ // round to value to two decimals; some OSes report more (SmartOS at least) -+ expected = 0.01D * Math.round(expected / 0.01D); - double lowRange = expected * (1 - DELTA); - double highRange = expected * (1 + DELTA); - diff --git a/lang/openjdk7/patches/patch-jdk_test_jprt.config b/lang/openjdk7/patches/patch-jdk_test_jprt.config deleted file mode 100644 index 1008c3fc9f0..00000000000 --- a/lang/openjdk7/patches/patch-jdk_test_jprt.config +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-jdk_test_jprt.config,v 1.1 2014/07/25 20:35:14 ryoon Exp $ - ---- jdk/test/jprt.config.orig 2014-06-14 20:38:33.000000000 +0000 -+++ jdk/test/jprt.config -@@ -109,7 +109,7 @@ case "${osname}" in - umask 002 - ;; - -- FreeBSD | OpenBSD ) -+ DragonFly | FreeBSD | OpenBSD ) - # Add basic paths - path4sdk=/usr/bin:/bin:/usr/sbin:/sbin - diff --git a/lang/openjdk7/patches/patch-jdk_test_sun_security_ec_TestEC.java b/lang/openjdk7/patches/patch-jdk_test_sun_security_ec_TestEC.java deleted file mode 100644 index e169c78c2c0..00000000000 --- a/lang/openjdk7/patches/patch-jdk_test_sun_security_ec_TestEC.java +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-jdk_test_sun_security_ec_TestEC.java,v 1.1 2013/06/15 09:31:06 jperkin Exp $ - -Test fixes. - ---- jdk/test/sun/security/ec/TestEC.java.orig 2013-02-20 17:07:30.000000000 +0000 -+++ jdk/test/sun/security/ec/TestEC.java -@@ -82,7 +82,7 @@ public class TestEC { - // ClientJSSEServerJSSE fails on Solaris 11 when both SunEC and - // SunPKCS11-Solaris providers are enabled. - // Workaround: -- // Security.removeProvider("SunPKCS11-Solaris"); -+ Security.removeProvider("SunPKCS11-Solaris"); - new ClientJSSEServerJSSE().main(p); - - long stop = System.currentTimeMillis(); diff --git a/lang/openjdk7/patches/patch-langtools_make_build.xml b/lang/openjdk7/patches/patch-langtools_make_build.xml deleted file mode 100644 index 965d79f6cf9..00000000000 --- a/lang/openjdk7/patches/patch-langtools_make_build.xml +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-langtools_make_build.xml,v 1.4 2015/03/02 03:53:26 tnn Exp $ - -* Avoid *.orig files. - ---- langtools/make/build.xml.orig 2015-01-26 15:22:25.000000000 +0000 -+++ langtools/make/build.xml -@@ -235,7 +235,8 @@ - </chmod> - <mkdir dir="${dist.lib.dir}"/> - <jar file="${dist.lib.dir}/classes.jar" basedir="${build.classes.dir}"/> -- <zip file="${dist.lib.dir}/src.zip" basedir="${src.classes.dir}"/> -+ <zip file="${dist.lib.dir}/src.zip" basedir="${src.classes.dir}" -+ excludes="**/*.orig"/> - </target> - - <target name="build-bootstrap-tools" -@@ -804,6 +805,7 @@ - <copy todir="@{classes.dir}" includeemptydirs="false"> - <fileset dir="${src.classes.dir}" includes="@{includes}" excludes="@{excludes}"> - <exclude name="**/*.java"/> -+ <exclude name="**/*.orig"/> - <exclude name="**/*.properties"/> - <exclude name="**/*-template"/> - <exclude name="**/*.rej"/> |