[project @ 2004-11-29 23:28:58 by wolfgang]

[ghc-hetmet.git] / ghc / compiler / cmm / CLabel.hs

diff --git a/ghc/compiler/cmm/CLabel.hs b/ghc/compiler/cmm/CLabel.hs
index a18755f..8a5f133 100644 (file)
--- a/ghc/compiler/cmm/CLabel.hs
+++ b/ghc/compiler/cmm/CLabel.hs
@@ -100,10 +100,10 @@ module CLabel (
 #include "../includes/ghcconfig.h"
 
 import CmdLineOpts      ( DynFlags, opt_Static, opt_DoTickyProfiling )
-import Packages                ( isHomeModule )
+import Packages                ( isHomeModule, isDllName )
 import DataCon         ( ConTag )
 import Module          ( moduleFS, Module )
-import Name            ( Name, isExternalName, nameModule )
+import Name            ( Name, isExternalName )
 import Unique          ( pprUnique, Unique )
 import PrimOp          ( PrimOp )
 import Config          ( cLeadingUnderscore )
@@ -196,6 +196,7 @@ data CLabel
                                 -- assembler label '1'; it is pretty-printed
                                 -- as 1b, referring to the previous definition
                                 -- of 1: in the assembler source file.
+
   deriving (Eq, Ord)
 
 data IdLabelInfo
@@ -283,24 +284,20 @@ mkLocalEntryLabel name    = IdLabel name  Entry
 mkLocalClosureTableLabel name  = IdLabel name ClosureTable
 
 mkClosureLabel dflags name
-  | opt_Static || isHomeModule dflags mod = IdLabel    name Closure
-  | otherwise                            = DynIdLabel name Closure
-  where mod = nameModule name
+  | isDllName dflags name = DynIdLabel    name Closure
+  | otherwise             = IdLabel name Closure
 
 mkInfoTableLabel dflags name
-  | opt_Static || isHomeModule dflags mod = IdLabel    name InfoTable
-  | otherwise                            = DynIdLabel name InfoTable
-  where mod = nameModule name
+  | isDllName dflags name = DynIdLabel    name InfoTable
+  | otherwise           = IdLabel name InfoTable
 
 mkEntryLabel dflags name
-  | opt_Static || isHomeModule dflags mod = IdLabel    name Entry
-  | otherwise                            = DynIdLabel name Entry
-  where mod = nameModule name
+  | isDllName dflags name = DynIdLabel    name Entry
+  | otherwise             = IdLabel name Entry
 
 mkClosureTableLabel dflags name
-  | opt_Static || isHomeModule dflags mod = IdLabel    name ClosureTable
-  | otherwise                            = DynIdLabel name ClosureTable
-  where mod = nameModule name
+  | isDllName dflags name = DynIdLabel    name ClosureTable
+  | otherwise             = IdLabel name ClosureTable
 
 mkLocalConInfoTableLabel     con = IdLabel con ConInfoTable
 mkLocalConEntryLabel        con = IdLabel con ConEntry
@@ -314,14 +311,12 @@ mkStaticInfoTableLabel name False = IdLabel    name StaticInfoTable
 mkStaticInfoTableLabel name True  = DynIdLabel name StaticInfoTable
 
 mkConEntryLabel dflags name
-  | opt_Static || isHomeModule dflags mod = IdLabel    name ConEntry
-  | otherwise                            = DynIdLabel name ConEntry
-  where mod = nameModule name
+  | isDllName dflags name = DynIdLabel    name ConEntry
+  | otherwise             = IdLabel name ConEntry
 
 mkStaticConEntryLabel dflags name
-  | opt_Static || isHomeModule dflags mod = IdLabel    name StaticConEntry
-  | otherwise                            = DynIdLabel name StaticConEntry
-  where mod = nameModule name
+  | isDllName dflags name = DynIdLabel    name StaticConEntry
+  | otherwise             = IdLabel name StaticConEntry
 
 
 mkReturnPtLabel uniq           = CaseLabel uniq CaseReturnPt