/hg/icedtea: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu May 19 15:39:27 PDT 2011
changeset decad30090ca in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=decad30090ca
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Feb 24 21:43:07 2011 +0100
Fix warnings, check if files exist before renaming.
2011-02-24 Xerxes Ranby <xerxes at zafena.se>
* Makefile.am (stamps/download-cacao.stamp): Fix
warning, check if the CACAO_SRC_ZIP file exist before trying
to rename it. (stamps/download-jamvm.stamp): Likewise for
JAMVM_SRC_ZIP. (stamps/download-openjdk.stamp):
Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP.
changeset e90fab517c39 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e90fab517c39
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu May 19 23:34:43 2011 +0100
PR640: JamVM fails to build - Unrecognised option:
-XX:ThreadStackSize.
2011-02-24 Xerxes Ranby <xerxes at zafena.se>
PR640: JamVM fails to build - Unrecognised option:
-XX:ThreadStackSize.
* NEWS: Updated.
* Makefile.am (ICEDTEA_PATCHES): Add JamVM patches if
BUILD_JAMVM are defined.
* patches/jamvm/ignore-more-XX-options.patch: New JamVM patch.
changeset 7fa3d3774850 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7fa3d3774850
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu May 19 23:36:26 2011 +0100
JamVM: Fix configure --enable-jamvm full bootstrap build.
2011-02-27 Xerxes Ranby <xerxes at zafena.se>
JamVM: Fix configure --enable-jamvm full bootstrap build.
* NEWS: Updated.
* Makefile.am: (JAMVM_VERSION): Updated to latest JamVM
revision. (JAMVM_SHA256SUM): Updated.
changeset 474b01bedbd0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=474b01bedbd0
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Mar 02 23:28:59 2011 +0100
Make JamVM ignore 29 more unrecognised options that fail on jtreg.
2011-03-02 Xerxes Ranby <xerxes at zafena.se>
* patches/jamvm/ignore-more-XX-options.patch: Make
JamVM ignore more unrecognised options that fail on jtreg.
-esa, -Xbatch, -Xcomp, -Xverify:all, -XX:+AggressiveOpts,
-XX:-BlockLayoutRotateLoops, -XX:CompileCommand=, -XX:CompileOnly=,
-XX:CompileThreshold, -XX:+DeoptimizeALot, -XX:+DoEscapeAnalysis,
-XX:HeapBaseMinAddress, -XX:+IgnoreUnrecognizedVMOptions,
-XX:-Inline,
-XX:-InlineObjectHash, -XX:InlineSmallCode=, -XX:LoopUnrollLimit=,
-XX:-LoopUnswitching, -XX:MaxInlineSize=, -XX:+OptimizeFill,
-XX:+PrintCompilation, -XX:-ProfileInterpreter, -XX:+ScavengeALot,
-XX:+UnlockDiagnosticVMOptions, -XX:-UseCompressedOops,
-XX:+UseCompressedOops, -XX:+UseConcMarkSweepGC, -XX:UseSSE= and
-XX:+VerifyBeforeGC
changeset d8aa2906143e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d8aa2906143e
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu Mar 03 15:32:46 2011 +0100
JamVM: Ignore all unknown options.
2011-03-03 Xerxes Ranby <xerxes at zafena.se>
JamVM: Ignore all unknown options.
* Makefile.am: Replaced JamVM patch.
* patches/jamvm/ignore-more-XX-options.patch: Removed.
* patches/jamvm/ignore-unknown-options.patch: Added.
changeset 1a8a40f21e15 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1a8a40f21e15
author: Xerxes R?nby <xerxes at zafena.se>
date: Thu May 19 23:39:17 2011 +0100
CACAO: Ignore all unknown options.
2011-03-04 Xerxes Ranby <xerxes at zafena.se>
CACAO: Ignore all unknown options.
* Makefile.am: Add CACAO patch.
* patches/cacao/ignore-unknown-options.patch: Added.
diffstat:
ChangeLog | 53 ++++++++++++++++++++++++++++++
Makefile.am | 20 +++++++---
NEWS | 2 +
patches/cacao/ignore-unknown-options.patch | 16 +++++++++
patches/jamvm/ignore-unknown-options.patch | 12 ++++++
5 files changed, 96 insertions(+), 7 deletions(-)
diffs (184 lines):
diff -r 526e140c51c9 -r 1a8a40f21e15 ChangeLog
--- a/ChangeLog Thu May 19 23:32:31 2011 +0100
+++ b/ChangeLog Thu May 19 23:39:17 2011 +0100
@@ -1,3 +1,56 @@
+2011-03-04 Xerxes Ranby <xerxes at zafena.se>
+
+ CACAO: Ignore all unknown options.
+ * Makefile.am: Add CACAO patch.
+ * patches/cacao/ignore-unknown-options.patch: Added.
+
+2011-03-03 Xerxes Ranby <xerxes at zafena.se>
+
+ JamVM: Ignore all unknown options.
+ * Makefile.am: Replaced JamVM patch.
+ * patches/jamvm/ignore-more-XX-options.patch: Removed.
+ * patches/jamvm/ignore-unknown-options.patch: Added.
+
+2011-03-02 Xerxes Ranby <xerxes at zafena.se>
+
+ * patches/jamvm/ignore-more-XX-options.patch:
+ Make JamVM ignore more unrecognised options that fail on jtreg.
+ -esa, -Xbatch, -Xcomp, -Xverify:all, -XX:+AggressiveOpts,
+ -XX:-BlockLayoutRotateLoops, -XX:CompileCommand=, -XX:CompileOnly=,
+ -XX:CompileThreshold, -XX:+DeoptimizeALot, -XX:+DoEscapeAnalysis,
+ -XX:HeapBaseMinAddress, -XX:+IgnoreUnrecognizedVMOptions, -XX:-Inline,
+ -XX:-InlineObjectHash, -XX:InlineSmallCode=, -XX:LoopUnrollLimit=,
+ -XX:-LoopUnswitching, -XX:MaxInlineSize=, -XX:+OptimizeFill,
+ -XX:+PrintCompilation, -XX:-ProfileInterpreter, -XX:+ScavengeALot,
+ -XX:+UnlockDiagnosticVMOptions, -XX:-UseCompressedOops,
+ -XX:+UseCompressedOops, -XX:+UseConcMarkSweepGC, -XX:UseSSE= and
+ -XX:+VerifyBeforeGC
+
+2011-02-27 Xerxes Ranby <xerxes at zafena.se>
+
+ JamVM: Fix configure --enable-jamvm full bootstrap build.
+ * NEWS: Updated.
+ * Makefile.am:
+ (JAMVM_VERSION): Updated to latest JamVM revision.
+ (JAMVM_SHA256SUM): Updated.
+
+2011-02-24 Xerxes Ranby <xerxes at zafena.se>
+
+ PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
+ * NEWS: Updated.
+ * Makefile.am (ICEDTEA_PATCHES):
+ Add JamVM patches if BUILD_JAMVM are defined.
+ * patches/jamvm/ignore-more-XX-options.patch: New JamVM patch.
+
+2011-02-24 Xerxes Ranby <xerxes at zafena.se>
+
+ * Makefile.am (stamps/download-cacao.stamp):
+ Fix warning, check if the CACAO_SRC_ZIP file exist
+ before trying to rename it.
+ (stamps/download-jamvm.stamp): Likewise for JAMVM_SRC_ZIP.
+ (stamps/download-openjdk.stamp):
+ Likewise for OPENJDK_SRC_ZIP and HOTSPOT_SRC_ZIP.
+
2011-02-23 Xerxes Ranby <xerxes at zafena.se>
JamVM: configure --with-jamvm-src-zip
diff -r 526e140c51c9 -r 1a8a40f21e15 Makefile.am
--- a/Makefile.am Thu May 19 23:32:31 2011 +0100
+++ b/Makefile.am Thu May 19 23:39:17 2011 +0100
@@ -24,8 +24,8 @@
CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.bz2
CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-JAMVM_VERSION = 10329d9f3205698af125bba131b4f47339e81d90
-JAMVM_SHA256SUM = 0e87f22bc6a35c327ab343e7ca0e89512e3797aff93ee8a5539f0babfbd40f9b
+JAMVM_VERSION = 30c4a6b93ffa385833360921bfc613829fb081c9
+JAMVM_SHA256SUM = e77434a7d02d75de7fe44e9e1d7d6a3fd7ddcd5447ddd175fde2a7ccb40f8838
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
@@ -302,7 +302,8 @@
patches/cacao/arm-arch-defines.patch \
patches/cacao/jsig.patch \
patches/cacao/6714758.patch \
- patches/cacao/memory.patch
+ patches/cacao/memory.patch \
+ patches/cacao/ignore-unknown-options.patch
endif
if WITH_CACAO
@@ -310,6 +311,11 @@
patches/cacao/ignore-tests.patch
endif
+if BUILD_JAMVM
+ICEDTEA_PATCHES += \
+ patches/jamvm/ignore-unknown-options.patch
+endif
+
if ENABLE_PULSE_JAVA
ICEDTEA_PATCHES += \
patches/pulse-soundproperties.patch
@@ -923,7 +929,7 @@
if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ $(OPENJDK_SRC_ZIP) ] ; \
+ if [ -e $(OPENJDK_SRC_ZIP) ] ; \
then \
mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
fi ; \
@@ -1019,7 +1025,7 @@
if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ $(HOTSPOT_SRC_ZIP) ] ; \
+ if [ -e $(HOTSPOT_SRC_ZIP) ] ; \
then \
mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
fi ; \
@@ -1073,7 +1079,7 @@
if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ $(CACAO_SRC_ZIP) ] ; \
+ if [ -e $(CACAO_SRC_ZIP) ] ; \
then \
mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
fi ; \
@@ -1100,7 +1106,7 @@
if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ $(JAMVM_SRC_ZIP) ] ; \
+ if [ -e $(JAMVM_SRC_ZIP) ] ; \
then \
mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
fi ; \
diff -r 526e140c51c9 -r 1a8a40f21e15 NEWS
--- a/NEWS Thu May 19 23:32:31 2011 +0100
+++ b/NEWS Thu May 19 23:39:17 2011 +0100
@@ -5,8 +5,10 @@
* Added out-of-the-box JamVM support using --enable-jamvm
* Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm
* Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip
+* JamVM builds can bootstrap and are self-hosting.
* Bug fixes
- PR616, PR99: Don't statically link libstdc++
+ - PR640: JamVM fails to build - Unrecognised option: -XX:ThreadStackSize.
* Zero/Shark
- Match Shark in icedtea6, makes OSR work by removing vestigal check.
- LLVM 2.7 non-product fixes.
diff -r 526e140c51c9 -r 1a8a40f21e15 patches/cacao/ignore-unknown-options.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/ignore-unknown-options.patch Thu May 19 23:39:17 2011 +0100
@@ -0,0 +1,17 @@
+Index: cacao/cacao/src/vm/vm.cpp
+===================================================================
+--- cacao.orig/cacao/src/vm/vm.cpp 2011-03-04 00:20:24.000000000 +0100
++++ cacao/cacao/src/vm/vm.cpp 2011-03-04 01:12:45.000000000 +0100
+@@ -1239,9 +1239,10 @@
+
+ #endif
+ default:
+- printf("Unknown option: %s\n",
++ fprintf(stderr,"Unknown option: %s\n",
+ vm_args->options[opt_index].optionString);
+- usage();
++ opt_index++;
++ /* Ignore */
+ }
+ }
+
diff -r 526e140c51c9 -r 1a8a40f21e15 patches/jamvm/ignore-unknown-options.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/ignore-unknown-options.patch Thu May 19 23:39:17 2011 +0100
@@ -0,0 +1,13 @@
+Index: jamvm/jamvm/src/jni.c
+===================================================================
+--- jamvm.orig/jamvm/src/jni.c 2011-02-27 04:35:37.000000000 +0100
++++ jamvm/jamvm/src/jni.c 2011-03-03 13:48:31.897900208 +0100
+@@ -1642,7 +1642,7 @@
+ /* Ignore */
+ } else if(!vm_args->ignoreUnrecognized) {
+ optError(args, "Unrecognised option: %s\n", string);
+- goto error;
++ /* Ignore */
+ }
+ }
+
More information about the distro-pkg-dev
mailing list