[project @ 2000-04-03 17:27:10 by sewardj]

Track recent renaming of True_static_closure ---> True_closure, etc,
and avoid segfault with filename extension handling.

diff --git a/ghc/interpreter/Makefile b/ghc/interpreter/Makefile
index 1881a5f..6199e64 100644 (file)
--- a/ghc/interpreter/Makefile
+++ b/ghc/interpreter/Makefile
@@ -1,6 +1,6 @@
 
 # --------------------------------------------------------------------------- #
-# $Id: Makefile,v 1.29 2000/03/31 04:13:27 andy Exp $                      #
+# $Id: Makefile,v 1.30 2000/04/03 17:27:10 sewardj Exp $                      #
 # --------------------------------------------------------------------------- #
 
 TOP = ..
@@ -53,7 +53,7 @@ all :: parser.c $(GHC_LIBS_NEEDED) nHandle$(DYN_EXT) hugs
 ### EXTREMELY hacky
 hugs: $(C_OBJS) ../rts/Sanity.o ../rts/Assembler.o ../rts/Disassembler.o   \
       ../rts/Evaluator.o ../rts/ForeignCall.o ../rts/GC.o ../rts/Printer.o \
-      ../rts/StgCRun.o ../rts/PrimOps.o ../rts/libHSrts.a
+      ../rts/StgCRun.o ../rts/PrimOps.o ../rts/Prelude.o ../rts/libHSrts.a
        $(CC) -o $@ $(CC_OPTS) $^ $(GHC_LIBS_NEEDED) \
                 -lbfd -liberty $(LIB_READLINE) $(LIB_DL) \
                 $(LIB_GMP) -lm

diff --git a/ghc/interpreter/interface.c b/ghc/interpreter/interface.c
index c1463d9..0188b78 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.42 $
- * $Date: 2000/03/23 14:54:21 $
+ * $Revision: 1.43 $
+ * $Date: 2000/04/03 17:27:10 $
  * ------------------------------------------------------------------------*/
 
 #include "hugsbasictypes.h"
@@ -2653,6 +2653,7 @@ Type type; {
       SymX(timezone)                 \
       SymX(mktime)                   \
       SymX(gmtime)                   \
+      Sym(setitimer)                 \
 
 
 

diff --git a/ghc/interpreter/machdep.c b/ghc/interpreter/machdep.c
index a9c4747..19db383 100644 (file)
--- a/ghc/interpreter/machdep.c
+++ b/ghc/interpreter/machdep.c
@@ -13,8 +13,8 @@
  * included in the distribution.
  *
  * $RCSfile: machdep.c,v $
- * $Revision: 1.24 $
- * $Date: 2000/03/24 14:51:50 $
+ * $Revision: 1.25 $
+ * $Date: 2000/04/03 17:27:10 $
  * ------------------------------------------------------------------------*/
 
 #ifdef HAVE_SIGNAL_H
@@ -714,6 +714,7 @@ Bool findFilesForModule (
       strcpy(searchBuf+nPath, ".u_hi");
       if (readable(searchBuf)) {
          *iAvail = TRUE;
+         *sExt = ".u_hi";
          getFileInfo(searchBuf, iTime, iSize);
       }
 

diff --git a/ghc/rts/Prelude.c b/ghc/rts/Prelude.c
index a3e191f..9cc426f 100644 (file)
--- a/ghc/rts/Prelude.c
+++ b/ghc/rts/Prelude.c
@@ -1,6 +1,6 @@
 
 /* -----------------------------------------------------------------------------
- * $Id: Prelude.c,v 1.4 2000/03/24 15:19:29 sewardj Exp $
+ * $Id: Prelude.c,v 1.5 2000/04/03 17:27:10 sewardj Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -12,12 +12,12 @@
 #include "Prelude.h"
 
 #if defined(INTERPRETER)
-const StgClosure *ind_True_static_closure;
-const StgClosure *ind_False_static_closure;
+const StgClosure *ind_True_closure;
+const StgClosure *ind_False_closure;
 const StgClosure *ind_unpackCString_closure;
 const StgClosure *ind_stackOverflow_closure;
 const StgClosure *ind_heapOverflow_closure;
-const StgClosure *ind_PutFullMVar_static_closure;
+const StgClosure *ind_PutFullMVar_closure;
 const StgClosure *ind_BlockedOnDeadMVar_closure;
 const StgClosure *ind_NonTermination_closure;
 const StgClosure *ind_mainIO_closure;
@@ -99,11 +99,11 @@ void fixupRTStoPreludeRefs ( void*(*ask_hugs_dynamic_linker)(char*) )
   if (ask_hugs_dynamic_linker == NULL) {
 
     /* Hugs standalone mode. */
-    ind_True_static_closure        = NULL; /* True_static_closure; */
-    ind_False_static_closure       = NULL; /* False_static_closure; */
-    ind_PutFullMVar_static_closure = NULL; /* PutFullMVar_static_closure; */
-    ind_BlockedOnDeadMVar_closure  = NULL; /* BlockedOnDeadMVar_static_closure; */
-    ind_NonTermination_closure     = NULL; /* NonTermination_static_closure; */
+    ind_True_closure               = NULL; /* True__closure; */
+    ind_False_closure              = NULL; /* False_closure; */
+    ind_PutFullMVar_closure        = NULL; /* PutFullMVar_closure; */
+    ind_BlockedOnDeadMVar_closure  = NULL; /* BlockedOnDeadMVar_closure; */
+    ind_NonTermination_closure     = NULL; /* NonTermination_closure; */
     ind_unpackCString_closure      = NULL; /* unpackCString_closure; */
 
     ind_stackOverflow_closure = stackOverflow_closure;
@@ -131,12 +131,12 @@ void fixupRTStoPreludeRefs ( void*(*ask_hugs_dynamic_linker)(char*) )
     /* Hugs combined mode. */
     void*(*ask)(char*) = ask_hugs_dynamic_linker;
 
-    ind_True_static_closure           
-       = ask("PrelBase_True_static_closure");
-    ind_False_static_closure          
-       = ask("PrelBase_False_static_closure");
-    ind_PutFullMVar_static_closure    
-       = ask("PrelException_PutFullMVar_static_closure");
+    ind_True_closure           
+       = ask("PrelBase_True_closure");
+    ind_False_closure          
+       = ask("PrelBase_False_closure");
+    ind_PutFullMVar_closure    
+       = ask("PrelException_PutFullMVar_closure");
     ind_BlockedOnDeadMVar_closure    
        = ask("PrelException_BlockedOnDeadMVar_closure");
     ind_NonTermination_closure