[project @ 2000-04-17 13:28:17 by sewardj]

Track recent -package changes to interfaces.  Also link new symbols
blockAsyncExceptionszh_fast, unblockAsyncExceptionszh_fast,
takeMaybeMVarzh_fast.

diff --git a/ghc/interpreter/interface.c b/ghc/interpreter/interface.c
index d4719d6..1458074 100644 (file)
--- a/ghc/interpreter/interface.c
+++ b/ghc/interpreter/interface.c
@@ -7,8 +7,8 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: interface.c,v $
- * $Revision: 1.54 $
- * $Date: 2000/04/14 15:18:06 $
+ * $Revision: 1.55 $
+ * $Date: 2000/04/17 13:28:17 $
  * ------------------------------------------------------------------------*/
 
 #include "hugsbasictypes.h"
@@ -2527,6 +2527,7 @@ Type type; {
       Sym(putMVarzh_fast)            \
       Sym(newMVarzh_fast)            \
       Sym(takeMVarzh_fast)           \
+      Sym(takeMaybeMVarzh_fast)      \
       Sym(catchzh_fast)              \
       Sym(raisezh_fast)              \
       Sym(delayzh_fast)              \
@@ -2592,6 +2593,8 @@ Type type; {
       Sym(stg_yield_to_Hugs)         \
       Sym(StgReturn)                 \
       Sym(init_stack)                \
+      Sym(blockAsyncExceptionszh_fast)    \
+      Sym(unblockAsyncExceptionszh_fast)  \
                                      \
       /* needed by libHS_cbits */    \
       SymX(malloc)                   \

diff --git a/ghc/interpreter/link.c b/ghc/interpreter/link.c
index 31ac68d..39b2c8f 100644 (file)
--- a/ghc/interpreter/link.c
+++ b/ghc/interpreter/link.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: link.c,v $
- * $Revision: 1.58 $
- * $Date: 2000/04/07 16:22:12 $
+ * $Revision: 1.59 $
+ * $Date: 2000/04/17 13:28:17 $
  * ------------------------------------------------------------------------*/
 
 #include "hugsbasictypes.h"
@@ -694,7 +694,7 @@ assert(nonNull(namePMFail));
                */
                modulePrelBase = findModule(findText("PrelBase"));
                module(modulePrelBase).objectExtraNames 
-                  = singleton(findText("libHS_cbits"));
+                  = singleton(findText("libHSstd_cbits"));
 
                setCurrModule(modulePrelBase);
                pFun(nameId,             "id");

diff --git a/ghc/interpreter/parser.y b/ghc/interpreter/parser.y
index a86b13c..3c999cf 100644 (file)
--- a/ghc/interpreter/parser.y
+++ b/ghc/interpreter/parser.y
@@ -12,8 +12,8 @@
  * included in the distribution.
  *
  * $RCSfile: parser.y,v $
- * $Revision: 1.28 $
- * $Date: 2000/04/06 00:36:12 $
+ * $Revision: 1.29 $
+ * $Date: 2000/04/17 13:28:17 $
  * ------------------------------------------------------------------------*/
 
 %{
@@ -119,9 +119,9 @@ start     : EXPR exp wherePart      {inputExpr    = letrec($3,$2); sp-=2;}
  */
 
 /*- Top-level interface files -----------------------------*/
-iface     : INTERFACE ifCon NUMLIT ifOrphans ifCheckVersion WHERE ifTopDecls 
-                                        {$$ = gc7(ap(I_INTERFACE, 
-                                                     zpair($2,$7))); }
+iface     : INTERFACE STRINGLIT ifCon NUMLIT ifOrphans ifCheckVersion WHERE ifTopDecls 
+                                        {$$ = gc8(ap(I_INTERFACE, 
+                                                     zpair($3,$8))); }
           | INTERFACE error             {syntaxError("interface file");}
           ;