[commit: ghc] wip/T9535: Automatic merge by 'arc land' (ce6ec3b)

[git at git.haskell.org]

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

On branch  : wip/T9535
Link       : http://ghc.haskell.org/trac/ghc/changeset/ce6ec3bb20a0e4ff68970089681f1eb393e68760/ghc

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

commit ce6ec3bb20a0e4ff68970089681f1eb393e68760
Merge: 89b3142 31f43e8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Sep 2 11:49:24 2014 +0200

    Automatic merge by 'arc land'
    
    Conflicts:
    	testsuite/tests/perf/haddock/all.T



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

ce6ec3bb20a0e4ff68970089681f1eb393e68760
 aclocal.m4                                         |  24 +-
 compiler/main/SysTools.lhs                         |  56 +++-
 compiler/parser/Lexer.x                            | 115 +++++---
 compiler/utils/StringBuffer.lhs                    |  45 +++-
 includes/Stg.h                                     |  18 --
 rts/ThreadPaused.c                                 |  21 +-
 sync-all                                           | 296 +++++++++++----------
 testsuite/.gitignore                               |   2 +
 testsuite/tests/parser/unicode/T6016.hs            |  34 +++
 testsuite/tests/parser/unicode/all.T               |   1 +
 testsuite/tests/perf/haddock/all.T                 |   2 +-
 .../tests/simplCore/should_compile/T6056.stderr    |   4 +-
 utils/genprimopcode/Main.hs                        |  10 +-
 13 files changed, 386 insertions(+), 242 deletions(-)