[commit: ghc] master: Fixes to the rts C flags for the debug way (e5085db)

[Simon Marlow]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e5085db5d16f904f9307445fbafc206283f630c7

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

commit e5085db5d16f904f9307445fbafc206283f630c7
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Thu Feb 14 09:09:53 2013 +0000

    Fixes to the rts C flags for the debug way
    
    An earlier attempt at cleaning things up had made the debug way
    compile with optimisation due to flag ordering issues.

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

 mk/config.mk.in |    4 ++--
 rts/ghc.mk      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index e40f569..987ee32 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -370,8 +370,8 @@ LAX_DEPENDENCIES = NO
 # optimisation both for C code (-optc-O2) and .cmm code (-O2).  For
 # the debugging RTS flavour, rts/ghc.mk overrides these to turn off
 # optimisation.
-GhcRtsHcOpts=-optc-O2 -O2
-GhcRtsCcOpts=-fomit-frame-pointer
+GhcRtsHcOpts=-O2
+GhcRtsCcOpts=-O2 -fomit-frame-pointer
 
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
diff --git a/rts/ghc.mk b/rts/ghc.mk
index 58d46de..7cbb96e 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -137,7 +137,7 @@ rts_dist_$1_CC_OPTS := $$(GhcRtsCcOpts)
 # The per-way CC_OPTS
 ifneq "$$(findstring debug, $1)" ""
 rts_dist_$1_HC_OPTS += -O0
-rts_dist_$1_CC_OPTS += -g -O0
+rts_dist_$1_CC_OPTS += -fno-omit-frame-pointer -g -O0
 endif
 
 ifneq "$$(findstring dyn, $1)" ""