[commit: ghc] wip/llvm-3.6: llvmGen: LLVM 3.6 makes alias grammar consistent (da569bf)

git at git.haskell.org git at git.haskell.org
Tue Jan 20 16:54:35 UTC 2015


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

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

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

commit da569bfd34333a536843c8bac9409ee5173df7d1
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Nov 27 22:39:55 2014 +0100

    llvmGen: LLVM 3.6 makes alias grammar consistent
    
    It used to be that the alias grammar was,
    
        @<Name> = [Visibility] [DLLStorageClass] [ThreadLocal] [unnamed_addr] alias [Linkage] <AliaseeTy> @<Aliasee>
    
    As of LLVM 3.6 it is now,
    
        @<Name> = [Linkage] [Visibility] [DLLStorageClass] [ThreadLocal] [unnamed_addr] alias <AliaseeTy> @<Aliasee>
    
    Namely the linkage has been moved to be consistent with the other
    global variable types.


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

da569bfd34333a536843c8bac9409ee5173df7d1
 compiler/llvmGen/Llvm/PpLlvm.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/llvmGen/Llvm/PpLlvm.hs b/compiler/llvmGen/Llvm/PpLlvm.hs
index 7307725..cdc407c 100644
--- a/compiler/llvmGen/Llvm/PpLlvm.hs
+++ b/compiler/llvmGen/Llvm/PpLlvm.hs
@@ -80,7 +80,7 @@ ppLlvmGlobal (LMGlobal var@(LMGlobalVar _ _ link x a c) dat) =
         const_link = case c of
           Global   -> ppr link <+> text "global"
           Constant -> ppr link <+> text "constant"
-          Alias    -> text "alias" <+> ppr link
+          Alias    -> ppr link <+> text "alias"
 
     in ppAssignment var $ const_link <+> rhs <> sect <> align
        $+$ newLine



More information about the ghc-commits mailing list