[project @ 2001-12-10 01:27:59 by sebc]

MacOS X 10.1 identifies as "darwin"

diff --git a/configure.in b/configure.in
index 44451a7..0e24d30 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -266,15 +266,15 @@ powerpc-ibm-aix*)
         HostVendor_CPP='ibm'
         HostOS_CPP='aix'
         ;;
-powerpc-apple-macosx*)
-      HostPlatform=powerpc-apple-macosx
-      TargetPlatform=powerpc-apple-macosx #hack
-      BuildPlatform=powerpc-apple-macosx #hack
-        HostPlatform_CPP='powerpc_apple_macosx'
-        HostArch_CPP='powerpc'
-        HostVendor_CPP='apple'
-        HostOS_CPP='macosx'
-        ;;
+powerpc-apple-darwin*)
+       HostPlatform=powerpc-apple-darwin
+       TargetPlatform=powerpc-apple-darwin #hack
+       BuildPlatform=powerpc-apple-darwin #hack
+       HostPlatform_CPP='powerpc_apple_darwin'
+       HostArch_CPP='powerpc'
+       HostVendor_CPP='apple'
+       HostOS_CPP='darwin'
+       ;;
 sparc-sun-sunos4*)
        HostPlatform=sparc-sun-sunos4
        TargetPlatform=sparc-sun-sunos4 #hack

diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index a219504..ec2da8f 100644 (file)
--- a/distrib/configure-bin.in
+++ b/distrib/configure-bin.in
@@ -76,6 +76,8 @@ powerpc-ibm-aix*)
        TargetPlatform=powerpc-ibm-aix;;
 rs6000-ibm-aix*)
        TargetPlatform=rs6000-ibm-aix;;
+powerpc-apple-darwin*)
+       TargetPlatform=powerpc-apple-darwin;;
 sparc-sun-sunos4*)
        TargetPlatform=sparc-sun-sunos4;;
 sparc-sun-solaris2*)

diff --git a/docs/building/building.sgml b/docs/building/building.sgml
index f4a8be8..8d3f73b 100644 (file)
--- a/docs/building/building.sgml
+++ b/docs/building/building.sgml
@@ -1059,8 +1059,8 @@ or higher)</term>
        </varlistentry>
 
        <varlistentry>
-         <term>powerpc-apple-macosx</term>
-         <indexterm><primary>powerpc-apple-macosx</primary></indexterm> 
+         <term>powerpc-apple-darwin</term>
+         <indexterm><primary>powerpc-apple-darwin</primary></indexterm> 
          <listitem>
            <para>Works, unregisterised only at the moment.</para>
          </listitem>

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 9d9d335..e4dd662 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -#include "hschooks.h" #-}
 
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.80 2001/12/05 00:08:26 sof Exp $
+-- $Id: DriverFlags.hs,v 1.81 2001/12/10 01:28:00 sebc Exp $
 --
 -- Driver flags
 --
@@ -535,7 +535,7 @@ machdepCCOpts
        -- register used for global register variable", we simply
        -- disable all warnings altogether using the -w flag. Oh well.
 
-   | prefixMatch "powerpc-apple-macosx" cTARGETPLATFORM
+   | prefixMatch "powerpc-apple-darwin" cTARGETPLATFORM
        = return ( ["-no-cpp-precomp"], [""] )
 
    | prefixMatch "powerpc" cTARGETPLATFORM || prefixMatch "rs6000" cTARGETPLATFORM

diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c
index b0bd3c9..0ca384b 100644 (file)
--- a/ghc/rts/MBlock.c
+++ b/ghc/rts/MBlock.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.c,v 1.24 2001/10/26 11:49:19 sewardj Exp $
+ * $Id: MBlock.c,v 1.25 2001/12/10 01:28:00 sebc Exp $
  *
  * (c) The GHC Team 1998-1999
  *
@@ -66,7 +66,7 @@ getMBlocks(nat n)
 #elif hpux_TARGET_OS
  ret = mmap(next_request, size, PROT_READ | PROT_WRITE, 
             MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
-#elif macosx_TARGET_OS
+#elif darwin_TARGET_OS
  ret = mmap(next_request, size, PROT_READ | PROT_WRITE, 
             MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
 #else

diff --git a/ghc/rts/MBlock.h b/ghc/rts/MBlock.h
index 437d65d..8ca6c51 100644 (file)
--- a/ghc/rts/MBlock.h
+++ b/ghc/rts/MBlock.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.h,v 1.10 2001/07/26 03:26:28 ken Exp $
+ * $Id: MBlock.h,v 1.11 2001/12/10 01:28:00 sebc Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -52,7 +52,7 @@ extern void * getMBlocks(nat n);
 /* guess */
 #define HEAP_BASE 0x50000000
 
-#elif macosx_TARGET_OS
+#elif darwin_TARGET_OS
 /* guess */
 #define HEAP_BASE 0x50000000