[Pearcolator-devel] SF.net SVN: pearcolator: [22] rvmroot.patch

[<cap...@us...>]

Revision: 22
          http://svn.sourceforge.net/pearcolator/?rev=22&view=rev
Author:   captain5050
Date:     2007-04-03 07:11:34 -0700 (Tue, 03 Apr 2007)

Log Message:
-----------
Moved the typo fix into the RVM

Modified Paths:
--------------
    rvmroot.patch

Modified: rvmroot.patch
===================================================================
--- rvmroot.patch	2007-04-02 12:43:16 UTC (rev 21)
+++ rvmroot.patch	2007-04-03 14:11:34 UTC (rev 22)
@@ -1,17 +1,8 @@
 Index: build.xml
 ===================================================================
---- build.xml	(revision 11903)
+--- build.xml	(revision 11998)
 +++ build.xml	(working copy)
-@@ -792,7 +792,7 @@
-     </condition>
-     
-     <!--
--     FIXME: When we can capture the primordials based on reacability we will not need to delete class dir
-+     FIXME: When we can capture the primordials based on reachability we will not need to delete class dir
-      here. We will also be able to compile ALL classes in one sweep.
-     -->
-     <delete dir="${build.classes}"/>
-@@ -802,8 +802,8 @@
+@@ -803,8 +803,8 @@
             debugLevel="lines,source"
             source="1.5"
             target="1.5"
@@ -22,7 +13,7 @@
        <bootclasspath>
          <pathelement location="${classpath.lib.dir}/classpath.jar"/>
        </bootclasspath>
-@@ -862,7 +862,7 @@
+@@ -863,7 +863,7 @@
      </javac>
    </target>
  
@@ -31,7 +22,7 @@
      <!-- create a rt.jar for the RVM -->
      <copy file="${classpath.lib.dir}/classpath.jar" tofile="${build.rt.jar}"/>
      <zip destfile="${build.rt.jar}" update="true" basedir="${build.classes}">
-@@ -881,7 +881,20 @@
+@@ -883,7 +883,20 @@
      </jar>
    </target>
  
@@ -54,7 +45,7 @@
    <!-- *                Section for building the boot image                       * -->
 Index: rvm/src-generated/opt-ir/InstructionFormatList.dat
 ===================================================================
---- rvm/src-generated/opt-ir/InstructionFormatList.dat	(revision 11903)
+--- rvm/src-generated/opt-ir/InstructionFormatList.dat	(revision 11995)
 +++ rvm/src-generated/opt-ir/InstructionFormatList.dat	(working copy)
 @@ -149,6 +149,14 @@
  "U Cond OPT_ConditionOperand" "U BranchProfile OPT_BranchProfileOperand"
@@ -73,7 +64,7 @@
  "D Result OPT_RegisterOperand" "U Val1 OPT_Operand" "U Val2 OPT_Operand" \
 Index: rvm/src-generated/opt-ir/OperatorList.dat
 ===================================================================
---- rvm/src-generated/opt-ir/OperatorList.dat	(revision 11903)
+--- rvm/src-generated/opt-ir/OperatorList.dat	(revision 11995)
 +++ rvm/src-generated/opt-ir/OperatorList.dat	(working copy)
 @@ -1255,6 +1255,20 @@
  
@@ -96,11 +87,9 @@
  # Load a singed byte
  # NOTE: Because of our strategy of using explict guard instructions, there is no
  # way in the HIR/LIR that the actual load instruction can except.
-
-
 Index: rvm/src/OptDummy.java
 ===================================================================
---- rvm/src/OptDummy.java	(revision 11903)
+--- rvm/src/OptDummy.java	(revision 11995)
 +++ rvm/src/OptDummy.java	(working copy)
 @@ -20,4 +20,5 @@
    static org.jikesrvm.compilers.opt.OPT_Compiler a;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.