/hg/icedtea: 2013-04-11 Xerxes Ranby <xerxes at zafena.se>
xranby at icedtea.classpath.org
xranby at icedtea.classpath.org
Fri Apr 12 05:12:14 PDT 2013
changeset de5854f8197d in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=de5854f8197d
author: Xerxes Ranby <xerxes at zafena.se>
date: Fri Apr 12 17:08:21 2013 +0200
2013-04-11 Xerxes Ranby <xerxes at zafena.se>
JamVM
- JSR 292: Invoke Dynamic
- JSR 308: Type Annotations
- JEP 171: Implement fence methods in sun.misc.Unsafe
- Set anonymous class protection domain
- Dummy implementation of sun.misc.Perf natives
* NEWS: Updated.
* Makefile.am
(JAMVM_VERSION): Updated JamVM to 2013-04-04 revision.
(JAMVM_SHA256SUM): Updated.
(BUILD_JAMVM): ICEDTEA_PATCHES remove use of
remove-sun.misc.Perf-debug-code.patch
(ENABLE_JAMVM): Use ICEDTEA_CONFIGURE --with-import-hotspot
in compliance with the OpenJDK 8 build scrips.
(ENABLE_CACAO): Likewise.
(stamps/jamvm.stamp): Use --with-java-runtime-library=openjdk8
(stamps/jamvm.stamp): OpenJDK 8 --with-import-hotspot checks
for both lib and jre/lib. mkdir -p of the missing
lib dir in order to pass the sanity test.
(stamps/cacao.stamp): Likewise.
* patches/jamvm/remove-sun.misc.Perf-debug-code.patch: Removed.
diffstat:
ChangeLog | 24 ++++++++++
Makefile.am | 21 ++++-----
NEWS | 6 ++
patches/jamvm/remove-sun.misc.Perf-debug-code.patch | 47 ---------------------
4 files changed, 39 insertions(+), 59 deletions(-)
diffs (163 lines):
diff -r 53f6588f92fb -r de5854f8197d ChangeLog
--- a/ChangeLog Tue Apr 02 22:15:37 2013 +0100
+++ b/ChangeLog Fri Apr 12 17:08:21 2013 +0200
@@ -1,3 +1,27 @@
+2013-04-11 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ JamVM
+ - JSR 292: Invoke Dynamic
+ - JSR 308: Type Annotations
+ - JEP 171: Implement fence methods in sun.misc.Unsafe
+ - Set anonymous class protection domain
+ - Dummy implementation of sun.misc.Perf natives
+ * NEWS: Updated.
+ * Makefile.am
+ (JAMVM_VERSION): Updated JamVM to 2013-04-04 revision.
+ (JAMVM_SHA256SUM): Updated.
+ (BUILD_JAMVM): ICEDTEA_PATCHES remove use of
+ remove-sun.misc.Perf-debug-code.patch
+ (ENABLE_JAMVM): Use ICEDTEA_CONFIGURE --with-import-hotspot
+ in compliance with the OpenJDK 8 build scrips.
+ (ENABLE_CACAO): Likewise.
+ (stamps/jamvm.stamp): Use --with-java-runtime-library=openjdk8
+ (stamps/jamvm.stamp): OpenJDK 8 --with-import-hotspot checks
+ for both lib and jre/lib. mkdir -p of the missing
+ lib dir in order to pass the sanity test.
+ (stamps/cacao.stamp): Likewise.
+ * patches/jamvm/remove-sun.misc.Perf-debug-code.patch: Removed.
+
2013-04-02 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 53f6588f92fb -r de5854f8197d Makefile.am
--- a/Makefile.am Tue Apr 02 22:15:37 2013 +0100
+++ b/Makefile.am Fri Apr 12 17:08:21 2013 +0200
@@ -26,8 +26,8 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-JAMVM_VERSION = 4617da717ecb05654ea5bb9572338061106a414d
-JAMVM_SHA256SUM = 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d
+JAMVM_VERSION = 10b7c81c597809b2aaf28c8243453a21c33d4af3
+JAMVM_SHA256SUM = 6cce595ee2cfcfbaa425527be9c2fa880ade7b47475925f1c4bf18b017bffffd
JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -240,11 +240,6 @@
patches/cacao/ignore-tests.patch
endif
-if BUILD_JAMVM
-ICEDTEA_PATCHES += \
- patches/jamvm/remove-sun.misc.Perf-debug-code.patch
-endif
-
if ENABLE_PULSE_JAVA
ICEDTEA_PATCHES += \
patches/pulse-soundproperties.patch
@@ -328,13 +323,13 @@
JOBS="$(PARALLEL_JOBS)"
if ENABLE_CACAO
-ICEDTEA_ENV += \
- ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
+ICEDTEA_CONFIGURE += \
+ --with-import-hotspot="$(CACAO_IMPORT_PATH)"
endif
if ENABLE_JAMVM
-ICEDTEA_ENV += \
- ALT_HOTSPOT_IMPORT_PATH="$(JAMVM_IMPORT_PATH)"
+ICEDTEA_CONFIGURE += \
+ --with-import-hotspot="$(JAMVM_IMPORT_PATH)"
endif
if DISABLE_OPTIMIZATIONS
@@ -1721,10 +1716,11 @@
stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
if BUILD_JAMVM
cd jamvm/jamvm && \
- ./autogen.sh --with-java-runtime-library=openjdk \
+ ./autogen.sh --with-java-runtime-library=openjdk8 \
--prefix=$(abs_top_builddir)/jamvm/install ; \
$(MAKE) ; \
$(MAKE) install
+ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/lib
mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
cp $(abs_top_builddir)/jamvm/install/lib/libjvm.so $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/server
ln -sf server $(abs_top_builddir)/jamvm/install/hotspot/jre/lib/$(INSTALL_ARCH_DIR)/client
@@ -1793,6 +1789,7 @@
--with-java-runtime-library-classes=$(RUNTIME) \
--enable-jre-layout $(CACAO_CONFIGURE_ARGS); \
$(ARCH_PREFIX) $(MAKE) -j$(PARALLEL_JOBS) install
+ mkdir -p $(abs_top_builddir)/cacao/install/lib
ln -s server $(abs_top_builddir)/cacao/install/jre/lib/$(INSTALL_ARCH_DIR)/client
endif
endif
diff -r 53f6588f92fb -r de5854f8197d NEWS
--- a/NEWS Tue Apr 02 22:15:37 2013 +0100
+++ b/NEWS Fri Apr 12 17:08:21 2013 +0200
@@ -12,6 +12,12 @@
New in release 3.0 beta 1 (2013-XX-XX):
+* JamVM
+ - JSR 292: Invoke Dynamic
+ - JSR 308: Type Annotations
+ - JEP 171: Implement fence methods in sun.misc.Unsafe
+ - Set anonymous class protection domain
+ - Dummy implementation of sun.misc.Perf natives
* Bug fixes
- PR1346: Filter out -j option to make
- PR1347: Update list of checked JDKs
diff -r 53f6588f92fb -r de5854f8197d patches/jamvm/remove-sun.misc.Perf-debug-code.patch
--- a/patches/jamvm/remove-sun.misc.Perf-debug-code.patch Tue Apr 02 22:15:37 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-Index: openjdk/jdk/src/share/classes/java/net/URLClassLoader.java
-===================================================================
---- openjdk.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-13 16:58:42.000000000 +0200
-+++ openjdk/jdk/src/share/classes/java/net/URLClassLoader.java 2011-06-28 18:43:50.114802612 +0200
-@@ -438,14 +438,12 @@
- // Use (direct) ByteBuffer:
- CodeSigner[] signers = res.getCodeSigners();
- CodeSource cs = new CodeSource(url, signers);
-- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
- return defineClass(name, bb, cs);
- } else {
- byte[] b = res.getBytes();
- // must read certificates AFTER reading bytes.
- CodeSigner[] signers = res.getCodeSigners();
- CodeSource cs = new CodeSource(url, signers);
-- sun.misc.PerfCounter.getReadClassBytesTime().addElapsedTimeFrom(t0);
- return defineClass(name, b, 0, b.length, cs);
- }
- }
-Index: openjdk/jdk/src/share/classes/java/lang/ClassLoader.java
-===================================================================
---- openjdk.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-13 16:58:42.000000000 +0200
-+++ openjdk/jdk/src/share/classes/java/lang/ClassLoader.java 2011-06-28 18:43:50.142802778 +0200
-@@ -422,10 +422,6 @@
- long t1 = System.nanoTime();
- c = findClass(name);
-
-- // this is the defining class loader; record the stats
-- sun.misc.PerfCounter.getParentDelegationTime().addTime(t1 - t0);
-- sun.misc.PerfCounter.getFindClassTime().addElapsedTimeFrom(t1);
-- sun.misc.PerfCounter.getFindClasses().increment();
- }
- }
- if (resolve) {
-Index: openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java
-===================================================================
---- openjdk.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-06-28 18:56:56.994704556 +0200
-+++ openjdk/jdk/src/share/classes/java/util/zip/ZipFile.java 2011-06-28 18:57:11.514776567 +0200
-@@ -212,8 +212,6 @@
- this.zc = ZipCoder.get(charset);
- long t0 = System.nanoTime();
- jzfile = open(name, mode, file.lastModified(), usemmap);
-- sun.misc.PerfCounter.getZipFileOpenTime().addElapsedTimeFrom(t0);
-- sun.misc.PerfCounter.getZipFileCount().increment();
- this.name = name;
- this.total = getTotal(jzfile);
- }
More information about the distro-pkg-dev
mailing list