X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FSysTools.lhs;h=12b73d3bf259a0c47c5cadba0ec230ea8364c717;hb=f1a72b2938cc289c9a3879301ab445ec9efd63dd;hp=29889db4f3dfd7baa2ae33161ab81715c1e4508d;hpb=49a8e5c021009430d373d6224b29004c7d18c408;p=ghc-hetmet.git diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index 29889db..12b73d3 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