X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2FcoreSyn%2FExternalCore.lhs;h=2fdcf2dc064dbca9f30f9dcafd559a8ec2a9891b;hb=de777ba42eb12b6a20e548a959b23b60179d9b57;hp=c5035e20491d516a79efa3ebfbf8be17f06593a0;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/ExternalCore.lhs b/compiler/coreSyn/ExternalCore.lhs
index c5035e2..2fdcf2d 100644
--- a/compiler/coreSyn/ExternalCore.lhs
+++ b/compiler/coreSyn/ExternalCore.lhs
@@ -34,7 +34,9 @@ data Exp
   | Case Exp Vbind Ty [Alt] {- non-empty list -}
   | Cast Exp Ty
   | Note String Exp
-  | External String Ty
+  | External String String Ty {- target name, convention, and type -} 
+  | DynExternal String Ty {- convention and type (incl. Addr# of target as first arg) -} 
+  | Label String
 
 data Bind 
   = Vb Vbind
@@ -60,6 +62,7 @@ data Kind
   | Kunboxed
   | Kopen
   | Karrow Kind Kind
+  | Keq Ty Ty
 
 data Lit 
   = Lint Integer Ty
@@ -78,10 +81,10 @@ type Qual t = (Mname,t)
 
 type Id = String
 
-primMname = "GHCziPrim"
+primMname = "base:GHC.Prim"
 
 tcArrow :: Qual Tcon
-tcArrow = (primMname, "ZLzmzgZR")
+tcArrow = (primMname, "(->)")
 
 \end{code}