/hg/icedtea7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 13 14:13:13 UTC 2015
changeset d00dc752ed83 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d00dc752ed83
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jul 13 10:18:58 2015 +0100
PR2519: Update to latest CACAO
2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2519: Update to latest CACAO
* patches/cacao/armhf.patch:
Removed; upstream in updated CACAO.
* Makefile.am:
(CACAO_VERSION): Bump to c182f119eaad,
the latest tip.
(CACAO_SHA256SUM): Updated.
(CACAO_URL): Reuse CACAO_SRC_ZIP.
(ICEDTEA_PATCHES): Drop armhf patch.
(cacao); Pass --with-libatomic-ops=no as
CACAO won't build otherwise. This forces
its Boehm GC to use the internal version
of libatomic-ops.
* NEWS: Updated.
* patches/cacao/pr2032.patch:
Updated to work with latest CACAO, using
original version from PR2032.
changeset 139f2a8f085d in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=139f2a8f085d
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jul 13 11:10:03 2015 +0100
PR2520: --enable-cacao builds broken, missing JVM_GetTemporaryDirectory impl.
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2520: --enable-cacao builds broken, missing
JVM_GetTemporaryDirectory impl.
* Makefile.am:
(ICEDTEA_PATCHES): Add CACAO patch for PR2520.
* NEWS: Updated.
* patches/cacao/pr2520-tempdir.patch:
Implement JVM_GetTemporaryDirectory.
changeset e3ceb97f3089 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e3ceb97f3089
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jul 13 11:27:42 2015 +0100
PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
* AUTHORS: Add James.
* NEWS: Updated.
2015-05-23 James Le Cuirot <chewi at gentoo.org>
PR2380: Raise javadoc and JAVAC_FLAGS memory
limits for CACAO
* patches/boot/compile-for-7-cacao-mem.patch:
Increase memory limits so a build with CACAO
and doc generation succeeds.
* patches/cacao/memory.patch: Likewise.
changeset a3dbf73342b5 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=a3dbf73342b5
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jul 13 15:12:51 2015 +0100
PR2172: --enable-jamvm builds broken, missing JVM_GetTemporaryDirectory impl
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2172: --enable-jamvm builds broken, missing
JVM_GetTemporaryDirectory impl
* Makefile.am:
(ICEDTEA_PATCHES): Add PR2172 patch.
* NEWS: Updated.
* patches/jamvm/pr2172-tempdir.patch:
Implement JVM_GetTemporaryDirectory.
diffstat:
AUTHORS | 1 +
ChangeLog | 54 ++++++++++++++++++++++++++++++
Makefile.am | 14 ++++---
NEWS | 6 +++
patches/boot/compile-for-7-cacao-mem.patch | 6 +-
patches/cacao/memory.patch | 17 +++++---
patches/cacao/pr2032.patch | 39 ++++++++++-----------
patches/cacao/pr2520-tempdir.patch | 45 +++++++++++++++++++++++++
patches/jamvm/pr2172-tempdir.patch | 24 +++++++++++++
9 files changed, 169 insertions(+), 37 deletions(-)
diffs (372 lines):
diff -r 595492c5708c -r a3dbf73342b5 AUTHORS
--- a/AUTHORS Thu Jul 09 03:44:54 2015 +0100
+++ b/AUTHORS Mon Jul 13 15:12:51 2015 +0100
@@ -9,6 +9,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>
diff -r 595492c5708c -r a3dbf73342b5 ChangeLog
--- a/ChangeLog Thu Jul 09 03:44:54 2015 +0100
+++ b/ChangeLog Mon Jul 13 15:12:51 2015 +0100
@@ -1,3 +1,57 @@
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2172: --enable-jamvm builds broken, missing
+ JVM_GetTemporaryDirectory impl
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add PR2172 patch.
+ * NEWS: Updated.
+ * patches/jamvm/pr2172-tempdir.patch:
+ Implement JVM_GetTemporaryDirectory.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * AUTHORS: Add James.
+ * NEWS: Updated.
+
+2015-05-23 James Le Cuirot <chewi at gentoo.org>
+
+ PR2380: Raise javadoc and JAVAC_FLAGS memory
+ limits for CACAO
+ * patches/boot/compile-for-7-cacao-mem.patch:
+ Increase memory limits so a build with CACAO
+ and doc generation succeeds.
+ * patches/cacao/memory.patch: Likewise.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2520: --enable-cacao builds broken, missing
+ JVM_GetTemporaryDirectory impl.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add CACAO patch for PR2520.
+ * NEWS: Updated.
+ * patches/cacao/pr2520-tempdir.patch:
+ Implement JVM_GetTemporaryDirectory.
+
+2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2519: Update to latest CACAO
+ * patches/cacao/armhf.patch:
+ Removed; upstream in updated CACAO.
+ * Makefile.am:
+ (CACAO_VERSION): Bump to c182f119eaad,
+ the latest tip.
+ (CACAO_SHA256SUM): Updated.
+ (CACAO_URL): Reuse CACAO_SRC_ZIP.
+ (ICEDTEA_PATCHES): Drop armhf patch.
+ (cacao); Pass --with-libatomic-ops=no as
+ CACAO won't build otherwise. This forces
+ its Boehm GC to use the internal version
+ of libatomic-ops.
+ * NEWS: Updated.
+ * patches/cacao/pr2032.patch:
+ Updated to work with latest CACAO, using
+ original version from PR2032.
+
2015-07-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL:
diff -r 595492c5708c -r a3dbf73342b5 Makefile.am
--- a/Makefile.am Thu Jul 09 03:44:54 2015 +0100
+++ b/Makefile.am Mon Jul 13 15:12:51 2015 +0100
@@ -20,11 +20,11 @@
DROP_URL = http://icedtea.classpath.org/download/drops
-CACAO_VERSION = e215e36be9fc
-CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
+CACAO_VERSION = c182f119eaad
+CACAO_SHA256SUM = eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1
CACAO_BASE_URL = $(DROP_URL)/cacao
-CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
+CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_SRC_ZIP)
JAMVM_VERSION = ec18fb9e49e62dce16c5094ef1527eed619463aa
JAMVM_SHA256SUM = 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc
@@ -255,8 +255,8 @@
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
patches/cacao/memory.patch \
- patches/cacao/armhf.patch \
- patches/cacao/pr2032.patch
+ patches/cacao/pr2032.patch \
+ patches/cacao/pr2520-tempdir.patch
else
if USING_CACAO
ICEDTEA_PATCHES += \
@@ -271,7 +271,8 @@
if BUILD_JAMVM
ICEDTEA_PATCHES += \
- patches/jamvm/find_class_from_caller.patch
+ patches/jamvm/find_class_from_caller.patch \
+ patches/jamvm/pr2172-tempdir.patch
endif
if ENABLE_NSS
@@ -2361,6 +2362,7 @@
--with-java-runtime-library=openjdk7 \
--with-java-runtime-library-prefix=$(abs_top_builddir)/openjdk \
--with-java-runtime-library-classes=$(RUNTIME) \
+ --with-libatomic-ops=no \
--enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
ln -sf server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
diff -r 595492c5708c -r a3dbf73342b5 NEWS
--- a/NEWS Thu Jul 09 03:44:54 2015 +0100
+++ b/NEWS Mon Jul 13 15:12:51 2015 +0100
@@ -435,6 +435,12 @@
- PR2210: DGifCloseFile call should check the return value, not the error code, for failure
- PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc.
- PR2250: JSSE server is still limited to 768-bit DHE
+* CACAO
+ - PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO
+ - PR2519: Update to latest CACAO
+ - PR2520: --enable-cacao builds broken, missing JVM_GetTemporaryDirectory impl.
+* JamVM
+ - PR2172: --enable-jamvm builds broken, missing JVM_GetTemporaryDirectory impl
* ARM32 port
- PR2228: Add ARM32 JIT
- PR2297: Use the IcedTea 2.6.0 HotSpot on ARM32 by default
diff -r 595492c5708c -r a3dbf73342b5 patches/boot/compile-for-7-cacao-mem.patch
--- a/patches/boot/compile-for-7-cacao-mem.patch Thu Jul 09 03:44:54 2015 +0100
+++ b/patches/boot/compile-for-7-cacao-mem.patch Mon Jul 13 15:12:51 2015 +0100
@@ -9,7 +9,7 @@
-BOOT_TARGET_CLASS_VERSION = 6
+BOOT_SOURCE_LANGUAGE_VERSION = 7
+BOOT_TARGET_CLASS_VERSION = 7
- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
@@ -23,7 +23,7 @@
-BOOT_TARGET_CLASS_VERSION = 6
+BOOT_SOURCE_LANGUAGE_VERSION = 7
+BOOT_TARGET_CLASS_VERSION = 7
- JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
@@ -37,6 +37,6 @@
-BOOT_TARGET_CLASS_VERSION=6
+BOOT_SOURCE_LANGUAGE_VERSION=7
+BOOT_TARGET_CLASS_VERSION=7
- JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
diff -r 595492c5708c -r a3dbf73342b5 patches/cacao/memory.patch
--- a/patches/cacao/memory.patch Thu Jul 09 03:44:54 2015 +0100
+++ b/patches/cacao/memory.patch Mon Jul 13 15:12:51 2015 +0100
@@ -6,7 +6,7 @@
BOOT_SOURCE_LANGUAGE_VERSION = 6
BOOT_TARGET_CLASS_VERSION = 6
-JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
# With parallel makes, print a message at the end of compilation.
@@ -18,7 +18,7 @@
BOOT_SOURCE_LANGUAGE_VERSION = 6
BOOT_TARGET_CLASS_VERSION = 6
-JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
# With parallel makes, print a message at the end of compilation.
@@ -30,7 +30,7 @@
BOOT_SOURCE_LANGUAGE_VERSION=6
BOOT_TARGET_CLASS_VERSION=6
-JAVAC_FLAGS=-g -encoding ascii
-+JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
++JAVAC_FLAGS=-g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
ProjectFile=jvm.vcproj
@@ -42,14 +42,14 @@
echo "false"; \
fi)
- MAX_VM_MEMORY := 512
-+ MAX_VM_MEMORY := 1536
++ MAX_VM_MEMORY := 1792
MIN_VM_MEMORY := $(MAX_VM_MEMORY)
else
MB_OF_MEMORY := unknown
diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
--- openjdk.orig/jdk/make/docs/Makefile 2012-06-08 17:12:17.000000000 +0100
+++ openjdk/jdk/make/docs/Makefile 2012-06-12 11:09:31.616702981 +0100
-@@ -69,9 +69,9 @@
+@@ -69,11 +69,11 @@
# NOTE: javadoc will not complete without these larger settings.
# WARNING: This could cause thrashing on low memory machines.
ifeq ($(ARCH_DATA_MODEL),64)
@@ -59,8 +59,11 @@
- MAX_VM_MEMORY = 1536
+ MAX_VM_MEMORY = 1792
else
- MAX_VM_MEMORY = 768
+- MAX_VM_MEMORY = 768
++ MAX_VM_MEMORY = 2048
endif
+
+ # List of all possible directories for javadoc to look for sources
diff -Nru openjdk.orig/langtools/make/build.xml openjdk/langtools/make/build.xml
--- openjdk.orig/langtools/make/build.xml 2012-06-08 17:12:36.000000000 +0100
+++ openjdk/langtools/make/build.xml 2012-06-12 10:50:20.974290246 +0100
@@ -80,7 +83,7 @@
BOOT_SOURCE_LANGUAGE_VERSION = 6
BOOT_TARGET_CLASS_VERSION = 6
-JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
++JAVAC_FLAGS = -g -encoding ascii -J-Xmx512m
BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
# With parallel makes, print a message at the end of compilation.
diff -r 595492c5708c -r a3dbf73342b5 patches/cacao/pr2032.patch
--- a/patches/cacao/pr2032.patch Thu Jul 09 03:44:54 2015 +0100
+++ b/patches/cacao/pr2032.patch Mon Jul 13 15:12:51 2015 +0100
@@ -22,9 +22,10 @@
JVM_FindClassFromClass;
JVM_FindClassFromClassLoader;
JVM_FindLibraryEntry;
---- cacao/cacao/src/native/vm/openjdk/jvm.cpp.orig 2014-10-29 16:40:30.732305204 +0000
-+++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2014-10-29 16:44:06.643292016 +0000
-@@ -684,6 +684,48 @@
+diff --git a/src/native/vm/openjdk/jvm.cpp b/src/native/vm/openjdk/jvm.cpp
+--- cacao/cacao/src/native/vm/openjdk/jvm.cpp
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp
+@@ -655,6 +655,44 @@
}
@@ -43,30 +44,26 @@
+
+jclass JVM_FindClassFromCaller(JNIEnv* env, const char* name, jboolean init, jobject loader, jclass caller)
+{
-+ classinfo *c;
-+ utf *u;
-+ classloader_t *cl;
++ TRACEJVMCALLS(("JVM_FindClassFromCaller(name=%s, init=%d, loader=%p, caller=%p)", name, init, loader, caller));
+
-+ TRACEJVMCALLS(("JVM_FindClassFromCaller(name=%s, init=%d, loader=%p, caller=%p)", name, init, loader, caller));
++ Utf8String u = Utf8String::from_utf8(name);
++ classloader_t *cl = loader_hashtable_classloader_add((java_handle_t *) loader);
+
-+ u = utf_new_char(name);
-+ cl = loader_hashtable_classloader_add((java_handle_t *) loader);
++ /* XXX The caller's protection domain should be used during
++ the load_class_from_classloader but there is no specification or
++ unit-test in OpenJDK documenting the desired effect */
+
-+ /* XXX The caller's protection domain should be used during
-+ the load_class_from_classloader but there is no specification or
-+ unit-test in OpenJDK documenting the desired effect */
++ classinfo *c = load_class_from_classloader(u, cl);
+
-+ c = load_class_from_classloader(u, cl);
++ if (c == NULL)
++ return NULL;
+
-+ if (c == NULL)
-+ return NULL;
++ if (init)
++ if (!(c->state & CLASS_INITIALIZED))
++ if (!initialize_class(c))
++ return NULL;
+
-+ if (init)
-+ if (!(c->state & CLASS_INITIALIZED))
-+ if (!initialize_class(c))
-+ return NULL;
-+
-+ return (jclass) LLNI_classinfo_wrap(c);
++ return (jclass) LLNI_classinfo_wrap(c);
+}
+
+
diff -r 595492c5708c -r a3dbf73342b5 patches/cacao/pr2520-tempdir.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2520-tempdir.patch Mon Jul 13 15:12:51 2015 +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 595492c5708c -r a3dbf73342b5 patches/jamvm/pr2172-tempdir.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/pr2172-tempdir.patch Mon Jul 13 15:12:51 2015 +0100
@@ -0,0 +1,24 @@
+diff --git a/src/classlib/openjdk/jvm.c b/src/classlib/openjdk/jvm.c
+index 971ac75..b5f4cae 100644
+--- jamvm.old/jamvm/src/classlib/openjdk/jvm.c
++++ jamvm/jamvm/src/classlib/openjdk/jvm.c
+@@ -3038,3 +3038,19 @@ jint JVM_FindSignal(const char *name) {
+
+ return signals[i].number;
+ }
++
++/* JVM_GetTemporaryDirectory
++ * 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) {
++ TRACE("JVM_GetTemporaryDirectory(env=%p)", env);
++
++// 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 createString("/tmp");
++}
More information about the distro-pkg-dev
mailing list