From f1a72b2938cc289c9a3879301ab445ec9efd63dd Mon Sep 17 00:00:00 2001 From: David Terei Date: Tue, 22 Jun 2010 14:40:44 +0000 Subject: 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. --- compiler/main/SysTools.lhs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'compiler/main/SysTools.lhs') diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index 29889db4f3..12b73d3bf2 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -18,7 +18,6 @@ module SysTools ( runAs, runLink, -- [Option] -> IO () runMkDLL, runWindres, - runLlvmAs, runLlvmOpt, runLlvmLlc, @@ -223,8 +222,7 @@ initSysTools mbMinusB dflags0 ld_prog = gcc_prog -- figure out llvm location. (TODO: Acutally implement). - ; let la_prog = "llvm-as" - lc_prog = "llc" + ; let lc_prog = "llc" lo_prog = "opt" ; return dflags1{ @@ -244,7 +242,6 @@ initSysTools mbMinusB dflags0 pgm_T = touch_path, pgm_sysman = top_dir ++ "/ghc/rts/parallel/SysMan", pgm_windres = windres_path, - pgm_la = (la_prog,[]), pgm_lo = (lo_prog,[]), pgm_lc = (lc_prog,[]) -- Hans: this isn't right in general, but you can @@ -392,11 +389,6 @@ runAs dflags args = do mb_env <- getGccEnv args1 runSomethingFiltered dflags id "Assembler" p args1 mb_env -runLlvmAs :: DynFlags -> [Option] -> IO () -runLlvmAs dflags args = do - let (p,args0) = pgm_la dflags - runSomething dflags "LLVM Assembler" p (args0++args) - runLlvmOpt :: DynFlags -> [Option] -> IO () runLlvmOpt dflags args = do let (p,args0) = pgm_lo dflags -- cgit v1.2.1