X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FGCJ.xml;h=f52fe68eea185320a73791542f46258b4eb14e9a;hb=13a00f2eb8eb38682788650052f84ede589ec259;hp=55bb86dc9e92d688f7683ec14721370df218af09;hpb=9a33358173f08013fdacd02c11f3823352bdae23;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index 55bb86d..f52fe68 100644
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -22,22 +22,36 @@
 
         <echo message='compiling   .java -> .o'/>
         <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}'>
-            <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar:src/'/>
+            <arg value='-fCLASSPATH=bin/'/>
             <arg value='-O9'/>
             <arg value='-g'/>
-            <arg value='-Isrc/'/>
             <arg value='-c'/>
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
             <fileset dir='src/'>
-                <include name='jazz/**/*.java'/>
                 <include name='org/xwt/*.java'/>
                 <include name='org/xwt/util/*.java'/>
                 <include name='org/xwt/plat/GCJ.java'/>
                 <include name='org/xwt/plat/${subplat}.java'/>
                 <include name='org/bouncycastle/**/*.java'/>
                 <include name='org/mozilla/**/*.java'/>
+                <exclude name='org/xwt/Trap.java'/>
+            </fileset>
+            <mapper type='glob' from='*.java' to='*.o'/>
+        </apply>
+
+        <!-- we have to turn off optimization here due to a compiler bug -->
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}'>
+            <arg value='-fCLASSPATH=bin/'/>
+            <arg value='-O0'/>
+            <arg value='-g'/>
+            <arg value='-c'/>
+            <srcfile/>
+            <arg value='-o'/>
+            <targetfile/>
+            <fileset dir='src/'>
+                <include name='org/xwt/Trap.java'/>
             </fileset>
             <mapper type='glob' from='*.java' to='*.o'/>
         </apply>
@@ -55,9 +69,16 @@
         </apply>
                                                                               
         <echo message='wrapping    .xwar -> .o'/>
-        <bash>
-            ${gcc-path}/bin/${gcc-target}gcj --resource org/xwt/builtin.xwar -c bin/org/xwt/builtin.xwar -o bin-${plat}/org/xwt/builtin.o
-        </bash>
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}/'>
+            <fileset dir='bin/' includes='**/*.xwar'/>
+            <arg value='--resource'/>
+            <arg value='org/xwt/builtin.xwar'/>
+            <arg value='-c'/>
+            <srcfile/>
+            <arg value='-o'/>
+            <targetfile/>
+            <mapper type='glob' from='*.xwar' to='*.o'/>
+        </apply>
 
         <echo message='linking        .o -> ${binaryname}'/>
         <uptodate property="linked" targetfile="bin-${plat}/${binaryname}">