[project @ 1997-05-19 05:59:28 by sof]

ghc-2-03-p1 merged onto main trunk

6 files changed, 18 insertions, 13 deletions

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index f10f13f9cb..49ce72db85 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.5 1997/03/24 04:33:30 sof Exp $
+# $Id: Makefile,v 1.6 1997/05/19 06:02:14 sof Exp $
 
 TOP=..
 CURRENT_DIR=ghc/driver
@@ -57,7 +57,7 @@ SCRIPT_SUBST_VARS := \
 ifeq "$(BIN_DIST)" "1"
 SCRIPT_PREFIX_FILES=prefix.txt
 else
-SCRIPT_SUBST_VARS += libdir datadir bindir TOP_PWD
+SCRIPT_SUBST_VARS += libdir libexecdir datadir bindir TOP_PWD
 endif
 
 all :: $(DYN_LOADABLE_BITS)
diff --git a/ghc/driver/ghc-consist.lprl b/ghc/driver/ghc-consist.lprl
index 072c6c6562..31bcdf453f 100644
--- a/ghc/driver/ghc-consist.lprl
+++ b/ghc/driver/ghc-consist.lprl
@@ -11,7 +11,9 @@ sub chk_consistency_info {
     local($major_version, $minor_version);
     local($phase, $infile, $opts);
 
-    $executable = "${executable}.exe" if $TargetPlatform eq 'i386-unknown-cygwin32';
+    # append .exe if it's not there under cygwin32
+    $executable = "${executable}.exe" if $TargetPlatform eq 'i386-unknown-cygwin32' &&
+    					 $executable !~ /\.exe$/ ; 
 
     print STDERR "Checking consistency of: $executable\n" if $Verbose;
 
diff --git a/ghc/driver/ghc-iface.lprl b/ghc/driver/ghc-iface.lprl
index 5f606fb5af..d5020ed09c 100644
--- a/ghc/driver/ghc-iface.lprl
+++ b/ghc/driver/ghc-iface.lprl
@@ -300,7 +300,7 @@ sub printNewItemVersion {
 
     } elsif ($idecl ne $Decl{"old:$item"})  {	# Old decl differs from new decl
 	local($odecl) = $Decl{"old:$item"};
-	if ($show_hi_diffs) {print STDERR "changed: $item\nOld: $odecl\nNew: $idecl\n";}
+	if ($show_hi_diffs) {print STDERR "changed: $item\nOld: $odeclNew: $idecl";}
 	print $hifile  "$mod_version ";		# Use module version
 
     } elsif (! defined($OldVersion{"$item"}) ) {
diff --git a/ghc/driver/ghc.lprl b/ghc/driver/ghc.lprl
index 78b5e590ed..ee1d55f248 100644
--- a/ghc/driver/ghc.lprl
+++ b/ghc/driver/ghc.lprl
@@ -103,7 +103,7 @@ PROJECTNAME PROJECTVERSION PROJECTPATCHLEVEL
 
 TOP_PWD
 
-bindir libdir datadir
+bindir libdir libexecdir datadir
 
 CURRENT_DIR TMPDIR
 
@@ -132,10 +132,13 @@ $TargetPlatform = $TARGETPLATFORM;
 $TopPwd	           = "${TOP_PWD}";
 $InstBinDirGhc     = "${bindir}";
 $InstLibDirGhc     = "${libdir}";
-$InstLibexecDirGhc = "${libexecdir}";
+#
+# Normally the same as InstLibDirGhc, but we accommodate
+# for it being separate.
+#
+$InstLibExecDirGhc = "${libexecdir}";
 $InstDataDirGhc    = "${datadir}";
-$InstSysLibDir     = ( $INSTALLING ) ? "${InstLibDirGhc}/hslibs" : 
-			"$TopPwd/hslibs";
+$InstSysLibDir     = ( $INSTALLING ) ? "${InstLibDirGhc}/hslibs" : "$TopPwd/hslibs";
 
 $Status  = 0; # just used for exit() status
 $Verbose = '';
@@ -177,7 +180,7 @@ if ( ! $ENV{'REAL_SHELL'} ) {
 
 @Files_to_tidy = (); # files we nuke in the case of abnormal termination
 
-$Unlit = ( $INSTALLING ) ? "$InstLibexecDirGhc/unlit"
+$Unlit = ( $INSTALLING ) ? "$InstLibExecDirGhc/unlit"
 			 : "$TopPwd/${CURRENT_DIR}/${GHC_UNLIT}";
 
 $Cp   = $CP;
@@ -193,11 +196,11 @@ $HsCpp	 = # but this is re-set to "cat" (after options) if -cpp not seen
 
 @HsCpp_flags	= ();
 $genSPECS_flag	= '';		# See ../utils/hscpp/hscpp.prl
-$HsC	 = ( $INSTALLING ) ? "$InstLibexecDirGhc/hsc"
+$HsC	 = ( $INSTALLING ) ? "$InstLibExecDirGhc/hsc"
 			   : "$TopPwd/${CURRENT_DIR}/${GHC_HSC}";
 
 # For PVM fiends only
-$SysMan	 = ( $INSTALLING ) ? "$InstLibexecDirGhc/SysMan"
+$SysMan	 = ( $INSTALLING ) ? "$InstLibExecDirGhc/SysMan"
 			   : "$TopPwd/${CURRENT_DIR}/${GHC_SYSMAN}";
 
 @Unlit_flags	= ();
diff --git a/ghc/lib/ghc/ConcBase.lhs b/ghc/lib/ghc/ConcBase.lhs
index 8dd40971a8..64ac7dd3fe 100644
--- a/ghc/lib/ghc/ConcBase.lhs
+++ b/ghc/lib/ghc/ConcBase.lhs
@@ -148,8 +148,9 @@ virtual time, so we start ticking in real time.  (The granularity is
 the effective resolution of the context switch timer, so it is
 affected by the RTS -C option.)
 
-@threadWait@ delays rescheduling of a thread until input on the
+@threadWaitRead@ delays rescheduling of a thread until input on the
 specified file descriptor is available for reading (just like select).
+@threadWaitWrite@ is similar, but for writing on a file descriptor.
 
 \begin{code}
 threadDelay, threadWaitRead, threadWaitWrite :: Int -> IO ()
diff --git a/ghc/lib/glaExts/GlaExts.lhs b/ghc/lib/glaExts/GlaExts.lhs
index adb7761bbf..42d78a3518 100644
--- a/ghc/lib/glaExts/GlaExts.lhs
+++ b/ghc/lib/glaExts/GlaExts.lhs
@@ -18,7 +18,6 @@ module GlaExts
         -- (an instance of ST):
 	PrimIO,
         ST, RealWorld,
-        module Monad,   -- ST is an instance
 
 	thenPrimIO,     -- 
         returnPrimIO,