[commit: ghc] wip/llvm-3.6: RFC: Move to LLVM 3.6 (6157817)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/llvm-3.6
Link       : http://ghc.haskell.org/trac/ghc/changeset/6157817776a0cb493b250a358b8a636cf0f8283a/ghc

>---------------------------------------------------------------

commit 6157817776a0cb493b250a358b8a636cf0f8283a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Nov 28 11:14:17 2014 -0500

    RFC: Move to LLVM 3.6
    
    Summary:
    Here we rework the LLVM backend to support LLVM 3.6 exclusively and refactor
    TNTC to take advantage of LLVM's new and improved prefix data support..
    
    Test Plan: Validate, look at emitted code
    
    Reviewers: dterei, austin, scpmw
    
    Subscribers: thomie, carter
    
    Differential Revision: https://phabricator.haskell.org/D530


>---------------------------------------------------------------

6157817776a0cb493b250a358b8a636cf0f8283a
 compiler/llvmGen/Llvm/PpLlvm.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/llvmGen/Llvm/PpLlvm.hs b/compiler/llvmGen/Llvm/PpLlvm.hs
index 050d200..de76766 100644
--- a/compiler/llvmGen/Llvm/PpLlvm.hs
+++ b/compiler/llvmGen/Llvm/PpLlvm.hs
@@ -77,12 +77,12 @@ ppLlvmGlobal (LMGlobal var@(LMGlobalVar _ _ link x a c) dat) =
             Nothing   -> ppr (pLower $ getVarType var)
 
         -- Position of linkage is different for aliases.
-        const_link = case c of
-          Global   -> ppr link <+> text "global"
-          Constant -> ppr link <+> text "constant"
-          Alias    -> ppr link <+> text "alias"
+        const = case c of
+          Global   -> text "global"
+          Constant -> text "constant"
+          Alias    -> text "alias"
 
-    in ppAssignment var $ const_link <+> rhs <> sect <> align
+    in ppAssignment var $ ppr link <+> const <+> rhs <> sect <> align
        $+$ newLine
 
 ppLlvmGlobal (LMGlobal var val) = sdocWithDynFlags $ \dflags ->