/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 13 02:30:20 UTC 2015
changeset 7283a59ba41b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7283a59ba41b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue May 12 20:27:44 2015 +0100
PR2347: Fix CACAO patches to apply again
2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2347: Fix CACAO patches to apply again
* patches/cacao/memory.patch:
Removed; needs a complete rewrite
if still required.
* Makefile.am:
(ICEDTEA_PATCHES): Drop CACAO memory
patch.
* NEWS: Updated.
* patches/cacao/launcher.patch:
Regenerated.
changeset 2db89ffae8b6 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2db89ffae8b6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue May 12 23:16:36 2015 +0100
PR2348: Avoid following symlinks for CACAO and JamVM patches
2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2348: Avoid following symlinks for CACAO
and JamVM patches
* Makefile.am:
(extract-cacao): Move extracted directory
to cacao/cacao and create version-specific
symlink.
(extract-jamvm): Likewise but for jamvm/jamvm.
* NEWS: Updated.
changeset 1363365ca66b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1363365ca66b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed May 13 03:29:48 2015 +0100
PR2350: Update to latest CACAO
2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2350: Update to latest CACAO
* patches/cacao/armhf.patch:
Removed; upstream in updated CACAO.
* Makefile.am:
(CACAO_VERSION): Bump to c182f119eaad,
the latest tip.
(CACAO_SRC_ZIP): Change suffix to xz.
(CACAO_URL): Reuse CACAO_SRC_ZIP.
(ICEDTEA_PATCHES): Drop armhf patch.
(extract-cacao): Drop compression specification.
(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.
diffstat:
ChangeLog | 45 +++++++++++++++++++++++
Makefile.am | 24 +++++------
NEWS | 5 ++-
patches/cacao/armhf.patch | 12 ------
patches/cacao/launcher.patch | 15 ++++---
patches/cacao/memory.patch | 86 --------------------------------------------
patches/cacao/pr2032.patch | 39 +++++++++----------
7 files changed, 86 insertions(+), 140 deletions(-)
diffs (344 lines):
diff -r 9b78b50a6207 -r 1363365ca66b ChangeLog
--- a/ChangeLog Tue May 12 03:16:51 2015 +0100
+++ b/ChangeLog Wed May 13 03:29:48 2015 +0100
@@ -1,3 +1,48 @@
+2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2350: Update to latest CACAO
+ * patches/cacao/armhf.patch:
+ Removed; upstream in updated CACAO.
+ * Makefile.am:
+ (CACAO_VERSION): Bump to c182f119eaad,
+ the latest tip.
+ (CACAO_SRC_ZIP): Change suffix to xz.
+ (CACAO_URL): Reuse CACAO_SRC_ZIP.
+ (ICEDTEA_PATCHES): Drop armhf patch.
+ (extract-cacao): Drop compression specification.
+ (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-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2348: Avoid following symlinks for CACAO
+ and JamVM patches
+ * Makefile.am:
+ (extract-cacao): Move extracted directory
+ to cacao/cacao and create version-specific
+ symlink.
+ (extract-jamvm): Likewise but for jamvm/jamvm.
+ * NEWS: Updated.
+
+2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2347: Fix CACAO patches to apply again
+ * patches/cacao/memory.patch:
+ Removed; needs a complete rewrite
+ if still required.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop CACAO memory
+ patch.
+ * NEWS: Updated.
+ * patches/cacao/launcher.patch:
+ Regenerated.
+
2015-05-12 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR1369: Remove outdated bootstrap configure tests
diff -r 9b78b50a6207 -r 1363365ca66b Makefile.am
--- a/Makefile.am Tue May 12 03:16:51 2015 +0100
+++ b/Makefile.am Wed May 13 03:29:48 2015 +0100
@@ -27,11 +27,11 @@
DROP_URL = http://icedtea.classpath.org/download/drops
-CACAO_VERSION = e215e36be9fc
-CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
+CACAO_VERSION = c182f119eaad
+CACAO_SHA256SUM = bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808
CACAO_BASE_URL = $(DROP_URL)/cacao
-CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
-CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.xz
+CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_SRC_ZIP)
JAMVM_VERSION = ec18fb9e49e62dce16c5094ef1527eed619463aa
JAMVM_SHA256SUM = 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc
@@ -221,13 +221,10 @@
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
- patches/cacao/memory.patch \
- patches/cacao/armhf.patch \
patches/cacao/pr2032.patch
else
if USING_CACAO
-ICEDTEA_PATCHES += \
- patches/cacao/memory.patch
+ICEDTEA_PATCHES +=
endif
endif
@@ -1064,11 +1061,10 @@
if ! test -d cacao/cacao ; \
then \
mkdir cacao ; \
- $(TAR) xzf $(CACAO_SRC_ZIP) -C cacao ; \
+ $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
dir=$$(basename cacao/cacao-*) ; \
- ln -s $$dir cacao/cacao ; \
- cd cacao/cacao ; \
- cd .. ; \
+ mv -v cacao/$$dir cacao/cacao ; \
+ ln -s cacao cacao/$$dir ; \
fi
endif
endif
@@ -1087,7 +1083,8 @@
mkdir jamvm ; \
$(TAR) xzf $(JAMVM_SRC_ZIP) -C jamvm ; \
dir=$$(basename jamvm/jamvm-*) ; \
- ln -s $$dir jamvm/jamvm ; \
+ mv -v jamvm/$$dir jamvm/jamvm ; \
+ ln -s jamvm jamvm/$$dir ; \
fi
endif
mkdir -p stamps
@@ -1908,6 +1905,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
mkdir -p $(abs_top_builddir)/cacao/install/lib
diff -r 9b78b50a6207 -r 1363365ca66b NEWS
--- a/NEWS Tue May 12 03:16:51 2015 +0100
+++ b/NEWS Wed May 13 03:29:48 2015 +0100
@@ -60,6 +60,7 @@
- PR2256: Add SystemTap tests
- PR2257: clean-extract-nashorn rule is never run
- PR2329: jamvm parallel unpack failures
+ - PR2348: Avoid following symlinks for CACAO and JamVM patches
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
@@ -98,7 +99,9 @@
- 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
-
+ - PR2347: Fix CACAO patches to apply again
+ - PR2350: Update to latest CACAO
+
New in release 2.0 (2011-XX-XX):
* JamVM
diff -r 9b78b50a6207 -r 1363365ca66b patches/cacao/armhf.patch
--- a/patches/cacao/armhf.patch Tue May 12 03:16:51 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- cacao/cacao/configure.ac
-+++ cacao/cacao/configure.ac
-@@ -50,7 +50,7 @@
- JAVA_ARCH="arm"
-
- case "$host" in
-- *-gnueabihf)
-+ *-hardfloat-*-gnueabi | *-gnueabihf)
- ARCH_FLAGS="$ARCH_FLAGS -D__ARMHF__"
- ;;
- esac
diff -r 9b78b50a6207 -r 1363365ca66b patches/cacao/launcher.patch
--- a/patches/cacao/launcher.patch Tue May 12 03:16:51 2015 +0100
+++ b/patches/cacao/launcher.patch Wed May 13 03:29:48 2015 +0100
@@ -1,15 +1,16 @@
---- openjdk/jdk/src/share/bin/java.c.orig 2010-09-07 05:24:49.307192201 +0200
-+++ openjdk/jdk/src/share/bin/java.c 2010-09-07 12:56:00.309691118 +0200
-@@ -174,6 +174,8 @@
- InvocationFunctions ifn;
- } JavaMainArgs;
+diff -r a5c3d9643077 src/share/bin/java.c
+--- openjdk/jdk/src/share/bin/java.c Tue Feb 10 16:24:28 2015 +0000
++++ openjdk/jdk/src/share/bin/java.c Tue May 12 16:53:03 2015 +0100
+@@ -168,6 +168,8 @@
+ static jlong maxHeapSize = 0; /* max heap size */
+ static jlong initialHeapSize = 0; /* inital heap size */
+#define JNI_VERSION_CACAO 0xcaca0000
+
/*
* Entry point.
*/
-@@ -1923,6 +1925,8 @@
+@@ -1996,6 +1998,8 @@
{ /* Create a new thread to create JVM and invoke main method */
JavaMainArgs args;
@@ -18,7 +19,7 @@
int rslt;
args.argc = argc;
-@@ -1931,7 +1935,17 @@
+@@ -2004,7 +2008,17 @@
args.what = what;
args.ifn = *ifn;
diff -r 9b78b50a6207 -r 1363365ca66b patches/cacao/memory.patch
--- a/patches/cacao/memory.patch Tue May 12 03:16:51 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-diff -Nru openjdk.orig/hotspot/make/bsd/makefiles/rules.make openjdk/hotspot/make/bsd/makefiles/rules.make
---- openjdk.orig/hotspot/make/bsd/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-+++ openjdk/hotspot/make/bsd/makefiles/rules.make 2012-06-12 10:50:20.974290246 +0100
-@@ -128,7 +128,7 @@
- # Settings for javac
- BOOT_SOURCE_LANGUAGE_VERSION = 6
- BOOT_TARGET_CLASS_VERSION = 6
--JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
- 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 -Nru openjdk.orig/hotspot/make/linux/makefiles/rules.make openjdk/hotspot/make/linux/makefiles/rules.make
---- openjdk.orig/hotspot/make/linux/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
-@@ -128,7 +128,7 @@
- # Settings for javac
- BOOT_SOURCE_LANGUAGE_VERSION = 6
- BOOT_TARGET_CLASS_VERSION = 6
--JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
- 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 -Nru openjdk.orig/hotspot/make/solaris/makefiles/rules.make openjdk/hotspot/make/solaris/makefiles/rules.make
---- openjdk.orig/hotspot/make/solaris/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-+++ openjdk/hotspot/make/solaris/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
-@@ -120,7 +120,7 @@
- # Settings for javac
- BOOT_SOURCE_LANGUAGE_VERSION = 6
- BOOT_TARGET_CLASS_VERSION = 6
--JAVAC_FLAGS = -g -encoding ascii
-+JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
- 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 -Nru openjdk.orig/hotspot/make/windows/makefiles/rules.make openjdk/hotspot/make/windows/makefiles/rules.make
---- openjdk.orig/hotspot/make/windows/makefiles/rules.make 2012-06-08 17:13:09.000000000 +0100
-+++ openjdk/hotspot/make/windows/makefiles/rules.make 2012-06-12 10:50:20.982290377 +0100
-@@ -45,7 +45,7 @@
- # Settings for javac
- BOOT_SOURCE_LANGUAGE_VERSION=6
- BOOT_TARGET_CLASS_VERSION=6
--JAVAC_FLAGS=-g -encoding ascii
-+JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
- BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-
- ProjectFile=jvm.vcproj
-diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2012-06-08 17:12:17.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Platform.gmk 2012-06-12 10:50:20.982290377 +0100
-@@ -537,7 +537,7 @@
- else \
- echo "false"; \
- fi)
-- MAX_VM_MEMORY := 512
-+ MAX_VM_MEMORY := 1536
- 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 @@
- # NOTE: javadoc will not complete without these larger settings.
- # WARNING: This could cause thrashing on low memory machines.
- ifeq ($(ARCH_DATA_MODEL),64)
-- MAX_VM_MEMORY = 1536
-+ MAX_VM_MEMORY = 1792
- else ifeq ($(ARCH),universal)
-- MAX_VM_MEMORY = 1536
-+ MAX_VM_MEMORY = 1792
- else
- MAX_VM_MEMORY = 768
- endif
-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
-@@ -796,6 +796,7 @@
- <compilerarg value="-implicit:none"/>
- <compilerarg value="-Xprefer:source"/>
- <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
-+ <compilerarg value="-J-Xmx256M"/>
- <compilerarg line="@{bootclasspath.opt}"/>
- <compilerarg line="${javac.no.jdk.warnings}"/>
- <compilerarg line="${javac.version.opt}"/>
diff -r 9b78b50a6207 -r 1363365ca66b patches/cacao/pr2032.patch
--- a/patches/cacao/pr2032.patch Tue May 12 03:16:51 2015 +0100
+++ b/patches/cacao/pr2032.patch Wed May 13 03:29:48 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);
+}
+
+
More information about the distro-pkg-dev
mailing list