[commit: ghc] master: Mark HPC ticks labels as dynamic (3285a3d)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3285a3d5bc7419464f5d2e6cef7c3adb9bca65c3/ghc

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

commit 3285a3d5bc7419464f5d2e6cef7c3adb9bca65c3
Author: Reid Barton <rwbarton at gmail.com>
Date:   Tue Jul 1 01:04:18 2014 -0400

    Mark HPC ticks labels as dynamic
    
    This enables GHC's PIC machinery for accessing tickboxes of other
    packages correctly when building dynamic libraries. Previously
    GHC was doing strange and wrong things in that situation. See #9012.


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

3285a3d5bc7419464f5d2e6cef7c3adb9bca65c3
 compiler/cmm/CLabel.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs
index 407002f..9dccd29 100644
--- a/compiler/cmm/CLabel.hs
+++ b/compiler/cmm/CLabel.hs
@@ -888,6 +888,8 @@ labelDynamic dflags this_pkg this_mod lbl =
 
    PlainModuleInitLabel m -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
 
+   HpcTicksLabel m        -> not (gopt Opt_Static dflags) && this_pkg /= (modulePackageId m)
+
    -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves.
    _                 -> False
   where os = platformOS (targetPlatform dflags)