Changes to ghc

Changes to ghc:
commit 5f3c5384df59717ca8013c5df8d1f65692867825
Author: Edward Z. Yang <ezyang@cs.stanford.edu>
Date:   Tue Jul 1 14:43:50 2014 +0100

    Partially fix #9003 by reverting bad numbering.

    Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>