[project @ 1997-07-07 17:08:21 by andre]

RS6000 prof/conc patches

diff --git a/ghc/lib/Makefile b/ghc/lib/Makefile
index 9fac0eb..9fd7861 100644 (file)
--- a/ghc/lib/Makefile
+++ b/ghc/lib/Makefile
@@ -4,7 +4,7 @@
 #
 #              Makefile for building the GHC Prelude libraries umpteen ways
 #
-#      $Id: Makefile,v 1.12 1997/07/05 01:04:30 sof Exp $
+#      $Id: Makefile,v 1.13 1997/07/07 17:08:21 andre Exp $
 #
 #      
 #################################################################################
@@ -55,11 +55,14 @@ endif
 glaExts/PackedString_HC_OPTS += -monly-3-regs
 required/Directory_HC_OPTS   += -monly-3-regs 
 concurrent/Parallel_HC_OPTS  += -fglasgow-exts
-required/Time_HC_OPTS        += -monly-3-regs
+required/Time_HC_OPTS        += -monly-3-regs -H10m
 
 # Far too much heap is needed to compile PrelNum with -O at the
 # moment, but there you go..
 ghc/PrelNum_HC_OPTS          += -H30m
+ghc/PrelBase_HC_OPTS         += -H8m
+ghc/PrelRead_HC_OPTS         += -H8m
+ghc/IOHandle_HC_OPTS         += -H8m
 
 #-----------------------------------------------------------------------------
 #      Dependency generation

diff --git a/ghc/lib/cbits/errno.lc b/ghc/lib/cbits/errno.lc
index 24ea25d..0eaa9d1 100644 (file)
--- a/ghc/lib/cbits/errno.lc
+++ b/ghc/lib/cbits/errno.lc
@@ -338,11 +338,20 @@ void cvtErrno(STG_NO_ARGS)
        ghc_errno = GHC_ENOTDIR;
        break;
 #endif
+#ifndef aix_TARGET_OS
+/* AIX returns EEXIST where 4.3BSD used ENOTEMPTY.
+ * there is an ENOTEMPTY defined as the same as EEXIST, and
+ * therefore it won't work properly on a case statement.
+ * another option is to define _ALL_SOURCE for aix, which
+ * gives a different number for ENOTEMPTY.
+ * I haven't tried that. -- andre.
+ */
 #ifdef ENOTEMPTY
     case ENOTEMPTY:
        ghc_errno = GHC_ENOTEMPTY;
        break;
 #endif
+#endif
 #ifdef ENOTSOCK
     case ENOTSOCK:
        ghc_errno = GHC_ENOTSOCK;

diff --git a/ghc/lib/cbits/getCPUTime.lc b/ghc/lib/cbits/getCPUTime.lc
index bc4f930..d3d7b2a 100644 (file)
--- a/ghc/lib/cbits/getCPUTime.lc
+++ b/ghc/lib/cbits/getCPUTime.lc
@@ -5,7 +5,9 @@
 
 \begin{code}
 
+#ifndef _AIX
 #define NON_POSIX_SOURCE /*needed for solaris2 only?*/
+#endif
 
 /* how is this to work given we have not read platform.h yet? */
 #ifdef hpux_TARGET_OS

diff --git a/ghc/lib/cbits/getClockTime.lc b/ghc/lib/cbits/getClockTime.lc
index 913d38d..b6f42e6 100644 (file)
--- a/ghc/lib/cbits/getClockTime.lc
+++ b/ghc/lib/cbits/getClockTime.lc
@@ -5,7 +5,9 @@
 
 \begin{code}
 
+#ifndef _AIX
 #define NON_POSIX_SOURCE    /* gettimeofday */
+#endif
 
 #include "rtsdefs.h"
 #include "stgio.h"

diff --git a/ghc/lib/cbits/inputReady.lc b/ghc/lib/cbits/inputReady.lc
index 2fa65a7..8baa582 100644 (file)
--- a/ghc/lib/cbits/inputReady.lc
+++ b/ghc/lib/cbits/inputReady.lc
@@ -6,7 +6,10 @@
 \begin{code}
 
 /* select and supporting types is not */
+#ifndef _AIX
 #define NON_POSIX_SOURCE  
+#endif
+
 #include "rtsdefs.h"
 #include "stgio.h"