From 1119f4612631e3df2eb704dbde8b3d7625f0a477 Mon Sep 17 00:00:00 2001
From: andre <unknown>
Date: Mon, 7 Jul 1997 17:08:26 +0000
Subject: [PATCH] [project @ 1997-07-07 17:08:21 by andre] RS6000 prof/conc
patches
---
ghc/lib/Makefile | 7 +++++--
ghc/lib/cbits/errno.lc | 9 +++++++++
ghc/lib/cbits/getCPUTime.lc | 2 ++
ghc/lib/cbits/getClockTime.lc | 2 ++
ghc/lib/cbits/inputReady.lc | 3 +++
5 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/ghc/lib/Makefile b/ghc/lib/Makefile
index 9fac0ebf75ad..9fd78617f581 100644
--- 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 24ea25d08820..0eaa9d1ac9f2 100644
--- 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 bc4f930b9265..d3d7b2a4895e 100644
--- 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 913d38d034ce..b6f42e6c289e 100644
--- 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 2fa65a736b81..8baa5829716d 100644
--- 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"
--
GitLab