From: sewardj <unknown>
Date: Tue, 29 Feb 2000 12:27:35 +0000 (+0000)
Subject: [project @ 2000-02-29 12:27:35 by sewardj]
X-Git-Tag: Approximately_9120_patches~5082
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bb772b272f2872df857cc62aeb7b20ef5da8f27e;p=ghc-hetmet.git

[project @ 2000-02-29 12:27:35 by sewardj]
The GHC Prelude doesn't seem to export Addr.  Make it do so in combined
mode for compatibility with standalone mode.
---

diff --git a/ghc/interpreter/link.c b/ghc/interpreter/link.c
index d806a1d..aabe2596 100644
--- a/ghc/interpreter/link.c
+++ b/ghc/interpreter/link.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: link.c,v $
- * $Revision: 1.44 $
- * $Date: 2000/02/24 12:34:19 $
+ * $Revision: 1.45 $
+ * $Date: 2000/02/29 12:27:35 $
  * ------------------------------------------------------------------------*/
 
 #include "prelude.h"
@@ -585,6 +585,14 @@ assert(nonNull(namePMFail));
            module(modulePrelude).exports
               = cons ( nm, module(modulePrelude).exports );
 
+           /* The GHC prelude doesn't seem to export Addr.  Add it to the
+              export list for the sake of compatibility with standalone mode.
+	   */
+           module(modulePrelude).exports
+              = cons ( pair(typeAddr,DOTDOT), 
+                       module(modulePrelude).exports );
+           addTycon(typeAddr);
+
            /* Make nameListMonad be the builder fn for instance Monad [].
               Standalone hugs does this with a disgusting hack in 
               checkInstDefn() in static.c.  We have a slightly different