diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-06-16 15:03:01 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-07-16 20:31:47 +0200 |
| commit | a9bc54766ddd1bdb011f1656ad58fb409055d08f (patch) | |
| tree | 4d91f1a2c4c0b44b61c910a11b998bc71154f71a /compiler/main | |
| parent | b35e01c6c39d9f2d58009722e24d89049aa94287 (diff) | |
| download | haskell-a9bc54766ddd1bdb011f1656ad58fb409055d08f.tar.gz | |
Log heap profiler samples to event log
Test Plan: Try it
Reviewers: hvr, simonmar, austin, erikd
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1722
GHC Trac Issues: #11094
Diffstat (limited to 'compiler/main')
| -rw-r--r-- | compiler/main/DynFlags.hs | 1 | ||||
| -rw-r--r-- | compiler/main/Packages.hs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index ffb5b33689..24746d6836 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1264,6 +1264,7 @@ allowed_combination way = and [ x `allowedWith` y (WayCustom {}) `allowedWith` _ = True WayThreaded `allowedWith` WayProf = True WayThreaded `allowedWith` WayEventLog = True + WayProf `allowedWith` WayEventLog = True _ `allowedWith` _ = False mkBuildTag :: [Way] -> String diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs index 4710de1a20..ecec982422 100644 --- a/compiler/main/Packages.hs +++ b/compiler/main/Packages.hs @@ -1233,8 +1233,8 @@ packageHsLibs dflags p = map (mkDynName . addSuffix) (hsLibraries p) -- the name of a shared library is libHSfoo-ghc<version>.so -- we leave out the _dyn, because it is superfluous - -- debug RTS includes support for -eventlog - ways2 | WayDebug `elem` ways1 + -- debug and profiled RTSs include support for -eventlog + ways2 | WayDebug `elem` ways1 || WayProf `elem` ways1 = filter (/= WayEventLog) ways1 | otherwise = ways1 |