diff options
| author | David Terei <davidterei@gmail.com> | 2010-06-22 14:40:44 +0000 |
|---|---|---|
| committer | David Terei <davidterei@gmail.com> | 2010-06-22 14:40:44 +0000 |
| commit | f1a72b2938cc289c9a3879301ab445ec9efd63dd (patch) | |
| tree | 5195be801d188a96e892be7fc3cfb15506bb04fb /compiler/main/DriverPhases.hs | |
| parent | ab1845f0b37904b0517b07fa822ad07e6628018c (diff) | |
| download | haskell-f1a72b2938cc289c9a3879301ab445ec9efd63dd.tar.gz | |
Remove LlvmAs phase as the llvm opt tool now handles this phase
This phase originally invoked the llvm-as tool that turns a textual
llvm assembly file into a bit code file for the rest of llvm to deal
with. Now the llvm opt tool can do this itself, so we don't need to
use llvm-as anymore.
Diffstat (limited to 'compiler/main/DriverPhases.hs')
| -rw-r--r-- | compiler/main/DriverPhases.hs | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/compiler/main/DriverPhases.hs b/compiler/main/DriverPhases.hs index 398da79b79..4e7c05e316 100644 --- a/compiler/main/DriverPhases.hs +++ b/compiler/main/DriverPhases.hs @@ -80,9 +80,8 @@ data Phase | SplitMangle -- after mangler if splitting | SplitAs | As - | LlvmAs -- LLVM assembly to bitcode file - | LlvmOpt -- Run LLVM opt tool over llvm assembly - | LlvmLlc -- LLVM bitcode to native assembly + | LlvmOpt -- Run LLVM opt tool over llvm assembly + | LlvmLlc -- LLVM bitcode to native assembly | CmmCpp -- pre-process Cmm source | Cmm -- parse & compile Cmm code @@ -112,7 +111,6 @@ eqPhase Mangle Mangle = True eqPhase SplitMangle SplitMangle = True eqPhase SplitAs SplitAs = True eqPhase As As = True -eqPhase LlvmAs LlvmAs = True eqPhase LlvmOpt LlvmOpt = True eqPhase LlvmLlc LlvmLlc = True eqPhase CmmCpp CmmCpp = True @@ -139,9 +137,8 @@ nextPhase HCc = Mangle nextPhase Mangle = SplitMangle nextPhase SplitMangle = As nextPhase As = SplitAs -nextPhase LlvmAs = LlvmOpt -nextPhase LlvmOpt = LlvmLlc -nextPhase LlvmLlc = As +nextPhase LlvmOpt = LlvmLlc +nextPhase LlvmLlc = As nextPhase SplitAs = StopLn nextPhase Ccpp = As nextPhase Cc = As @@ -169,9 +166,8 @@ startPhase "raw_s" = Mangle startPhase "split_s" = SplitMangle startPhase "s" = As startPhase "S" = As -startPhase "ll" = LlvmAs -startPhase "bc" = LlvmOpt -startPhase "opt_bc" = LlvmLlc +startPhase "ll" = LlvmOpt +startPhase "bc" = LlvmLlc startPhase "o" = StopLn startPhase "cmm" = CmmCpp startPhase "cmmcpp" = Cmm @@ -196,9 +192,8 @@ phaseInputExt Cc = "c" phaseInputExt Mangle = "raw_s" phaseInputExt SplitMangle = "split_s" -- not really generated phaseInputExt As = "s" -phaseInputExt LlvmAs = "ll" -phaseInputExt LlvmOpt = "bc" -phaseInputExt LlvmLlc = "opt_bc" +phaseInputExt LlvmOpt = "ll" +phaseInputExt LlvmLlc = "bc" phaseInputExt SplitAs = "split_s" -- not really generated phaseInputExt CmmCpp = "cmm" phaseInputExt Cmm = "cmmcpp" @@ -210,7 +205,7 @@ haskellish_src_suffixes, haskellish_suffixes, cish_suffixes, haskellish_src_suffixes = haskellish_user_src_suffixes ++ [ "hspp", "hscpp", "hcr", "cmm" ] haskellish_suffixes = haskellish_src_suffixes ++ ["hc", "raw_s"] -cish_suffixes = [ "c", "cpp", "C", "cc", "cxx", "s", "S", "ll", "bc", "opt_bc" ] +cish_suffixes = [ "c", "cpp", "C", "cc", "cxx", "s", "S", "ll", "bc" ] extcoreish_suffixes = [ "hcr" ] -- Will not be deleted as temp files: haskellish_user_src_suffixes = [ "hs", "lhs", "hs-boot", "lhs-boot" ] |