/hg/icedtea: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Apr 1 04:28:57 UTC 2016
changeset e40064fec5cb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e40064fec5cb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 03:32:05 2016 +0100
PR2766: Remove all references to GCJ
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2766: Remove all references to GCJ
* Makefile.am:
Remove dead commented out lines.
(ICEDTEA_BOOTSTRAP_CLASSES): Remove unused variable.
(clean-local): Remove clean-native-ecj.
(native-ecj): Removed.
(clean-native-ecj): Likewise.
(bootstrap-directory-stage1): Remove dependency on
native-ecj.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_GCJ): Removed.
(IT_CHECK_FOR_JDK): Remove unused GCJ_VMS variable.
* configure.ac:
Don't invoke IT_WITH_GCJ or search for gcj.
* javac.in:
Update bootstrap classpath. Remove attempt to
use native-ecj.
changeset 8b3899c5f70c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8b3899c5f70c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 04:05:13 2016 +0100
PR2863: IcedTea doesn't pass through build and host triplets to OpenJDK's configure
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2863: IcedTea doesn't pass through build
and host triplets to OpenJDK's configure
* AUTHORS: Add James and update my e-mail
address.
* NEWS: Updated.
2016-02-28 James Le Cuirot <chewi at gentoo.org>
PR2863: IcedTea doesn't pass through build
and host triplets to OpenJDK's configure
* Makefile.am:
(ICEDTEA_CONFIGURE): Pass build_triplet
and host_triplet through to OpenJDK.
changeset 0bd162aeebfc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0bd162aeebfc
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 04:24:47 2016 +0100
PR2035: --enable-cacao builds broken, missing JVM_GetTemporaryDirectory impl.
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2035: --enable-cacao builds broken, missing
JVM_GetTemporaryDirectory impl.
* Makefile.am:
(ICEDTEA_PATCHES): Add CACAO patch for PR2035.
* NEWS: Updated.
* patches/cacao/pr2035-tempdir.patch:
Implement JVM_GetTemporaryDirectory.
changeset 55e9ca853da2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=55e9ca853da2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 05:04:21 2016 +0100
PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs introduced by jdk8u40
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs
introduced by jdk8u40
* Makefile.am:
(ICEDTEA_PATCHES): Add CACAO patch for PR2776.
* NEWS: Updated.
* patches/cacao/pr2776-cache_api.patch:
Provide a minimal implementation of the lookup
cache API which basically says we don't implement it.
changeset 624150627c20 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=624150627c20
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 05:20:52 2016 +0100
PR2775: JamVM lacks JVM_GetResourceLookupCacheURLs introduced by jdk8u40
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2775: JamVM lacks JVM_GetResourceLookupCacheURLs
introduced by jdk8u40
* Makefile.am:
(ICEDTEA_PATCHES): Add PR2775 patch.
* NEWS: Updated.
2015-12-22 Xerxes R?nby <xerxes at gudinna.com>
PR2775: JamVM lacks JVM_GetResourceLookupCacheURLs
introduced by jdk8u40
* patches/jamvm/pr2775-cache_api.patch:
Provide a minimal implementation of the lookup
cache API which basically says we don't implement it.
changeset 226896a30232 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=226896a30232
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 05:29:22 2016 +0100
PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays:
Assertion `dest && result && x.any && y.any' failed
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/cacao/pr2832-refactoring_error.patch:
Backport of refactoring fix from
https://bitbucket.org/Ringdingcoder/cacao-staging
diffstat:
AUTHORS | 3 +-
ChangeLog | 85 +++++++++++++++++++++
Makefile.am | 62 +++------------
NEWS | 6 +
acinclude.m4 | 20 -----
configure.ac | 4 -
javac.in | 9 +-
patches/cacao/pr2035-tempdir.patch | 45 +++++++++++
patches/cacao/pr2776-cache_api.patch | 54 +++++++++++++
patches/cacao/pr2832-refactoring_error.patch | 107 +++++++++++++++++++++++++++
patches/jamvm/pr2775-cache_api.patch | 54 +++++++++++++
11 files changed, 368 insertions(+), 81 deletions(-)
diffs (truncated from 641 to 500 lines):
diff -r 5b874b8529b9 -r 226896a30232 AUTHORS
--- a/AUTHORS Fri Apr 01 03:10:31 2016 +0100
+++ b/AUTHORS Fri Apr 01 05:29:22 2016 +0100
@@ -8,6 +8,7 @@
Deepak Bhole <dbhole at redhat.com>
Tom Callaway <tcallawa at redhat.com>
Pablo del Campo <pablogdc at gmail.com>
+James Le Cuirot <chewi at gentoo.org>
Tiago Sturmer Daitx <tdaitx at linux.vnet.ibm.com>
Thomas Fitzsimmons <fitzsim at redhat.com>
Matthew Flaschen <matthew.flaschen at gatech.edu>
@@ -15,7 +16,7 @@
Kyle Galloway <kgallowa at redhat.com>
Dennis Gilmore <dgilmore at redhat.com>
Andrew Haley <aph at redhat.com>
-Andrew John Hughes <gnu_andrew at member.fsf.org, ahughes at redhat.com>
+Andrew John Hughes <gnu_andrew at member.fsf.org, gnu.andrew at redhat.com>
Tomas Hurka <tomas.hurka at sun.com>
Ioana Ivan <iivan at redhat.com>
Matthias Klose <doko at ubuntu.com>
diff -r 5b874b8529b9 -r 226896a30232 ChangeLog
--- a/ChangeLog Fri Apr 01 03:10:31 2016 +0100
+++ b/ChangeLog Fri Apr 01 05:29:22 2016 +0100
@@ -1,3 +1,88 @@
+2016-03-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays:
+ Assertion `dest && result && x.any && y.any' failed
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/cacao/pr2832-refactoring_error.patch:
+ Backport of refactoring fix from
+ https://bitbucket.org/Ringdingcoder/cacao-staging
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2775: JamVM lacks JVM_GetResourceLookupCacheURLs
+ introduced by jdk8u40
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add PR2775 patch.
+ * NEWS: Updated.
+
+2015-12-22 Xerxes RÃ¥nby <xerxes at gudinna.com>
+
+ PR2775: JamVM lacks JVM_GetResourceLookupCacheURLs
+ introduced by jdk8u40
+ * patches/jamvm/pr2775-cache_api.patch:
+ Provide a minimal implementation of the lookup
+ cache API which basically says we don't implement it.
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs
+ introduced by jdk8u40
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add CACAO patch for PR2776.
+ * NEWS: Updated.
+ * patches/cacao/pr2776-cache_api.patch:
+ Provide a minimal implementation of the lookup
+ cache API which basically says we don't implement it.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2035: --enable-cacao builds broken, missing
+ JVM_GetTemporaryDirectory impl.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add CACAO patch for PR2035.
+ * NEWS: Updated.
+ * patches/cacao/pr2035-tempdir.patch:
+ Implement JVM_GetTemporaryDirectory.
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2863: IcedTea doesn't pass through build
+ and host triplets to OpenJDK's configure
+ * AUTHORS: Add James and update my e-mail
+ address.
+ * NEWS: Updated.
+
+2016-02-28 James Le Cuirot <chewi at gentoo.org>
+
+ PR2863: IcedTea doesn't pass through build
+ and host triplets to OpenJDK's configure
+ * Makefile.am:
+ (ICEDTEA_CONFIGURE): Pass build_triplet
+ and host_triplet through to OpenJDK.
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2766: Remove all references to GCJ
+ * Makefile.am:
+ Remove dead commented out lines.
+ (ICEDTEA_BOOTSTRAP_CLASSES): Remove unused variable.
+ (clean-local): Remove clean-native-ecj.
+ (native-ecj): Removed.
+ (clean-native-ecj): Likewise.
+ (bootstrap-directory-stage1): Remove dependency on
+ native-ecj.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_WITH_GCJ): Removed.
+ (IT_CHECK_FOR_JDK): Remove unused GCJ_VMS variable.
+ * configure.ac:
+ Don't invoke IT_WITH_GCJ or search for gcj.
+ * javac.in:
+ Update bootstrap classpath. Remove attempt to
+ use native-ecj.
+
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2547: Extend tarball checksumming option to
diff -r 5b874b8529b9 -r 226896a30232 Makefile.am
--- a/Makefile.am Fri Apr 01 03:10:31 2016 +0100
+++ b/Makefile.am Fri Apr 01 05:29:22 2016 +0100
@@ -93,13 +93,6 @@
CACERTS_FILE = \
`if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi`
-# Sources used from OpenJDK.
-#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
-#PR48033 - Missing javax.management.remote.JMXServiceURL
-#PR48034 - javax.management.modelmbean.ModelMBeanInfo
-#PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure
-ICEDTEA_BOOTSTRAP_CLASSES =
-
# Settings for javac
IT_LANGUAGE_SOURCE_VERSION=6
@@ -354,7 +347,10 @@
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
patches/cacao/pr2032.patch \
- patches/cacao/pr2349.patch
+ patches/cacao/pr2035-tempdir.patch \
+ patches/cacao/pr2349.patch \
+ patches/cacao/pr2776-cache_api.patch \
+ patches/cacao/pr2832-refactoring_error.patch
else
if USING_CACAO
ICEDTEA_PATCHES +=
@@ -370,7 +366,8 @@
ICEDTEA_PATCHES += \
patches/jamvm/find_class_from_caller.patch \
patches/jamvm/pr2034-tempdir.patch \
- patches/jamvm/noexecstack.patch
+ patches/jamvm/noexecstack.patch \
+ patches/jamvm/pr2775-cache_api.patch
endif
if !ENABLE_SUNEC
@@ -414,6 +411,8 @@
endif
ICEDTEA_CONFIGURE = \
+ --build=$(build_triplet) \
+ --host=$(host_triplet) \
--enable-unlimited-crypto \
--with-cacerts-file=$(CACERTS_FILE) \
--with-stdc++lib=dynamic \
@@ -560,19 +559,6 @@
LCMS_CFLAGS="${LCMS2_CFLAGS}"
endif
-# Dropped for new build
-# ALT_JDK_IMPORT_PATH="$(BOOT_DIR)"
-# ANT="$(ANT)"
-# ALT_BOOTDIR="$(BOOT_DIR)"
-# BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)"
-# ICEDTEA_RT="$(RUNTIME)"
-# FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)"
-# FT2_LIB="$(FREETYPE2_LIBS)"
-# ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)"
-# HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)"
-# ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
-# ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)"
-
if ENABLE_JAR_COMPRESSION
ICEDTEA_ENV += \
COMPRESS_JARS="true"
@@ -610,13 +596,6 @@
JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
DISABLE_NIMBUS="true"
-# Dropped for new build
-# BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)"
-# BOOTCLASSPATH_CLS="-bootclasspath $(CLS_DIR_BOOT)"
-# BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)"
-# ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)"
-# XSLT="$(XSLTPROC)"
-
# Source files
JTREG_SRCS = $(top_srcdir)/test/jtreg/com/sun/javatest/cof/i18n.properties \
@@ -727,10 +706,10 @@
clean-icedtea clean-icedtea-debug clean-icedtea-boot clean-clone clean-clone-boot \
clean-bootstrap-directory-stage1 clean-bootstrap-directory-stage2 \
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
- clean-extract clean-native-ecj clean-icedtea-stage2 \
- clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
- clean-add-cacao clean-add-cacao-debug clean-cryptocheck clean-ecccheck \
- clean-policytool- at JAVA_VER@.desktop clean-jconsole- at JAVA_VER@.desktop
+ clean-extract clean-icedtea-stage2 clean-icedtea-debug-stage2 clean-icedtea-stage1 \
+ clean-add-zero clean-add-zero-debug clean-add-cacao clean-add-cacao-debug \
+ clean-cryptocheck clean-ecccheck clean-policytool- at JAVA_VER@.desktop \
+ clean-jconsole- at JAVA_VER@.desktop
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -1723,21 +1702,8 @@
# Bootstrap Directory Targets
# ===========================
-# Optional native ecj
-stamps/native-ecj.stamp:
- mkdir -p stamps
-if BUILD_NATIVE_ECJ
- ${GCJ} $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
-endif
- touch $@
-
-clean-native-ecj:
- rm -f native-ecj
- rm -rf stamps/native-ecj.stamp
-
# bootstrap/stage1
-stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp
+stamps/bootstrap-directory-stage1.stamp:
mkdir -p $(STAGE1_BOOT_DIR)/bin stamps/
ln -sf $(JAVA) $(STAGE1_BOOT_DIR)/bin/java
ln -sf ../../../javah $(STAGE1_BOOT_DIR)/bin/javah
@@ -3057,8 +3023,6 @@
jtreg: stamps/jtreg.stamp
-native-ecj: stamps/native-ecj.stamp
-
overlay: stamps/overlay.stamp
patch: stamps/patch.stamp
diff -r 5b874b8529b9 -r 226896a30232 NEWS
--- a/NEWS Fri Apr 01 03:10:31 2016 +0100
+++ b/NEWS Fri Apr 01 05:29:22 2016 +0100
@@ -138,6 +138,7 @@
- PR2738: java.lang.UnsatisfiedLinkError: no javalcms in java.library.path
- PR2743: Remove bad AArch64 merge fragment
- PR2759: LCMS library should be named javalcms, not lcms, to avoid potential conflicts with the system library
+ - PR2766: Remove all references to GCJ
- PR2767: Remove remaining rogue binaries from OpenJDK tree
- PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed
- PR2777: Fix MAX/MIN template usage on s390
@@ -153,6 +154,7 @@
- PR2853: Remove some unnecessary divergences from jdk8u.
- PR2853: Revert AArch64 jvm.cfg divergence
- PR2853: Revert changes to libpng source code now 8078245 is in place.
+ - PR2863: IcedTea doesn't pass through build and host triplets to OpenJDK's configure
- PR2865: Handle uninstallation.
- PR2873: Fix make distcheck.
- PR2880: Add missing test directory in make check.
@@ -191,9 +193,11 @@
- PR2034: --enable-jamvm builds broken, missing JVM_GetTemporaryDirectory impl
- PR2336: JamVM lacks JVM_FindClassFromCaller
- PR2523: Add executable stack markings to callNative.S on JamVM
+ - PR2775: JamVM lacks JVM_GetResourceLookupCacheURLs introduced by jdk8u40
* CACAO
- PR1277: Synchronise CACAO rules between IcedTea6/7/8 where possible
- PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible
+ - PR2035: --enable-cacao builds broken, missing JVM_GetTemporaryDirectory impl.
- CA172, PR2330, G453612: Add ARM hardfloat support to CACAO on Gentoo
- PR2331: IcedTea8 fails to build with IcedTea7 CACAO due to low max heap size
- PR2335: CACAO lacks JVM_FindClassFromCaller
@@ -202,6 +206,8 @@
- PR2350: Update to latest CACAO
- PR2354: stamps/cacao.stamp tries to touch a file in a directory which doesn't exist
- PR2355: CACAO build fails to use JRE layout
+ - PR2776: CACAO lacks JVM_GetResourceLookupCacheURLs introduced by jdk8u40
+ - PR2832, CA195: typeinfo.cpp: typeinfo_merge_nonarrays: Assertion `dest && result && x.any && y.any' failed
New in release 2.6.3 (2015-11-13):
diff -r 5b874b8529b9 -r 226896a30232 acinclude.m4
--- a/acinclude.m4 Fri Apr 01 03:10:31 2016 +0100
+++ b/acinclude.m4 Fri Apr 01 05:29:22 2016 +0100
@@ -841,25 +841,6 @@
AC_SUBST(VERSION_SUFFIX, $version_suffix)
])
-AC_DEFUN([IT_WITH_GCJ],
-[
- AC_MSG_CHECKING([whether to compile ecj natively])
- AC_ARG_WITH([gcj],
- [AS_HELP_STRING([--with-gcj[[=PATH]]],location of gcj for natively compiling ecj)],
- [
- GCJ="${withval}"
- ],
- [
- GCJ="no"
- ])
- AC_MSG_RESULT([${GCJ}])
- if test "x${GCJ}" = xyes; then
- AC_PATH_TOOL([GCJ],[gcj])
- fi
- AM_CONDITIONAL([BUILD_NATIVE_ECJ], test x"${GCJ}" != xno)
- AC_SUBST([GCJ])
-])
-
AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
[
DEFAULT_BUILD="default"
@@ -1070,7 +1051,6 @@
if test -z "${SYSTEM_JDK_DIR}"; then
AC_MSG_RESULT([not specified])
if test "x${enable_bootstrap}" = "xyes"; then
- GCJ_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk";
BOOTSTRAP_VMS="/usr/lib/jvm/cacao";
fi
ICEDTEA7_VMS="/usr/lib/jvm/icedtea-7 /usr/lib/jvm/icedtea7 /usr/lib/jvm/java-1.7.0-openjdk
diff -r 5b874b8529b9 -r 226896a30232 configure.ac
--- a/configure.ac Fri Apr 01 03:10:31 2016 +0100
+++ b/configure.ac Fri Apr 01 05:29:22 2016 +0100
@@ -48,7 +48,6 @@
IT_OBTAIN_HG_REVISIONS
AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
IT_CHECK_FOR_RMDIR
-IT_WITH_GCJ
IT_WITH_HOTSPOT_BUILD
AC_PATH_TOOL([LINUX32],[linux32])
IT_CHECK_GCC_VERSION
@@ -143,9 +142,6 @@
AC_SUBST([HG])
IT_WITH_HG_REVISION
-AC_PATH_TOOL([GCJ],[gcj])
-AC_SUBST([GCJ])
-
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR("CUPS headers were not found -
diff -r 5b874b8529b9 -r 226896a30232 javac.in
--- a/javac.in Fri Apr 01 03:10:31 2016 +0100
+++ b/javac.in Fri Apr 01 05:29:22 2016 +0100
@@ -18,7 +18,7 @@
}
my @bcoption;
-push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
+push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.7.0/jre/lib/rt.jar'
unless grep {$_ eq '-bootclasspath'} @ARGV;
my @ecj_parms = ($ECJ_WARNINGS, @bcoption);
my @javac_parms = ($JAVAC_WARNINGS, '-Xprefer:source',
@@ -54,12 +54,7 @@
return @new_args;
}
-if ( -e "@abs_top_builddir@/native-ecj" )
-{
- my @ecj_args = gen_ecj_opts( \@ARGV );
- exec '@abs_top_builddir@/native-ecj', @ecj_parms, @ecj_args ;
-}
-elsif ( -e "@JAVAC@" )
+if ( -e "@JAVAC@" )
{
if ("@USING_ECJ@" eq "yes")
{
diff -r 5b874b8529b9 -r 226896a30232 patches/cacao/pr2035-tempdir.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2035-tempdir.patch Fri Apr 01 05:29:22 2016 +0100
@@ -0,0 +1,45 @@
+diff -r 73c53a02de5d contrib/mapfile-vers-product
+--- cacao/cacao/contrib/mapfile-vers-product Mon Jul 13 01:38:19 2015 +0100
++++ cacao/cacao/contrib/mapfile-vers-product Mon Jul 13 10:44:59 2015 +0100
+@@ -161,6 +161,7 @@
+ JVM_GetStackTraceElement;
+ JVM_GetSystemPackage;
+ JVM_GetSystemPackages;
++ JVM_GetTemporaryDirectory;
+ JVM_GetThreadStateNames;
+ JVM_GetThreadStateValues;
+ JVM_GetVersionInfo;
+diff -r 73c53a02de5d src/native/vm/openjdk/jvm.cpp
+--- cacao.orig/cacao/src/native/vm/openjdk/jvm.cpp Mon Jul 13 01:38:19 2015 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp Mon Jul 13 10:21:20 2015 +0100
+@@ -3821,6 +3821,30 @@
+ return -1;
+ }
+
++/*
++ * Return the temporary directory that the VM uses for the attach
++ * and perf data files.
++ *
++ * It is important that this directory is well-known and the
++ * same for all VM instances. It cannot be affected by configuration
++ * variables such as java.io.tmpdir.
++ */
++jstring JVM_GetTemporaryDirectory(JNIEnv *env)
++{
++ TRACEJVMCALLS(("JVM_GetTemporaryDirectory(env=%p)", env));
++
++#if (defined(__LINUX__) || defined (__SOLARIS__) || \
++ defined(__FREEBSD__) || defined (__DARWIN__))
++ // This must be hard coded because it's the system's temporary
++ // directory not the java application's temp directory, ala java.io.tmpdir.
++ return JavaString::from_utf8("/tmp");
++#else
++# error Not implemented for this OS.
++#endif
++
++ return NULL;
++}
++
+ } // extern "C"
+
+
diff -r 5b874b8529b9 -r 226896a30232 patches/cacao/pr2776-cache_api.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2776-cache_api.patch Fri Apr 01 05:29:22 2016 +0100
@@ -0,0 +1,54 @@
+--- cacao/cacao/src/native/vm/openjdk/jvm.cpp.old 2016-04-01 04:20:21.912052101 +0100
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2016-04-01 04:50:05.054102464 +0100
+@@ -3882,6 +3882,32 @@
+
+ return NULL;
+ }
++/* JVM_GetResourceLookupCacheURLs */
++
++jobjectArray JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader)
++{
++ TRACEJVMCALLS(("JVM_GetResourceLookupCacheURLs(env=%p, loader=%p)", env, loader));
++
++ return NULL; // tell OpenJDK 8 that the lookup cache API is unavailable
++}
++
++/* JVM_GetResourceLookupCache */
++
++jintArray JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name)
++{
++ TRACEJVMCALLS(("JVM_GetResourceLookupCacheURLs(env=%p, loader=%p, resource_name=%s)", env, loader, resource_name));
++
++ return NULL; // tell OpenJDK 8 that the lookup cache API is unavailable
++}
++
++/* JVM_GetResourceLookupCache */
++
++jboolean JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname)
++{
++ TRACEJVMCALLS(("JVM_GetResourceLookupCacheURLs(env=%p, loader=%p, classname=%s)", env, loader, classname));
++
++ return JNI_FALSE; // tell OpenJDK 8 we don't know whether it exists or not
++}
+
+ } // extern "C"
+
+--- cacao/cacao/contrib/mapfile-vers-product.old 2016-04-01 04:20:21.884052574 +0100
++++ cacao/cacao/contrib/mapfile-vers-product 2016-04-01 04:38:09.502110743 +0100
+@@ -153,6 +153,8 @@
+ JVM_GetMethodIxNameUTF;
+ JVM_GetMethodIxSignatureUTF;
+ JVM_GetMethodParameterAnnotations;
++ JVM_GetResourceLookupCacheURLs;
++ JVM_GetResourceLookupCache;
+ JVM_GetPrimitiveArrayElement;
+ JVM_GetProtectionDomain;
+ JVM_GetSockName;
+@@ -186,6 +188,7 @@
+ JVM_IsSilentCompiler;
+ JVM_IsSupportedJNIVersion;
+ JVM_IsThreadAlive;
++ JVM_KnownToNotExist;
+ JVM_LatestUserDefinedLoader;
+ JVM_Listen;
+ JVM_LoadClass0;
diff -r 5b874b8529b9 -r 226896a30232 patches/cacao/pr2832-refactoring_error.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2832-refactoring_error.patch Fri Apr 01 05:29:22 2016 +0100
@@ -0,0 +1,107 @@
+# HG changeset patch
+# User Stefan Ring <stefan at complang.tuwien.ac.at>
+# Date 1453933756 -3600
+# Node ID 4982d429274b9498ad2629ea4f28566ed69e4775
+# Parent 1cef439b53ee701662059ae50874d55c7b5302d7
+PR195: Fix some oversights during a large macro cleanup in 1e9787c3484e
+
+diff --git cacao/cacao/src/vm/jit/verify/typecheck-common.cpp cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+--- cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
++++ cacao/cacao/src/vm/jit/verify/typecheck-common.cpp
+@@ -281,7 +281,7 @@
+
+ dv->type = sv->type;
+ if (dv->type == TYPE_ADR) {
+- dv->typeinfo = sv->typeinfo;
++ typeinfo_t::clone(sv->typeinfo, dv->typeinfo);
+ }
+ }
+ return true;
+diff --git cacao/cacao/src/vm/jit/verify/typeinfo.cpp cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+--- cacao/cacao/src/vm/jit/verify/typeinfo.cpp
++++ cacao/cacao/src/vm/jit/verify/typeinfo.cpp
+@@ -1674,6 +1674,7 @@
+ classref_or_classinfo common;
More information about the distro-pkg-dev
mailing list