Commit e778d3d7 authored by Ian Lynagh's avatar Ian Lynagh

Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

parents 50890235 5490e71b
......@@ -719,7 +719,7 @@ cvtLit (CharL c) = do { force c; return $ HsChar c }
cvtLit (StringL s) = do { let { s' = mkFastString s }
; force s'
; return $ HsString s' }
cvtLit (StringPrimL s) = do { let { s' = mkFastString s }
cvtLit (StringPrimL s) = do { let { s' = mkFastStringByteList s }
; force s'
; return $ HsStringPrim s' }
cvtLit _ = panic "Convert.cvtLit: Unexpected literal"
......
......@@ -202,6 +202,7 @@ typedef struct _GCStats {
StgDouble wall_seconds;
} GCStats;
void getGCStats (GCStats *s);
rtsBool getGCStatsEnabled (void);
// These don't change over execution, so do them elsewhere
// StgDouble init_cpu_seconds;
......
......@@ -1072,6 +1072,7 @@ typedef struct _RtsSymbolVal {
SymI_HasProto(getOrSetSystemEventThreadEventManagerStore) \
SymI_HasProto(getOrSetSystemEventThreadIOManagerThreadStore) \
SymI_HasProto(getGCStats) \
SymI_HasProto(getGCStatsEnabled) \
SymI_HasProto(genSymZh) \
SymI_HasProto(genericRaise) \
SymI_HasProto(getProgArgv) \
......
......@@ -922,6 +922,11 @@ extern HsInt64 getAllocations( void )
/* EZY: I'm not convinced I got all the casting right. */
extern rtsBool getGCStatsEnabled( void )
{
return RtsFlags.GcFlags.giveStats != NO_GC_STATS;
}
extern void getGCStats( GCStats *s )
{
nat total_collections = 0;
......
......@@ -15,6 +15,7 @@ utils/runghc_dist-install_USES_CABAL = YES
utils/runghc_dist-install_PROG = runghc$(exeext)
utils/runghc_dist-install_SHELL_WRAPPER = YES
utils/runghc_dist-install_INSTALL_SHELL_WRAPPER = YES
utils/runghc_dist-install_INSTALL_SHELL_WRAPPER_NAME = runghc-$(ProjectVersion)
utils/runghc_dist-install_EXTRA_HC_OPTS = -cpp -DVERSION="\"$(ProjectVersion)\""
ifneq "$(BINDIST)" "YES"
......@@ -35,5 +36,7 @@ else
install_runhaskell:
$(call removeFiles,"$(DESTDIR)$(bindir)/runhaskell")
$(LN_S) runghc "$(DESTDIR)$(bindir)/runhaskell"
$(call removeFiles,"$(DESTDIR)$(bindir)/runghc")
$(LN_S) runghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/runghc"
endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment