diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2017-04-17 12:56:20 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-04-17 12:56:31 +0100 |
commit | a92ff5d66182d992d02dfaad4c446ad074582368 (patch) | |
tree | ed086f1c65efb717cc7cc8ade62a186d719fcd4d /compiler/cmm/CLabel.hs | |
parent | 29ef71412af48e1bbf7739d1dbc4c4feb3b9a86a (diff) | |
download | haskell-a92ff5d66182d992d02dfaad4c446ad074582368.tar.gz |
hs_add_root() RTS API removal
Before ghc-7.2 hs_add_root() had to be used to initialize haskell
modules when haskell was called from FFI.
commit a52ff7619e8b7d74a9d933d922eeea49f580bca8
("Change the way module initialisation is done (#3252, #4417)")
removed needs for hs_add_root() and made function a no-op.
For backward compatibility '__stginit_<module>' symbol was
not removed.
This change removes no-op hs_add_root() function and unused
'__stginit_<module>' symbol from each haskell module.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Test Plan: ./validate
Reviewers: simonmar, austin, bgamari, erikd
Reviewed By: simonmar
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3460
Diffstat (limited to 'compiler/cmm/CLabel.hs')
-rw-r--r-- | compiler/cmm/CLabel.hs | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/compiler/cmm/CLabel.hs b/compiler/cmm/CLabel.hs index 5f13bed309..d7051f76b0 100644 --- a/compiler/cmm/CLabel.hs +++ b/compiler/cmm/CLabel.hs @@ -47,8 +47,6 @@ module CLabel ( mkAsmTempEndLabel, mkAsmTempDieLabel, - mkPlainModuleInitLabel, - mkSplitMarkerLabel, mkDirty_MUT_VAR_Label, mkUpdInfoLabel, @@ -205,9 +203,6 @@ data CLabel | StringLitLabel {-# UNPACK #-} !Unique - | PlainModuleInitLabel -- without the version & way info - Module - | CC_Label CostCentre | CCS_Label CostCentreStack @@ -273,8 +268,6 @@ instance Ord CLabel where compare b1 b2 compare (StringLitLabel u1) (StringLitLabel u2) = nonDetCmpUnique u1 u2 - compare (PlainModuleInitLabel a1) (PlainModuleInitLabel a2) = - compare a1 a2 compare (CC_Label a1) (CC_Label a2) = compare a1 a2 compare (CCS_Label a1) (CCS_Label a2) = @@ -309,8 +302,6 @@ instance Ord CLabel where compare _ AsmTempDerivedLabel{} = GT compare StringLitLabel{} _ = LT compare _ StringLitLabel{} = GT - compare PlainModuleInitLabel{} _ = LT - compare _ PlainModuleInitLabel{} = GT compare CC_Label{} _ = LT compare _ CC_Label{} = GT compare CCS_Label{} _ = LT @@ -652,8 +643,6 @@ mkAsmTempDerivedLabel = AsmTempDerivedLabel mkAsmTempEndLabel :: CLabel -> CLabel mkAsmTempEndLabel l = mkAsmTempDerivedLabel l (fsLit "_end") -mkPlainModuleInitLabel :: Module -> CLabel -mkPlainModuleInitLabel mod = PlainModuleInitLabel mod -- | Construct a label for a DWARF Debug Information Entity (DIE) -- describing another symbol. @@ -738,7 +727,6 @@ needsCDecl (LargeSRTLabel _) = False needsCDecl (LargeBitmapLabel _) = False needsCDecl (IdLabel _ _ _) = True needsCDecl (CaseLabel _ _) = True -needsCDecl (PlainModuleInitLabel _) = True needsCDecl (StringLitLabel _) = False needsCDecl (AsmTempLabel _) = False @@ -872,7 +860,6 @@ externallyVisibleCLabel (CaseLabel _ _) = False externallyVisibleCLabel (StringLitLabel _) = False externallyVisibleCLabel (AsmTempLabel _) = False externallyVisibleCLabel (AsmTempDerivedLabel _ _)= False -externallyVisibleCLabel (PlainModuleInitLabel _)= True externallyVisibleCLabel (RtsLabel _) = True externallyVisibleCLabel (CmmLabel _ _ _) = True externallyVisibleCLabel (ForeignLabel{}) = True @@ -930,7 +917,6 @@ labelType (RtsLabel (RtsApInfoTable _ _)) = DataLabel labelType (RtsLabel (RtsApFast _)) = CodeLabel labelType (CaseLabel _ CaseReturnInfo) = DataLabel labelType (CaseLabel _ _) = CodeLabel -labelType (PlainModuleInitLabel _) = CodeLabel labelType (SRTLabel _) = DataLabel labelType (LargeSRTLabel _) = DataLabel labelType (LargeBitmapLabel _) = DataLabel @@ -996,8 +982,6 @@ labelDynamic dflags this_mod lbl = -- libraries True - PlainModuleInitLabel m -> (WayDyn `elem` ways dflags) && this_pkg /= (moduleUnitId m) - HpcTicksLabel m -> (WayDyn `elem` ways dflags) && this_mod /= m -- Note that DynamicLinkerLabels do NOT require dynamic linking themselves. @@ -1226,9 +1210,6 @@ pprCLbl (IdLabel name _cafs flavor) = ppr name <> ppIdFlavor flavor pprCLbl (CC_Label cc) = ppr cc pprCLbl (CCS_Label ccs) = ppr ccs -pprCLbl (PlainModuleInitLabel mod) - = text "__stginit_" <> ppr mod - pprCLbl (HpcTicksLabel mod) = text "_hpc_tickboxes_" <> ppr mod <> ptext (sLit "_hpc") |