diff options
| author | Kelly Wilson <wilsonk@cpsc.ucalgary.ca> | 2011-05-16 12:14:24 -0600 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2011-05-16 14:07:43 -0700 |
| commit | b91ef944c8719933b66b4b649cfe3d5e1a676402 (patch) | |
| tree | ca2121dc9988a461170f01ddf7f0b579c950093e /src | |
| parent | 196351aa44e920e032d54545ccb74443858f3055 (diff) | |
| download | rust-b91ef944c8719933b66b4b649cfe3d5e1a676402.tar.gz rust-b91ef944c8719933b66b4b649cfe3d5e1a676402.zip | |
Replace --bitcode with the canonical --emit-llvm
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp/back/link.rs | 6 | ||||
| -rw-r--r-- | src/comp/driver/rustc.rs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs index 1652863de97..97bfb87e2e3 100644 --- a/src/comp/back/link.rs +++ b/src/comp/back/link.rs @@ -171,8 +171,8 @@ mod write { _str::buf(output), LLVMAssemblyFile); } - // Save the object file for -c or only --save-temps - // is used and an exe is built + // Save the object file for -c or --save-temps alone + // This .o is needed when an exe is built if ((opts.output_type == output_type_object) || (opts.output_type == output_type_exe)) { llvm::LLVMRustWriteOutputFile(pm.llpm, llmod, @@ -197,7 +197,7 @@ mod write { ret; } - // If only a bitcode file is asked for by using the '--bitcode' + // If only a bitcode file is asked for by using the '--emit-llvm' // flag, then output it here llvm::LLVMRunPassManager(pm.llpm, llmod); diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs index 279f69ac616..d538e1711a6 100644 --- a/src/comp/driver/rustc.rs +++ b/src/comp/driver/rustc.rs @@ -155,7 +155,7 @@ options: -O optimize -S compile only; do not assemble or link -c compile and assemble, but do not link - --bitcode produce an LLVM bitcode file + --emit-llvm produce an LLVM bitcode file --save-temps write intermediate files in addition to normal output --stats gather and report various compilation statistics --time-passes time the individual phases of the compiler @@ -207,7 +207,7 @@ fn main(vec[str] args) { auto opts = vec(optflag("h"), optflag("help"), optflag("v"), optflag("version"), - optflag("glue"), optflag("bitcode"), + optflag("glue"), optflag("emit-llvm"), optflag("pretty"), optflag("ls"), optflag("parse-only"), optflag("O"), optflag("shared"), optmulti("L"), optflag("S"), optflag("c"), optopt("o"), optflag("g"), @@ -250,7 +250,7 @@ fn main(vec[str] args) { output_type = link::output_type_assembly; } else if (opt_present(match, "c")) { output_type = link::output_type_object; - } else if (opt_present(match, "bitcode")) { + } else if (opt_present(match, "emit-llvm")) { output_type = link::output_type_bitcode; } |