optllvm broken on master?

[Luke Iannini]

Whoops, that's my fault; it shouldn't have slipped into the patch -- this is
required for LLVM 3.6 (which I was using to work on my ARM64 patch), but
clearly isn't backwards compatible.

I wonder what's best to do for this? Would it be correct to switch on LLVM
versions or should this be considered a bug in LLVM? (it was the only
change needed for 3.6)

I will submit a ticket to revert that line in the meantime.

Thanks!
Luke

On Thu, Nov 20, 2014 at 2:26 AM, Dr. ERDI Gergo <gergo at erdi.hu> wrote:

> Hi,
>
> Tests fail on master when run the optllvm way, e.g.:
>
> /usr/bin/opt: /tmp/ghc16190_0/ghc16190_2.ll:611:25: error: expected
> 'global' or 'constant'
> @newCAF$alias = private alias i8* @newCAF
>
> I think it's the change in d87fa34:
>
> 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
>
>
>
> --
>
>   .--= ULLA! =-----------------.
>    \     http://gergo.erdi.hu   \
>     `---= gergo at erdi.hu =-------'
> If it ain't broke, I can fix it.
> _______________________________________________
> ghc-devs mailing list
> ghc-devs at haskell.org
> http://www.haskell.org/mailman/listinfo/ghc-devs
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/ghc-devs/attachments/20141120/21950b6f/attachment.html>