ghc-7.10 branch broken

[Peter Trommler]

Dear Simon and Ben,

The line starting in `sp` must be deleted. It looks like a merge problem
in commit e22d7dc434b64709a4b19b11f2e0a41676c04035.

I attached a patch.
@Ben: Would you mind committing it on branch ghc-7.10 for me?

Thanks,

Peter

> On 06.10.2015, at 14:07, Simon Peyton Jones <simonpj at microsoft.com> wrote:
> 
> On the ghc-7.10 branch, PPC.Regs has duplicate exports (see below). The offending lines are
> 
>        fReg,
>        sp, r3, r4, r27, r28, r30,
>        r0, sp, r3, r4, r27, r28, r30,
>        tmpReg,
> and indeed there are duplicates.  Why?
> 
> git branch -v
> * ghc-7.10     e22d7dc nativeGen PPC: fix > 16 bit offsets in stack handling
>  master       f17992a [behind 1397] Updaete perf numbers for 32-bit machines
>  wip/T10527   eb66575 Use lazy substitution in simplCast
>  wip/T10527-2 9e4908b Add an ambient Id substitution to Subst
> Simon
> 
> 
> 
> compiler/nativeGen/PPC/Regs.hs:41:13: Warning:
> 
>    ‘sp’ is exported by ‘sp’ and ‘sp’
> 
> 
> 
> compiler/nativeGen/PPC/Regs.hs:41:17: Warning:
> 
>    ‘r3’ is exported by ‘r3’ and ‘r3’
> 
> 
> 
> compiler/nativeGen/PPC/Regs.hs:41:21: Warning:
> 
>    ‘r4’ is exported by ‘r4’ and ‘r4’
> 
> 
> 
> _______________________________________________
> ghc-devs mailing list
> ghc-devs at haskell.org
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-merge-error.patch
Type: application/octet-stream
Size: 681 bytes
Desc: not available
URL: <http://mail.haskell.org/pipermail/ghc-devs/attachments/20151006/a31e0726/attachment.obj>