[commit: ghc] local-gc: Merge commit '5463b55b7dadc1e9918edb2d8666bf3ed195bc61' into local-gc (2385841)

[Simon Marlow]

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

On branch  : local-gc

http://hackage.haskell.org/trac/ghc/changeset/238584122e4b1d172aa3712b3104914ed0b31ee8

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

commit 238584122e4b1d172aa3712b3104914ed0b31ee8
Merge: 13ac015... 5463b55...
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sun Jun 5 14:34:13 2011 +0100

    Merge commit '5463b55b7dadc1e9918edb2d8666bf3ed195bc61' into local-gc

 compiler/main/DriverPipeline.hs |    6 +-
 ghc/hschooks.c                  |    1 -
 includes/RtsFlags.h             |    5 -
 includes/RtsOpts.h              |    8 +-
 includes/rts/Flags.h            |    7 -
 rts/RtsFlags.c                  |  242 +++++++++++++++++++++++++--------------
 rts/RtsFlags.h                  |   23 ++++
 rts/RtsStartup.c                |    4 +-
 rts/ghc.mk                      |    1 +
 rts/hooks/RtsOptsEnabled.c      |    2 +-
 10 files changed, 190 insertions(+), 109 deletions(-)

diff --cc rts/RtsStartup.c
index 3cb7e78,b860667..84b48bd
--- a/rts/RtsStartup.c
+++ b/rts/RtsStartup.c
@@@ -129,10 -130,12 +130,9 @@@ hs_init(int *argc, char **argv[]
      /* Parse the flags, separating the RTS flags from the programs args */
      if (argc != NULL && argv != NULL) {
  	setFullProgArgv(*argc,*argv);
- 	setupRtsFlags(argc, *argv, &rts_argc, rts_argv);
- 	setProgArgv(*argc,*argv);
+         setupRtsFlags(argc, *argv);
      }
  
 -    /* Initialise the stats department, phase 1 */
 -    initStats1();
 -
  #ifdef USE_PAPI
      papi_init();
  #endif