[commit: ghc] master: Revert "Enable new warning for fragile/incorrect CPP #if usage" (819c3db)

git at git.haskell.org git at git.haskell.org
Wed Apr 5 16:13:04 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/819c3db73acf5246cd332ad3062c61b7a2e8ee68/ghc

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

commit 819c3db73acf5246cd332ad3062c61b7a2e8ee68
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Apr 5 12:01:12 2017 -0400

    Revert "Enable new warning for fragile/incorrect CPP #if usage"
    
    This is causing too much platform dependent breakage at the moment. We
    will need a more rigorous testing strategy before this can be
    merged again.
    
    This reverts commit 7e340c2bbf4a56959bd1e95cdd1cfdb2b7e537c2.


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

819c3db73acf5246cd332ad3062c61b7a2e8ee68
 compiler/utils/Util.hs         |  2 +-
 ghc/GHCi/UI.hs                 |  2 +-
 includes/CodeGen.Platform.hs   | 57 +++++++++++++++++++-----------------------
 includes/Stg.h                 |  6 ++---
 includes/rts/OSThreads.h       |  4 +--
 includes/stg/HaskellMachRegs.h | 36 ++++++--------------------
 includes/stg/MachRegs.h        | 14 +++++------
 includes/stg/RtsMachRegs.h     | 36 ++++++--------------------
 includes/stg/SMP.h             | 37 +++++++++++++--------------
 libraries/ghci/GHCi/ObjLink.hs |  2 +-
 mk/warnings.mk                 |  4 +--
 rts/LinkerInternals.h          | 11 ++++----
 rts/OldARMAtomic.c             |  2 +-
 rts/PrimOps.cmm                |  4 +--
 rts/RtsUtils.c                 |  4 +--
 rts/Schedule.c                 | 16 ++++++------
 rts/Threads.c                  |  2 +-
 rts/ghc.mk                     |  3 ---
 rts/linker/MachO.c             | 10 +++-----
 rts/posix/GetTime.c            |  2 +-
 rts/posix/OSMem.c              |  8 +++---
 rts/posix/OSThreads.c          |  2 +-
 rts/posix/itimer/Pthread.c     |  6 ++---
 rts/sm/CNF.c                   |  2 +-
 rts/sm/GCUtils.c               |  2 +-
 rts/sm/GCUtils.h               |  2 +-
 rts/sm/MBlock.c                |  2 +-
 27 files changed, 112 insertions(+), 166 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 819c3db73acf5246cd332ad3062c61b7a2e8ee68


More information about the ghc-commits mailing list