Revision: 5345
          http://jnode.svn.sourceforge.net/jnode/?rev=5345&view=rev
Author:   crawley
Date:     2009-04-25 03:39:10 +0000 (Sat, 25 Apr 2009)

Log Message:
-----------
Don't complain that 'default' is an unknown compiler name, but continue
to say what we are defaulting to.

Modified Paths:
--------------
    trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java

Modified: trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java 2009-04-25 
03:23:02 UTC (rev 5344)
+++ trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture.java 2009-04-25 
03:39:10 UTC (rev 5345)
@@ -156,17 +156,18 @@
         this.compilers[0] = new X86StubCompiler();
         // Compare insensitively, producing a warning if the user selects
         // an unknown compiler, and using a default where appropriate.
-        if (compiler != null && compiler.length() > 0) {
+        if (compiler != null && compiler.length() > 0 && 
+                !compiler.equalsIgnoreCase("default")) {
             if ("L1B".equalsIgnoreCase(compiler)) {
                 this.compilers[1] = new X86Level1BCompiler();
-            } else {
-                if (!"L1A".equalsIgnoreCase(compiler)) {
-                    BootLog.warn("JNode native compiler '" + compiler + 
-                            "' is unknown: defaulting to 'L1A'");
-                }
+            } else if ("L1A".equalsIgnoreCase(compiler)) {
                 this.compilers[1] = new X86Level1ACompiler();
+            } else { 
+                BootLog.warn("JNode native compiler '" + compiler + "' is 
unknown.");
             }
-        } else {
+        } 
+        if (this.compilers[1] == null) {
+            BootLog.warn("JNode native compiler defaulting to 'L1A'");
             this.compilers[1] = new X86Level1ACompiler();
         }
         this.testCompilers = null;


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

------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensign option that enables unlimited
royalty-free distribution of the report engine for externally facing 
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Jnode-svn-commits mailing list
Jnode-svn-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits

Reply via email to