Mercurial > projects > ldc

diff dmd/mars.c @ 133:44a95ac7368a trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet... In particular, assertions has been fixed to include file/line info, and much more!
author lindquist
date Mon, 14 Jan 2008 05:11:54 +0100
parents 1700239cab2e
children 0ab29b838084
line wrap: on
line diff
--- a/dmd/mars.c	Fri Jan 11 17:57:40 2008 +0100
+++ b/dmd/mars.c	Mon Jan 14 05:11:54 2008 +0100
@@ -158,7 +158,7 @@
 
 void usage()
 {
-    printf("LLVM D Compiler %s (based on DMD %s)\n%s\n%s\n",
+    printf("LLVM D Compiler %s (based on DMD %s and LLVM 2.2)\n%s\n%s\n",
     global.llvmdc_version, global.version, global.copyright, global.written);
     printf("\
 D Language Documentation: http://www.digitalmars.com/d/1.0/index.html\n\
@@ -187,7 +187,6 @@
   -Hf<filename>  write 'header' file to <filename>\n\
   --help         print help\n\
   -I<path>       where to look for imports\n\
-  -E<path>       where to look for the core runtime\n\
   -J<path>       where to look for string imports\n\
   -inline        do function inlining\n\
   -Llinkerflag   pass linkerflag to link\n\
@@ -206,6 +205,7 @@
   -quiet         suppress unnecessary messages\n\
   -release       compile release version\n\
   -run srcfile args...   run resulting program, passing args\n\
+  -R<path>       provide path to the directory containing the runtime library\n\
   -unittest      compile in unit tests\n\
   -v             verbose\n\
   -vv            very verbose (does not include -v)\n\
@@ -386,15 +386,15 @@
             }
         }
         else if (strcmp(p + 1, "forcebe") == 0)
-		global.params.forceBE = 1;
+            global.params.forceBE = 1;
         else if (strcmp(p + 1, "noruntime") == 0)
-		global.params.noruntime = 1;
+            global.params.noruntime = 1;
         else if (strcmp(p + 1, "noverify") == 0)
-        global.params.novalidate = 1;
+            global.params.novalidate = 1;
         else if (strcmp(p + 1, "dis") == 0)
-        global.params.disassemble = 1;
+            global.params.disassemble = 1;
         else if (strcmp(p + 1, "annotate") == 0)
-        global.params.llvmAnnotate = 1;
+            global.params.llvmAnnotate = 1;
 	    else if (p[1] == 'o')
 	    {
 		switch (p[2])
@@ -503,9 +503,9 @@
 		    global.params.fileImppath = new Array();
 		global.params.fileImppath->push(p + 2);
 	    }
-        else if (p[1] == 'E')
+        else if (p[1] == 'R')
         {
-        global.params.runtimeImppath = p+2;
+        global.params.runtimePath = p+2;
         }
 	    else if (memcmp(p + 1, "debug", 5) == 0 && p[6] != 'l')
 	    {
@@ -671,7 +671,7 @@
 
     if (global.params.llvmArch == 0) {
         std::string err_str;
-        const llvm::TargetMachineRegistry::Entry* e = llvm::TargetMachineRegistry::getClosestTargetForJIT(err_str);
+        const llvm::TargetMachineRegistry::entry* e = llvm::TargetMachineRegistry::getClosestTargetForJIT(err_str);
         if (e == 0) {
             error("Failed to find a default target machine: %s", err_str.c_str());
             fatal();