diff options
Diffstat (limited to 'compiler/llvmGen')
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen.hs | 11 | ||||
| -rw-r--r-- | compiler/llvmGen/LlvmCodeGen/Ppr.hs | 63 |
2 files changed, 11 insertions, 63 deletions
diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs index 5596d599c4..d5d76ea4ba 100644 --- a/compiler/llvmGen/LlvmCodeGen.hs +++ b/compiler/llvmGen/LlvmCodeGen.hs @@ -71,7 +71,7 @@ llvmCodeGen dflags h us cmm_stream llvmCodeGen' :: Stream.Stream LlvmM RawCmmGroup () -> LlvmM () llvmCodeGen' cmm_stream = do -- Preamble - renderLlvm pprLlvmHeader + renderLlvm header ghcInternalFunctions cmmMetaLlvmPrelude @@ -84,6 +84,15 @@ llvmCodeGen' cmm_stream -- Postamble cmmUsedLlvmGens + where + header :: SDoc + header = sdocWithDynFlags $ \dflags -> + let target = LLVM_TARGET + layout = case lookup target (llvmTargets dflags) of + Just (LlvmTarget dl _ _) -> dl + Nothing -> error $ "Failed to lookup the datalayout for " ++ target ++ "; available targets: " ++ show (map fst $ llvmTargets dflags) + in text ("target datalayout = \"" ++ layout ++ "\"") + $+$ text ("target triple = \"" ++ target ++ "\"") llvmGroupLlvmGens :: RawCmmGroup -> LlvmM () llvmGroupLlvmGens cmm = do diff --git a/compiler/llvmGen/LlvmCodeGen/Ppr.hs b/compiler/llvmGen/LlvmCodeGen/Ppr.hs index 37d1391519..e7444ee226 100644 --- a/compiler/llvmGen/LlvmCodeGen/Ppr.hs +++ b/compiler/llvmGen/LlvmCodeGen/Ppr.hs @@ -4,7 +4,7 @@ -- | Pretty print helpers for the LLVM Code generator. -- module LlvmCodeGen.Ppr ( - pprLlvmHeader, pprLlvmCmmDecl, pprLlvmData, infoSection + pprLlvmCmmDecl, pprLlvmData, infoSection ) where #include "HsVersions.h" @@ -15,7 +15,6 @@ import LlvmCodeGen.Data import CLabel import Cmm -import Platform import FastString import Outputable @@ -26,66 +25,6 @@ import Unique -- * Top level -- --- | Header code for LLVM modules -pprLlvmHeader :: SDoc -pprLlvmHeader = moduleLayout - - --- | LLVM module layout description for the host target -moduleLayout :: SDoc -moduleLayout = sdocWithPlatform $ \platform -> - case platform of - Platform { platformArch = ArchX86, platformOS = OSDarwin } -> - text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128-n8:16:32\"" - $+$ text "target triple = \"i386-apple-darwin9.8\"" - Platform { platformArch = ArchX86, platformOS = OSMinGW32 } -> - text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f80:128:128-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32\"" - $+$ text "target triple = \"i686-pc-win32\"" - Platform { platformArch = ArchX86, platformOS = OSLinux } -> - text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32\"" - $+$ text "target triple = \"i386-pc-linux-gnu\"" - Platform { platformArch = ArchX86_64, platformOS = OSDarwin } -> - text "target datalayout = \"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64\"" - $+$ text "target triple = \"x86_64-apple-darwin10.0.0\"" - Platform { platformArch = ArchX86_64, platformOS = OSLinux } -> - text "target datalayout = \"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64\"" - $+$ text "target triple = \"x86_64-linux-gnu\"" - Platform { platformArch = ArchARM {}, platformOS = OSLinux } -> - text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32\"" - $+$ text "target triple = \"armv6-unknown-linux-gnueabihf\"" - Platform { platformArch = ArchARM {}, platformOS = OSAndroid } -> - text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32\"" - $+$ text "target triple = \"arm-unknown-linux-androideabi\"" - Platform { platformArch = ArchARM {}, platformOS = OSQNXNTO } -> - text "target datalayout = \"e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:64:128-a0:0:64-n32\"" - $+$ text "target triple = \"arm-unknown-nto-qnx8.0.0eabi\"" - Platform { platformArch = ArchARM {}, platformOS = OSiOS } -> - text "target datalayout = \"e-m:o-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32\"" - $+$ text "target triple = \"thumbv7-apple-ios7.0.0\"" - Platform { platformArch = ArchARM64, platformOS = OSiOS } -> - text "target datalayout = \"e-m:o-i64:64-i128:128-n32:64-S128\"" - $+$ text "target triple = \"arm64-apple-ios7.0.0\"" - Platform { platformArch = ArchX86, platformOS = OSiOS } -> - text "target datalayout = \"e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128\"" - $+$ text "target triple = \"i386-apple-ios7.0.0\"" - Platform { platformArch = ArchX86_64, platformOS = OSiOS } -> - text "target datalayout = \"e-m:o-i64:64-f80:128-n8:16:32:64-S128\"" - $+$ text "target triple = \"x86_64-apple-ios7.0.0\"" - Platform { platformArch = ArchARM64, platformOS = OSLinux } -> - text "target datalayout = \"e-m:e-i64:64-i128:128-n32:64-S128\"" - $+$ text "target triple = \"aarch64-unknown-linux-gnu\"" - _ -> - if platformIsCrossCompiling platform - then panic "LlvmCodeGen.Ppr: Cross compiling without valid target info." - else empty - -- If you see the above panic, GHC is missing the required target datalayout - -- and triple information. You can obtain this info by compiling a simple - -- 'hello world' C program with the clang C compiler eg: - -- clang -S hello.c -emit-llvm -o - - -- and the first two lines of hello.ll should provide the 'target datalayout' - -- and 'target triple' lines required. - - -- | Pretty print LLVM data code pprLlvmData :: LlvmData -> SDoc pprLlvmData (globals, types) = |