SF.net SVN: jikesrvm:[15765] rvmroot/trunk
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
SF.net SVN: jikesrvm:[15765] rvmroot/trunk
by dgrove-oss
::
Rate this Message:
Revision: 15765
http://jikesrvm.svn.sourceforge.net/jikesrvm/?rev=15765&view=rev Author: dgrove-oss Date: 2009-08-11 14:38:29 +0000 (Tue, 11 Aug 2009) Log Message: ----------- Upgrade to latest harmony milestone built (M10, r782693). remove usage of ant.exe property from build/components/harmony.xml; we assume ant is in the user's path in lots of other places, so may as well make the same assumption here instead of forcing ant to be in /usr/bin. Modified Paths: -------------- rvmroot/trunk/build/components/harmony.xml rvmroot/trunk/build/hosts/x86_64-linux.properties rvmroot/trunk/build/hosts/x86_64_m64-linux.properties rvmroot/trunk/build/primordials/Harmony.txt rvmroot/trunk/build.xml rvmroot/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java rvmroot/trunk/tools/bootImageRunner/rvm.harmony rvmroot/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java Modified: rvmroot/trunk/build/components/harmony.xml =================================================================== --- rvmroot/trunk/build/components/harmony.xml 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/build/components/harmony.xml 2009-08-11 14:38:29 UTC (rev 15765) @@ -15,8 +15,8 @@ <import file="base.xml"/> <property file="${components.file}"/> - <property name="harmony.version" value="5.0M8"/> - <property name="harmony.svn.revision" value="713673"/> + <property name="harmony.version" value="5.0M10"/> + <property name="harmony.svn.revision" value="782693"/> <property name="harmony.base.url" value="http://svn.apache.org/repos/asf/harmony/enhanced/classlib/trunk"/> <property name="harmony.description" value="Apache Harmony class libraries"/> <property name="harmony.patchlevel" value="0"/> @@ -94,7 +94,7 @@ <isset property="harmony.arch"/> </conditions> <sequential> - <exec executable="${ant.exe}" dir="${harmony.dir}" failonerror="true"> + <exec executable="ant" dir="${harmony.dir}" failonerror="true"> <env key="ASFLAGS" value="${harmony.asflags}"/> <env key="LDFLAGS" value="${harmony.ldflags}"/> <env key="CFLAGS" value="${harmony.cflags}"/> Modified: rvmroot/trunk/build/hosts/x86_64-linux.properties =================================================================== --- rvmroot/trunk/build/hosts/x86_64-linux.properties 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/build/hosts/x86_64-linux.properties 2009-08-11 14:38:29 UTC (rev 15765) @@ -31,4 +31,3 @@ tar.exe=/bin/tar cvs.exe=/usr/bin/cvs autoconf.exe=/usr/bin/autoconf -ant.exe=/usr/bin/ant Modified: rvmroot/trunk/build/hosts/x86_64_m64-linux.properties =================================================================== --- rvmroot/trunk/build/hosts/x86_64_m64-linux.properties 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/build/hosts/x86_64_m64-linux.properties 2009-08-11 14:38:29 UTC (rev 15765) @@ -31,4 +31,3 @@ tar.exe=/bin/tar cvs.exe=/usr/bin/cvs autoconf.exe=/usr/bin/autoconf -ant.exe=/usr/bin/ant Modified: rvmroot/trunk/build/primordials/Harmony.txt =================================================================== --- rvmroot/trunk/build/primordials/Harmony.txt 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/build/primordials/Harmony.txt 2009-08-11 14:38:29 UTC (rev 15765) @@ -200,8 +200,14 @@ Ljava/util/Hashtable$3; Ljava/util/Hashtable$4$1; Ljava/util/Hashtable$4; +Ljava/util/Hashtable$5; +Ljava/util/Hashtable$6$1; +Ljava/util/Hashtable$6; +Ljava/util/Hashtable$7$1; +Ljava/util/Hashtable$7; Ljava/util/Hashtable$Entry; [Ljava/util/Hashtable$Entry; +Ljava/util/Hashtable$HashEnumIterator; Ljava/util/Hashtable$HashIterator; Ljava/util/List; @@ -265,6 +271,10 @@ Ljava/util/Collections; Ljava/util/Stack; Ljava/util/TreeMap; +Ljava/util/TreeMap$1; +Ljava/util/TreeMap$2; +Ljava/util/TreeMap$3; +Ljava/util/TreeMap$UnboundedKeyIterator; Ljava/util/TreeSet; Ljava/util/WeakHashMap$1$1; Ljava/util/WeakHashMap$1; @@ -345,6 +355,8 @@ Ljava/security/AccessControlContext; Ljava/lang/ThreadLocal; # Used by ThreadLocal +Ljava/util/LinkedList$Link; +Ljava/util/LinkedList$LinkIterator; Ljava/util/LinkedList; Ljava/lang/SecurityManager; @@ -485,14 +497,13 @@ Lorg/apache/harmony/luni/internal/process/SystemProcess; Lorg/apache/harmony/luni/internal/nls/Messages; Lorg/apache/harmony/luni/internal/nls/Messages$1; +Lorg/apache/harmony/luni/internal/nls/Messages$1; Lorg/apache/harmony/luni/platform/AbstractMemorySpy; -Lorg/apache/harmony/luni/platform/AdapterManager; Lorg/apache/harmony/luni/platform/Endianness; Lorg/apache/harmony/luni/platform/ICommonDataTypes; Lorg/apache/harmony/luni/platform/IFileSystem; Lorg/apache/harmony/luni/platform/IMemorySpy; Lorg/apache/harmony/luni/platform/IMemorySystem; -Lorg/apache/harmony/luni/platform/OSComponentFactory; Lorg/apache/harmony/luni/platform/OSFileSystem; Lorg/apache/harmony/luni/platform/OSMemory; Lorg/apache/harmony/luni/platform/OSNetworkSystem; Modified: rvmroot/trunk/build.xml =================================================================== --- rvmroot/trunk/build.xml 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/build.xml 2009-08-11 14:38:29 UTC (rev 15765) @@ -188,7 +188,7 @@ <test-file name="harmony.lib.dir" location="${components.file}"/> <property file="${harmony.lib.dir}/constants.properties"/> <property name="config.portable-native-sync" value="false"/> <!-- has no meaning for Harmony --> - <property name="build.extra.rt.jars" value=":${harmony.lib.dir}/yoko-rmi-impl.jar:${harmony.lib.dir}/instrument.jar:${harmony.lib.dir}/beans.jar:${harmony.lib.dir}/xml-apis.jar:${harmony.lib.dir}/mx4j.jar:${harmony.lib.dir}/nio.jar:${harmony.lib.dir}/xalan.jar:${harmony.lib.dir}/resolver.jar:${harmony.lib.dir}/logging.jar:${harmony.lib.dir}/bcprov.jar:${harmony.lib.dir}/security.jar:${harmony.lib.dir}/sql.jar:${harmony.lib.dir}/print.jar:${harmony.lib.dir}/mx4j-remote.jar:${harmony.lib.dir}/concurrent.jar:${harmony.lib.dir}/luni-kernel-stubs.jar:${harmony.lib.dir}/misc.jar:${harmony.lib.dir}/accessibility.jar:${harmony.lib.dir}/crypto.jar:${harmony.lib.dir}/yoko.jar:${harmony.lib.dir}/rmi.jar:${harmony.lib.dir}/security-kernel-stubs.jar:${harmony.lib.dir}/x-net.jar:${harmony.lib.dir}/icu4j-charsets-3_8.jar:${harmony.lib.dir}/imageio.jar:${harmony.lib.dir}/nio_char.jar:${harmony.lib.dir}/lang-management.jar:${harmony.lib.dir}/regex.jar:${harmony.lib.dir}/applet.jar:${harmony.lib.dir}/prefs.jar:${harmony.lib.dir}/annotation.jar:${harmony.lib.dir}/math.jar:${harmony.lib.dir}/luni.jar:${harmony.lib.dir}/archive.jar:${harmony.lib.dir}/awt.jar:${harmony.lib.dir}/nio_char-src.jar:${harmony.lib.dir}/xercesImpl.jar:${harmony.lib.dir}/yoko-rmi-spec.jar:${harmony.lib.dir}/swing.jar:${harmony.lib.dir}/auth.jar:${harmony.lib.dir}/yoko-core.jar:${harmony.lib.dir}/text.jar:${harmony.lib.dir}/jndi.jar:${harmony.lib.dir}/suncompat.jar:${harmony.lib.dir}/sound.jar:${harmony.lib.dir}/icu4j-3_8.jar:${harmony.lib.dir}/bcel-5.2.jar"/> + <property name="build.extra.rt.jars" value=":${harmony.lib.dir}/yoko-rmi-impl.jar:${harmony.lib.dir}/instrument.jar:${harmony.lib.dir}/beans.jar:${harmony.lib.dir}/xml-apis.jar:${harmony.lib.dir}/mx4j.jar:${harmony.lib.dir}/nio.jar:${harmony.lib.dir}/xalan.jar:${harmony.lib.dir}/resolver.jar:${harmony.lib.dir}/logging.jar:${harmony.lib.dir}/bcprov.jar:${harmony.lib.dir}/security.jar:${harmony.lib.dir}/sql.jar:${harmony.lib.dir}/print.jar:${harmony.lib.dir}/mx4j-remote.jar:${harmony.lib.dir}/concurrent.jar:${harmony.lib.dir}/luni-kernel-stubs.jar:${harmony.lib.dir}/misc.jar:${harmony.lib.dir}/accessibility.jar:${harmony.lib.dir}/crypto.jar:${harmony.lib.dir}/yoko.jar:${harmony.lib.dir}/rmi.jar:${harmony.lib.dir}/security-kernel-stubs.jar:${harmony.lib.dir}/x-net.jar:${harmony.lib.dir}/icu4j-charsets-4_0.jar:${harmony.lib.dir}/imageio.jar:${harmony.lib.dir}/nio_char.jar:${harmony.lib.dir}/lang-management.jar:${harmony.lib.dir}/regex.jar:${harmony.lib.dir}/applet.jar:${harmony.lib.dir}/prefs.jar:${harmony.lib.dir}/annotation.jar:${harmony.lib.dir}/math.jar:${harmony.lib.dir}/luni.jar:${harmony.lib.dir}/archive.jar:${harmony.lib.dir}/awt.jar:${harmony.lib.dir}/nio_char-src.jar:${harmony.lib.dir}/xercesImpl.jar:${harmony.lib.dir}/yoko-rmi-spec.jar:${harmony.lib.dir}/swing.jar:${harmony.lib.dir}/auth.jar:${harmony.lib.dir}/yoko-core.jar:${harmony.lib.dir}/text.jar:${harmony.lib.dir}/jndi.jar:${harmony.lib.dir}/suncompat.jar:${harmony.lib.dir}/sound.jar:${harmony.lib.dir}/icu4j-4_0.jar:${harmony.lib.dir}/bcel-5.2.jar"/> </target> <target name="check-mmtk-properties" depends="check-host-name"> Modified: rvmroot/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java =================================================================== --- rvmroot/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/libraryInterface/Harmony/ASF/src/org/apache/harmony/luni/platform/OSMemory.java 2009-08-11 14:38:29 UTC (rev 15765) @@ -46,7 +46,7 @@ * above. * </p> */ -final class OSMemory extends OSComponent implements IMemorySystem { +final class OSMemory implements IMemorySystem { /** * Defines the size, in bytes, of a native pointer type for the underlying @@ -81,7 +81,7 @@ * * @see #getOSMemory() */ - OSMemory() { + private OSMemory() { super(); } Modified: rvmroot/trunk/tools/bootImageRunner/rvm.harmony =================================================================== --- rvmroot/trunk/tools/bootImageRunner/rvm.harmony 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/tools/bootImageRunner/rvm.harmony 2009-08-11 14:38:29 UTC (rev 15765) @@ -14,7 +14,7 @@ export RVM_HOME="`dirname "$0"`" -export BASE_ARGS="-X:ic=$RVM_HOME/RVM.code.image -X:id=$RVM_HOME/RVM.data.image -X:ir=$RVM_HOME/RVM.rmap.image -X:vmClasses=$RVM_HOME/jksvm.jar:$RVM_HOME/rvmrt.jar:$RVM_HOME/lib/luni.jar:$RVM_HOME/lib/nio.jar:$RVM_HOME/lib/nio_char.jar:$RVM_HOME/lib/archive.jar:$RVM_HOME/lib/concurrent.jar:$RVM_HOME/lib/math.jar:$RVM_HOME/lib/regex.jar:$RVM_HOME/lib/icu4j-charsets-3_8.jar:$RVM_HOME/lib/icu4j-3_8.jar:$RVM_HOME/lib/yoko-rmi-impl.jar:$RVM_HOME/lib/instrument.jar:$RVM_HOME/lib/beans.jar:$RVM_HOME/lib/xml-apis.jar:$RVM_HOME/lib/mx4j.jar:$RVM_HOME/lib/xalan.jar:$RVM_HOME/lib/resolver.jar:$RVM_HOME/lib/logging.jar:$RVM_HOME/lib/bcprov.jar:$RVM_HOME/lib/security.jar:$RVM_HOME/lib/sql.jar:$RVM_HOME/lib/print.jar:$RVM_HOME/lib/mx4j-remote.jar:$RVM_HOME/lib/luni-kernel-stubs.jar:$RVM_HOME/lib/misc.jar:$RVM_HOME/lib/accessibility.jar:$RVM_HOME/lib/crypto.jar:$RVM_HOME/lib/yoko.jar:$RVM_HOME/lib/rmi.jar:$RVM_HOME/lib/security-kernel-stubs.jar:$RVM_HOME/lib/x-net.jar:$RVM_HOME/lib/imageio.jar:$RVM_HOME/lib/lang-management.jar:$RVM_HOME/lib/applet.jar:$RVM_HOME/lib/prefs.jar:$RVM_HOME/lib/annotation.jar:$RVM_HOME/lib/awt.jar:$RVM_HOME/lib/xercesImpl.jar:$RVM_HOME/lib/yoko-rmi-spec.jar:$RVM_HOME/lib/swing.jar:$RVM_HOME/lib/auth.jar:$RVM_HOME/lib/yoko-core.jar:$RVM_HOME/lib/text.jar:$RVM_HOME/lib/jndi.jar:$RVM_HOME/lib/suncompat.jar:$RVM_HOME/lib/sound.jar:$RVM_HOME/lib/bcel-5.2.jar -Duser.timezone=$(date +%Z) -Djava.home=$RVM_HOME -Djava.library.path=$RVM_HOME/lib -Dvm.boot.library.path=$RVM_HOME/lib -Duser.home=$HOME -Duser.dir=`pwd` -Duser.name=`whoami` -Dos.name=`uname -s` -Dos.version=`uname -r` -Dos.arch=`uname -m | tr ' ' '_'` -Dpath.separator=: -Dfile.separator=/ -Dfile.encoding=ISO-8859-1 -Djava.io.tmpdir=/tmp" +export BASE_ARGS="-X:ic=$RVM_HOME/RVM.code.image -X:id=$RVM_HOME/RVM.data.image -X:ir=$RVM_HOME/RVM.rmap.image -X:vmClasses=$RVM_HOME/jksvm.jar:$RVM_HOME/rvmrt.jar:$RVM_HOME/lib/luni.jar:$RVM_HOME/lib/nio.jar:$RVM_HOME/lib/nio_char.jar:$RVM_HOME/lib/archive.jar:$RVM_HOME/lib/concurrent.jar:$RVM_HOME/lib/math.jar:$RVM_HOME/lib/regex.jar:$RVM_HOME/lib/icu4j-charsets-4_0.jar:$RVM_HOME/lib/icu4j-4_0.jar:$RVM_HOME/lib/yoko-rmi-impl.jar:$RVM_HOME/lib/instrument.jar:$RVM_HOME/lib/beans.jar:$RVM_HOME/lib/xml-apis.jar:$RVM_HOME/lib/mx4j.jar:$RVM_HOME/lib/xalan.jar:$RVM_HOME/lib/resolver.jar:$RVM_HOME/lib/logging.jar:$RVM_HOME/lib/bcprov.jar:$RVM_HOME/lib/security.jar:$RVM_HOME/lib/sql.jar:$RVM_HOME/lib/print.jar:$RVM_HOME/lib/mx4j-remote.jar:$RVM_HOME/lib/luni-kernel-stubs.jar:$RVM_HOME/lib/misc.jar:$RVM_HOME/lib/accessibility.jar:$RVM_HOME/lib/crypto.jar:$RVM_HOME/lib/yoko.jar:$RVM_HOME/lib/rmi.jar:$RVM_HOME/lib/security-kernel-stubs.jar:$RVM_HOME/lib/x-net.jar:$RVM_HOME/lib/imageio.jar:$RVM_HOME/lib/lang-management.jar:$RVM_HOME/lib/applet.jar:$RVM_HOME/lib/prefs.jar:$RVM_HOME/lib/annotation.jar:$RVM_HOME/lib/awt.jar:$RVM_HOME/lib/xercesImpl.jar:$RVM_HOME/lib/yoko-rmi-spec.jar:$RVM_HOME/lib/swing.jar:$RVM_HOME/lib/auth.jar:$RVM_HOME/lib/yoko-core.jar:$RVM_HOME/lib/text.jar:$RVM_HOME/lib/jndi.jar:$RVM_HOME/lib/suncompat.jar:$RVM_HOME/lib/sound.jar:$RVM_HOME/lib/bcel-5.2.jar -Duser.timezone=$(date +%Z) -Djava.home=$RVM_HOME -Djava.library.path=$RVM_HOME/lib -Dvm.boot.library.path=$RVM_HOME/lib -Duser.home=$HOME -Duser.dir=`pwd` -Duser.name=`whoami` -Dos.name=`uname -s` -Dos.version=`uname -r` -Dos.arch=`uname -m | tr ' ' '_'` -Dpath.separator=: -Dfile.separator=/ -Dfile.encoding=ISO-8859-1 -Djava.io.tmpdir=/tmp" # This may need to be LIBPATH under AIX or SHLIB_PATH on HP-UX export LD_LIBRARY_PATH=$RVM_HOME:$RVM_HOME/lib:$LD_LIBRARY_PATH Modified: rvmroot/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java =================================================================== --- rvmroot/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java 2009-08-10 20:36:32 UTC (rev 15764) +++ rvmroot/trunk/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java 2009-08-11 14:38:29 UTC (rev 15765) @@ -2397,6 +2397,14 @@ rvmFieldName.equals("CACHE") && rvmFieldType.isArrayType()) { Statics.setSlotContents(rvmFieldOffset, new Byte[256]); return true; + } else if (jdkType.equals(java.lang.Integer.class)) { + if (rvmFieldName.equals("decimalScale") && rvmFieldType.isArrayType()) { + int[] java_lang_Integer_decimalScale = new int[] { 1000000000, 100000000, 10000000, 1000000, 100000, 10000, 1000, 100, 10, 1 }; + Statics.setSlotContents(rvmFieldOffset, java_lang_Integer_decimalScale); + return true; + } else { + throw new Error("Unknown field in java.lang.Integer " + rvmFieldName + " " + rvmFieldType); + } } else if (jdkType.equals(java.lang.Throwable.class) && rvmFieldName.equals("zeroLengthStackTrace") && rvmFieldType.isArrayType()) { Statics.setSlotContents(rvmFieldOffset, new StackTraceElement[0]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Jikesrvm-commits mailing list Jikesrvm-commits@... https://lists.sourceforge.net/lists/listinfo/jikesrvm-commits |
| Free embeddable forum powered by Nabble | Forum Help |
