[project @ 2004-09-12 11:27:10 by panne]

Removed the annoying "Id" CVS keywords, they're a real PITA when it
comes to merging...

diff --git a/ghc/rts/Arena.c b/ghc/rts/Arena.c
index ea109ac..2c478a7 100644 (file)
--- a/ghc/rts/Arena.c
+++ b/ghc/rts/Arena.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
-   $Id: Arena.c,v 1.6 2003/03/25 17:58:47 sof Exp $ 
    (c) The University of Glasgow 2001
 
    Arena allocation.  Arenas provide fast memory allocation at the

diff --git a/ghc/rts/Arena.h b/ghc/rts/Arena.h
index 7263f0b..afb02ac 100644 (file)
--- a/ghc/rts/Arena.h
+++ b/ghc/rts/Arena.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
-   $Id: Arena.h,v 1.2 2003/07/28 16:16:07 moran Exp $ 
    (c) The University of Glasgow 2001
 
    Arena allocation interface.

diff --git a/ghc/rts/BlockAlloc.c b/ghc/rts/BlockAlloc.c
index 931e02c..ae87fcc 100644 (file)
--- a/ghc/rts/BlockAlloc.c
+++ b/ghc/rts/BlockAlloc.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.c,v 1.19 2004/09/06 11:00:21 simonmar Exp $
  *
  * (c) The GHC Team 1998-2000
  * 

diff --git a/ghc/rts/BlockAlloc.h b/ghc/rts/BlockAlloc.h
index 32db948..8d52e32 100644 (file)
--- a/ghc/rts/BlockAlloc.h
+++ b/ghc/rts/BlockAlloc.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: BlockAlloc.h,v 1.10 2003/11/12 17:49:06 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/ClosureFlags.c b/ghc/rts/ClosureFlags.c
index 6df823c..dc344f2 100644 (file)
--- a/ghc/rts/ClosureFlags.c
+++ b/ghc/rts/ClosureFlags.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: ClosureFlags.c,v 1.13 2002/12/11 15:36:41 simonmar Exp $
  *
  * (c) The GHC Team 1998-1999
  *

diff --git a/ghc/rts/Disassembler.h b/ghc/rts/Disassembler.h
index 9762566..b4065fe 100644 (file)
--- a/ghc/rts/Disassembler.h
+++ b/ghc/rts/Disassembler.h
@@ -1,6 +1,4 @@
-
 /* -----------------------------------------------------------------------------
- * $Id: Disassembler.h,v 1.7 2001/02/11 17:51:07 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *

diff --git a/ghc/rts/Exception.h b/ghc/rts/Exception.h
index c20be8f..083faaf 100644 (file)
--- a/ghc/rts/Exception.h
+++ b/ghc/rts/Exception.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Exception.h,v 1.9 2004/08/13 13:09:46 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *

diff --git a/ghc/rts/FrontPanel.c b/ghc/rts/FrontPanel.c
index 92ed071..c263520 100644 (file)
--- a/ghc/rts/FrontPanel.c
+++ b/ghc/rts/FrontPanel.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: FrontPanel.c,v 1.10 2004/09/03 15:28:20 simonmar Exp $
  *
  * (c) The GHC Team 2000
  *

diff --git a/ghc/rts/FrontPanel.h b/ghc/rts/FrontPanel.h
index e2ea76c..c99a84b 100644 (file)
--- a/ghc/rts/FrontPanel.h
+++ b/ghc/rts/FrontPanel.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: FrontPanel.h,v 1.1 2000/11/01 11:41:47 simonmar Exp $
  *
  * (c) The GHC Team 2000
  *

diff --git a/ghc/rts/GC.c b/ghc/rts/GC.c
index 9d25926..d00ea3c 100644 (file)
--- a/ghc/rts/GC.c
+++ b/ghc/rts/GC.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: GC.c,v 1.169 2004/09/03 15:28:20 simonmar Exp $
  *
  * (c) The GHC Team 1998-2003
  *

diff --git a/ghc/rts/GCCompact.c b/ghc/rts/GCCompact.c
index 2dd59cc..0e2129f 100644 (file)
--- a/ghc/rts/GCCompact.c
+++ b/ghc/rts/GCCompact.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: GCCompact.c,v 1.20 2004/09/03 15:28:26 simonmar Exp $
  *
  * (c) The GHC Team 2001
  *

diff --git a/ghc/rts/GCCompact.h b/ghc/rts/GCCompact.h
index c709937..711b57b 100644 (file)
--- a/ghc/rts/GCCompact.h
+++ b/ghc/rts/GCCompact.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: GCCompact.h,v 1.3 2003/11/12 17:49:07 sof Exp $
  *
  * (c) The GHC Team 1998-1999
  *

diff --git a/ghc/rts/Hash.c b/ghc/rts/Hash.c
index 1083b8a..d3e4cf4 100644 (file)
--- a/ghc/rts/Hash.c
+++ b/ghc/rts/Hash.c
@@ -1,5 +1,4 @@
 /*-----------------------------------------------------------------------------
- * $Id: Hash.c,v 1.10 2003/03/25 17:58:47 sof Exp $
  *
  * (c) The AQUA Project, Glasgow University, 1995-1998
  * (c) The GHC Team, 1999

diff --git a/ghc/rts/Hash.h b/ghc/rts/Hash.h
index 7babfa0..208deb5 100644 (file)
--- a/ghc/rts/Hash.h
+++ b/ghc/rts/Hash.h
@@ -1,5 +1,4 @@
 /*-----------------------------------------------------------------------------
- * $Id: Hash.h,v 1.4 2000/12/04 12:31:21 simonmar Exp $
  *
  * (c) The GHC Team, 1999
  *

diff --git a/ghc/rts/HsFFI.c b/ghc/rts/HsFFI.c
index ec8f520..b89726c 100644 (file)
--- a/ghc/rts/HsFFI.c
+++ b/ghc/rts/HsFFI.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: HsFFI.c,v 1.3 2004/04/12 16:26:41 panne Exp $
  *
  * (c) The GHC Team, 2002
  *

diff --git a/ghc/rts/Interpreter.h b/ghc/rts/Interpreter.h
index 1823a92..3bb560f 100644 (file)
--- a/ghc/rts/Interpreter.h
+++ b/ghc/rts/Interpreter.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Interpreter.h,v 1.4 2002/12/11 15:36:42 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2002.
  *

diff --git a/ghc/rts/Itimer.c b/ghc/rts/Itimer.c
index 7ba7051..1f98659 100644 (file)
--- a/ghc/rts/Itimer.c
+++ b/ghc/rts/Itimer.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Itimer.c,v 1.37 2004/09/03 15:28:29 simonmar Exp $
  *
  * (c) The GHC Team, 1995-1999
  *

diff --git a/ghc/rts/Itimer.h b/ghc/rts/Itimer.h
index adfe12a..8eca9da 100644 (file)
--- a/ghc/rts/Itimer.h
+++ b/ghc/rts/Itimer.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Itimer.h,v 1.13 2003/03/29 00:27:11 sof Exp $
  *
  * (c) The GHC Team 1998-2001
  *

diff --git a/ghc/rts/LdvProfile.c b/ghc/rts/LdvProfile.c
index d0ed1c8..4c2dbab 100644 (file)
--- a/ghc/rts/LdvProfile.c
+++ b/ghc/rts/LdvProfile.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: LdvProfile.c,v 1.7 2004/08/13 13:10:05 simonmar Exp $
  *
  * (c) The GHC Team, 2001
  * Author: Sungwoo Park

diff --git a/ghc/rts/LdvProfile.h b/ghc/rts/LdvProfile.h
index 106e0e2..9a60780 100644 (file)
--- a/ghc/rts/LdvProfile.h
+++ b/ghc/rts/LdvProfile.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: LdvProfile.h,v 1.2 2001/11/26 16:54:21 simonmar Exp $
  *
  * (c) The GHC Team, 2001
  * Author: Sungwoo Park

diff --git a/ghc/rts/LinkerInternals.h b/ghc/rts/LinkerInternals.h
index 804b92b..deb9af2 100644 (file)
--- a/ghc/rts/LinkerInternals.h
+++ b/ghc/rts/LinkerInternals.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: LinkerInternals.h,v 1.7 2003/10/08 09:42:35 wolfgang Exp $
  *
  * (c) The GHC Team, 2000
  *

diff --git a/ghc/rts/MBlock.c b/ghc/rts/MBlock.c
index 5867c1b..ff4467f 100644 (file)
--- a/ghc/rts/MBlock.c
+++ b/ghc/rts/MBlock.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.c,v 1.51 2004/09/03 15:28:33 simonmar Exp $
  *
  * (c) The GHC Team 1998-1999
  *

diff --git a/ghc/rts/MBlock.h b/ghc/rts/MBlock.h
index 64fd459..b44f6dd 100644 (file)
--- a/ghc/rts/MBlock.h
+++ b/ghc/rts/MBlock.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: MBlock.h,v 1.20 2004/08/13 13:10:10 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/Main.c b/ghc/rts/Main.c
index cceb607..7721438 100644 (file)
--- a/ghc/rts/Main.c
+++ b/ghc/rts/Main.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Main.c,v 1.42 2004/09/03 15:28:34 simonmar Exp $
  *
  * (c) The GHC Team 1998-2000
  *

diff --git a/ghc/rts/Prelude.h b/ghc/rts/Prelude.h
index 8e268f4..613993b 100644 (file)
--- a/ghc/rts/Prelude.h
+++ b/ghc/rts/Prelude.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Prelude.h,v 1.26 2004/08/13 13:10:12 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2004
  *

diff --git a/ghc/rts/Printer.c b/ghc/rts/Printer.c
index 7074a43..0f65ac9 100644 (file)
--- a/ghc/rts/Printer.c
+++ b/ghc/rts/Printer.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Printer.c,v 1.64 2004/09/03 15:28:35 simonmar Exp $
  *
  * (c) The GHC Team, 1994-2000.
  *

diff --git a/ghc/rts/Printer.h b/ghc/rts/Printer.h
index f874fbe..23cd6d8 100644 (file)
--- a/ghc/rts/Printer.h
+++ b/ghc/rts/Printer.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Printer.h,v 1.7 2002/12/11 15:36:45 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *

diff --git a/ghc/rts/ProfHeap.c b/ghc/rts/ProfHeap.c
index dab6057..4e9e7f8 100644 (file)
--- a/ghc/rts/ProfHeap.c
+++ b/ghc/rts/ProfHeap.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.c,v 1.54 2004/09/03 15:28:35 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2003
  *

diff --git a/ghc/rts/ProfHeap.h b/ghc/rts/ProfHeap.h
index 82f0923..e8c7394 100644 (file)
--- a/ghc/rts/ProfHeap.h
+++ b/ghc/rts/ProfHeap.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: ProfHeap.h,v 1.4 2001/12/12 14:31:43 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/Profiling.c b/ghc/rts/Profiling.c
index b236429..1746c53 100644 (file)
--- a/ghc/rts/Profiling.c
+++ b/ghc/rts/Profiling.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Profiling.c,v 1.40 2004/09/03 15:28:37 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *

diff --git a/ghc/rts/Proftimer.c b/ghc/rts/Proftimer.c
index da8c7b8..3b49915 100644 (file)
--- a/ghc/rts/Proftimer.c
+++ b/ghc/rts/Proftimer.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Proftimer.c,v 1.13 2004/09/03 15:28:37 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/Proftimer.h b/ghc/rts/Proftimer.h
index 1ddfc50..5902762 100644 (file)
--- a/ghc/rts/Proftimer.h
+++ b/ghc/rts/Proftimer.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Proftimer.h,v 1.6 2001/11/22 14:25:12 simonmar Exp $
  *
  * (c) The GHC Team, 1998
  *

diff --git a/ghc/rts/RetainerProfile.c b/ghc/rts/RetainerProfile.c
index e45f875..5cd881f 100644 (file)
--- a/ghc/rts/RetainerProfile.c
+++ b/ghc/rts/RetainerProfile.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RetainerProfile.c,v 1.12 2004/09/03 15:28:38 simonmar Exp $
  *
  * (c) The GHC Team, 2001
  * Author: Sungwoo Park

diff --git a/ghc/rts/RetainerProfile.h b/ghc/rts/RetainerProfile.h
index 5eec192..827daa8 100644 (file)
--- a/ghc/rts/RetainerProfile.h
+++ b/ghc/rts/RetainerProfile.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RetainerProfile.h,v 1.4 2004/08/13 13:10:29 simonmar Exp $
  *
  * (c) The GHC Team, 2001
  * Author: Sungwoo Park

diff --git a/ghc/rts/RetainerSet.c b/ghc/rts/RetainerSet.c
index 2990a38..3196843 100644 (file)
--- a/ghc/rts/RetainerSet.c
+++ b/ghc/rts/RetainerSet.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RetainerSet.c,v 1.6 2004/09/03 15:28:39 simonmar Exp $
  *
  * (c) The GHC Team, 2001
  * Author: Sungwoo Park

diff --git a/ghc/rts/RetainerSet.h b/ghc/rts/RetainerSet.h
index c42d6ad..1ab0976 100644 (file)
--- a/ghc/rts/RetainerSet.h
+++ b/ghc/rts/RetainerSet.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RetainerSet.h,v 1.3 2004/09/03 15:28:39 simonmar Exp $
  *
  * (c) The GHC Team, 2001
  * Author: Sungwoo Park

diff --git a/ghc/rts/RtsAPI.c b/ghc/rts/RtsAPI.c
index c91253b..166778e 100644 (file)
--- a/ghc/rts/RtsAPI.c
+++ b/ghc/rts/RtsAPI.c
@@ -1,5 +1,4 @@
 /* ----------------------------------------------------------------------------
- * $Id: RtsAPI.c,v 1.52 2004/09/03 15:28:39 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2001
  *

diff --git a/ghc/rts/RtsDllMain.c b/ghc/rts/RtsDllMain.c
index bc5cb07..af3c509 100644 (file)
--- a/ghc/rts/RtsDllMain.c
+++ b/ghc/rts/RtsDllMain.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsDllMain.c,v 1.3 2001/08/14 13:40:09 sewardj Exp $
  *
  * (c) The GHC Team 1999-2000
  *

diff --git a/ghc/rts/RtsFlags.c b/ghc/rts/RtsFlags.c
index d79136b..c12ee8b 100644 (file)
--- a/ghc/rts/RtsFlags.c
+++ b/ghc/rts/RtsFlags.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsFlags.c,v 1.76 2004/09/03 15:28:40 simonmar Exp $
  *
  * (c) The AQUA Project, Glasgow University, 1994-1997
  * (c) The GHC Team, 1998-1999

diff --git a/ghc/rts/RtsStartup.c b/ghc/rts/RtsStartup.c
index 4e6a68c..a806763 100644 (file)
--- a/ghc/rts/RtsStartup.c
+++ b/ghc/rts/RtsStartup.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsStartup.c,v 1.83 2004/09/03 15:28:42 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2002
  *

diff --git a/ghc/rts/Sanity.h b/ghc/rts/Sanity.h
index eeba793..892c74b 100644 (file)
--- a/ghc/rts/Sanity.h
+++ b/ghc/rts/Sanity.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Sanity.h,v 1.10 2002/12/11 15:36:50 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/Select.c b/ghc/rts/Select.c
index a604bcd..2687064 100644 (file)
--- a/ghc/rts/Select.c
+++ b/ghc/rts/Select.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Select.c,v 1.33 2004/09/03 15:28:53 simonmar Exp $
  *
  * (c) The GHC Team 1995-2002
  *

diff --git a/ghc/rts/Signals.c b/ghc/rts/Signals.c
index 3d287d6..d5a046e 100644 (file)
--- a/ghc/rts/Signals.c
+++ b/ghc/rts/Signals.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Signals.c,v 1.42 2004/09/03 15:28:53 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/Signals.h b/ghc/rts/Signals.h
index 93cc889..4825fb7 100644 (file)
--- a/ghc/rts/Signals.h
+++ b/ghc/rts/Signals.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Signals.h,v 1.12 2003/10/20 17:15:29 sof Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/Sparks.c b/ghc/rts/Sparks.c
index 9571d7a..07b3b6e 100644 (file)
--- a/ghc/rts/Sparks.c
+++ b/ghc/rts/Sparks.c
@@ -1,5 +1,4 @@
 /* ---------------------------------------------------------------------------
- * $Id: Sparks.c,v 1.8 2004/09/03 15:28:54 simonmar Exp $
  *
  * (c) The GHC Team, 2000
  *

diff --git a/ghc/rts/Sparks.h b/ghc/rts/Sparks.h
index 25a9d77..f9cce17 100644 (file)
--- a/ghc/rts/Sparks.h
+++ b/ghc/rts/Sparks.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Sparks.h,v 1.4 2002/01/24 02:06:49 sof Exp $
  *
  * (c) The GHC Team, 2000
  *

diff --git a/ghc/rts/Stable.c b/ghc/rts/Stable.c
index 80b247c..a2b1136 100644 (file)
--- a/ghc/rts/Stable.c
+++ b/ghc/rts/Stable.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stable.c,v 1.30 2004/09/03 15:28:55 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2002
  *

diff --git a/ghc/rts/Stats.h b/ghc/rts/Stats.h
index e3e53c1..c3efd36 100644 (file)
--- a/ghc/rts/Stats.h
+++ b/ghc/rts/Stats.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Stats.h,v 1.18 2004/05/27 09:29:29 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/StgCRun.c b/ghc/rts/StgCRun.c
index 79104e7..db69424 100644 (file)
--- a/ghc/rts/StgCRun.c
+++ b/ghc/rts/StgCRun.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgCRun.c,v 1.44 2004/09/03 15:28:56 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2003
  *

diff --git a/ghc/rts/StgPrimFloat.c b/ghc/rts/StgPrimFloat.c
index a0cc95d..5bd6aeb 100644 (file)
--- a/ghc/rts/StgPrimFloat.c
+++ b/ghc/rts/StgPrimFloat.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgPrimFloat.c,v 1.9 2002/07/17 09:21:51 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *

diff --git a/ghc/rts/StrHash.c b/ghc/rts/StrHash.c
index f49610a..092aa50 100644 (file)
--- a/ghc/rts/StrHash.c
+++ b/ghc/rts/StrHash.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: StrHash.c,v 1.3 2001/08/14 13:40:09 sewardj Exp $
  *
  * (c) The GHC Team, 1994-2000
  *

diff --git a/ghc/rts/StrHash.h b/ghc/rts/StrHash.h
index c16e510..bdf6196 100644 (file)
--- a/ghc/rts/StrHash.h
+++ b/ghc/rts/StrHash.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: StrHash.h,v 1.1 2000/04/05 15:32:08 simonmar Exp $
  *
  * (c) The GHC Team, 1994-2000
  *

diff --git a/ghc/rts/Ticky.c b/ghc/rts/Ticky.c
index 92c18ea..294e12b 100644 (file)
--- a/ghc/rts/Ticky.c
+++ b/ghc/rts/Ticky.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Ticky.c,v 1.18 2004/08/13 13:11:08 simonmar Exp $
  *
  * (c) The AQUA project, Glasgow University, 1992-1997
  * (c) The GHC Team, 1998-1999

diff --git a/ghc/rts/Ticky.h b/ghc/rts/Ticky.h
index 9f93e29..21765e4 100644 (file)
--- a/ghc/rts/Ticky.h
+++ b/ghc/rts/Ticky.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Ticky.h,v 1.1 1999/01/21 10:31:53 simonm Exp $
  *
  * (c) The GHC Team 1999
  *

diff --git a/ghc/rts/VisCallbacks.c b/ghc/rts/VisCallbacks.c
index dbcc847..8e3c6ce 100644 (file)
--- a/ghc/rts/VisCallbacks.c
+++ b/ghc/rts/VisCallbacks.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: VisCallbacks.c,v 1.2 2001/08/14 13:40:09 sewardj Exp $
  *
  * (c) The GHC Team 2000
  *

diff --git a/ghc/rts/Weak.c b/ghc/rts/Weak.c
index afc8bae..787c9e4 100644 (file)
--- a/ghc/rts/Weak.c
+++ b/ghc/rts/Weak.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: Weak.c,v 1.33 2004/09/03 15:28:59 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *

diff --git a/ghc/rts/gmp/ansi2knr.c b/ghc/rts/gmp/ansi2knr.c
index 7d5dc63..937c731 100644 (file)
--- a/ghc/rts/gmp/ansi2knr.c
+++ b/ghc/rts/gmp/ansi2knr.c
@@ -1,6 +1,5 @@
 /* Copyright (C) 1989, 1997, 1998, 1999 Aladdin Enterprises.  All rights reserved. */
 
-/*$Id: ansi2knr.c,v 1.1 2000/08/18 15:44:26 simonmar Exp $*/
 /* Convert ANSI C function definitions to K&R ("traditional C") syntax */
 
 /*

diff --git a/ghc/rts/gmp/mkinstalldirs b/ghc/rts/gmp/mkinstalldirs
index cd1fe0a..5e17cd3 100644 (file)
--- a/ghc/rts/gmp/mkinstalldirs
+++ b/ghc/rts/gmp/mkinstalldirs
@@ -12,15 +12,21 @@ do
    shift
 
    pathcomp=
-   for d in ${1+"$@"} ; do
+   for d
+   do
      pathcomp="$pathcomp$d"
      case "$pathcomp" in
        -* ) pathcomp=./$pathcomp ;;
      esac
 
      if test ! -d "$pathcomp"; then
-        echo "mkdir $pathcomp" 1>&2
-        mkdir "$pathcomp" || errstatus=$?
+        echo "mkdir $pathcomp"
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+         errstatus=$lasterr
+        fi
      fi
 
      pathcomp="$pathcomp/"

diff --git a/ghc/rts/hooks/FlagDefaults.c b/ghc/rts/hooks/FlagDefaults.c
index adf722c..393d39b 100644 (file)
--- a/ghc/rts/hooks/FlagDefaults.c
+++ b/ghc/rts/hooks/FlagDefaults.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: FlagDefaults.c,v 1.2 1998/12/02 13:29:11 simonm Exp $
  *
  * User-overridable RTS hooks.
  *

diff --git a/ghc/rts/hooks/InitEachPE.c b/ghc/rts/hooks/InitEachPE.c
index fa0e7a7..cc9cdc0 100644 (file)
--- a/ghc/rts/hooks/InitEachPE.c
+++ b/ghc/rts/hooks/InitEachPE.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: InitEachPE.c,v 1.3 2001/03/22 03:51:11 hwloidl Exp $
  *
  * User-overridable RTS hooks.
  *

diff --git a/ghc/rts/hooks/MallocFail.c b/ghc/rts/hooks/MallocFail.c
index c4af10a..1218d1d 100644 (file)
--- a/ghc/rts/hooks/MallocFail.c
+++ b/ghc/rts/hooks/MallocFail.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: MallocFail.c,v 1.3 2002/07/17 09:21:51 simonmar Exp $
  *
  * User-overridable RTS hooks.
  *

diff --git a/ghc/rts/hooks/OnExit.c b/ghc/rts/hooks/OnExit.c
index 67201c3..dd4c3b4 100644 (file)
--- a/ghc/rts/hooks/OnExit.c
+++ b/ghc/rts/hooks/OnExit.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: OnExit.c,v 1.2 1998/12/02 13:29:14 simonm Exp $
  *
  * User-overridable RTS hooks.
  *

diff --git a/ghc/rts/hooks/OutOfHeap.c b/ghc/rts/hooks/OutOfHeap.c
index 587587b..98db0d7 100644 (file)
--- a/ghc/rts/hooks/OutOfHeap.c
+++ b/ghc/rts/hooks/OutOfHeap.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: OutOfHeap.c,v 1.5 2003/10/31 16:22:11 sof Exp $
  *
  * User-overridable RTS hooks.
  *

diff --git a/ghc/rts/hooks/RtsOpts.c b/ghc/rts/hooks/RtsOpts.c
index 177086d..b934b05 100644 (file)
--- a/ghc/rts/hooks/RtsOpts.c
+++ b/ghc/rts/hooks/RtsOpts.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: RtsOpts.c,v 1.2 2002/07/17 09:21:51 simonmar Exp $
  *
  * Default RTS options.
  *

diff --git a/ghc/rts/hooks/ShutdownEachPEHook.c b/ghc/rts/hooks/ShutdownEachPEHook.c
index a452193..f5e3ba9 100644 (file)
--- a/ghc/rts/hooks/ShutdownEachPEHook.c
+++ b/ghc/rts/hooks/ShutdownEachPEHook.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: ShutdownEachPEHook.c,v 1.1 2001/03/22 03:51:11 hwloidl Exp $
  *
  * User-overridable RTS hooks.
  *

diff --git a/ghc/rts/hooks/StackOverflow.c b/ghc/rts/hooks/StackOverflow.c
index a14b069..a395a3a 100644 (file)
--- a/ghc/rts/hooks/StackOverflow.c
+++ b/ghc/rts/hooks/StackOverflow.c
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: StackOverflow.c,v 1.3 2002/07/17 09:21:51 simonmar Exp $
  *
  * User-overridable RTS hooks.
  *

diff --git a/ghc/rts/parallel/0Hash.c b/ghc/rts/parallel/0Hash.c
index 56e6646..a471e30 100644 (file)
--- a/ghc/rts/parallel/0Hash.c
+++ b/ghc/rts/parallel/0Hash.c
@@ -1,5 +1,4 @@
 /*-----------------------------------------------------------------------------
- * $Id: 0Hash.c,v 1.2 2000/01/13 14:34:06 hwloidl Exp $
  *
  * (c) The AQUA Project, Glasgow University, 1995-1998
  * (c) The GHC Team, 1999

diff --git a/ghc/rts/parallel/FetchMe.h b/ghc/rts/parallel/FetchMe.h
index 94323af..be5cbf6 100644 (file)
--- a/ghc/rts/parallel/FetchMe.h
+++ b/ghc/rts/parallel/FetchMe.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: FetchMe.h,v 1.3 2001/03/22 03:51:11 hwloidl Exp $
  *
  * Closure types for the parallel system.
  *

diff --git a/ghc/rts/parallel/FetchMe.hc b/ghc/rts/parallel/FetchMe.hc
index 799f126..f142e9e 100644 (file)
--- a/ghc/rts/parallel/FetchMe.hc
+++ b/ghc/rts/parallel/FetchMe.hc
@@ -1,6 +1,5 @@
 /* ----------------------------------------------------------------------------
  Time-stamp: <Tue Mar 06 2001 17:01:46 Stardate: [-30]6288.54 hwloidl>
- $Id: FetchMe.hc,v 1.7 2001/03/23 16:36:21 simonmar Exp $
 
  Entry code for a FETCH_ME closure
 

diff --git a/ghc/rts/parallel/Global.c b/ghc/rts/parallel/Global.c
index 9f51475..b254135 100644 (file)
--- a/ghc/rts/parallel/Global.c
+++ b/ghc/rts/parallel/Global.c
@@ -1,6 +1,5 @@
 /* ---------------------------------------------------------------------------
    Time-stamp: <Wed Mar 21 2001 16:32:23 Stardate: [-30]6363.44 hwloidl>
-   $Id: Global.c,v 1.4 2001/03/22 03:51:11 hwloidl Exp $
 
    (c) The AQUA/Parade Projects, Glasgow University, 1995
        The GdH/APART 624 Projects, Heriot-Watt University, Edinburgh, 1999

diff --git a/ghc/rts/parallel/GranSim.c b/ghc/rts/parallel/GranSim.c
index 3e799ad..b1cc096 100644 (file)
--- a/ghc/rts/parallel/GranSim.c
+++ b/ghc/rts/parallel/GranSim.c
@@ -1,6 +1,5 @@
 /* 
    Time-stamp: <Tue Mar 06 2001 00:17:42 Stardate: [-30]6285.06 hwloidl>
-   $Id: GranSim.c,v 1.5 2001/07/23 17:23:20 simonmar Exp $
 
    Variables and functions specific to GranSim the parallelism simulator
    for GPH.

diff --git a/ghc/rts/parallel/GranSimRts.h b/ghc/rts/parallel/GranSimRts.h
index d467fb0..fc31a1f 100644 (file)
--- a/ghc/rts/parallel/GranSimRts.h
+++ b/ghc/rts/parallel/GranSimRts.h
@@ -1,6 +1,5 @@
 /* --------------------------------------------------------------------------
    Time-stamp: <Tue Mar 06 2001 00:18:30 Stardate: [-30]6285.06 hwloidl>
-   $Id: GranSimRts.h,v 1.4 2001/03/22 03:51:11 hwloidl Exp $
 
    Variables and functions specific to GranSim.
    ----------------------------------------------------------------------- */

diff --git a/ghc/rts/parallel/HLC.h b/ghc/rts/parallel/HLC.h
index 10d91fa..793ac84 100644 (file)
--- a/ghc/rts/parallel/HLC.h
+++ b/ghc/rts/parallel/HLC.h
@@ -1,6 +1,5 @@
 /* --------------------------------------------------------------------------
    Time-stamp: <Sun Mar 18 2001 20:16:14 Stardate: [-30]6349.22 hwloidl>
-   $Id: HLC.h,v 1.3 2001/03/22 03:51:11 hwloidl Exp $
 
    High Level Communications Header (HLC.h)
 

diff --git a/ghc/rts/parallel/HLComms.c b/ghc/rts/parallel/HLComms.c
index 9435536..b0982e4 100644 (file)
--- a/ghc/rts/parallel/HLComms.c
+++ b/ghc/rts/parallel/HLComms.c
@@ -1,6 +1,5 @@
 /* ----------------------------------------------------------------------------
  * Time-stamp: <Wed Mar 21 2001 16:34:41 Stardate: [-30]6363.45 hwloidl>
- * $Id: HLComms.c,v 1.6 2001/08/14 13:40:10 sewardj Exp $
  *
  * High Level Communications Routines (HLComms.lc)
  *

diff --git a/ghc/rts/parallel/LLC.h b/ghc/rts/parallel/LLC.h
index e103297..536e431 100644 (file)
--- a/ghc/rts/parallel/LLC.h
+++ b/ghc/rts/parallel/LLC.h
@@ -1,6 +1,5 @@
 /* --------------------------------------------------------------------------
    Time-stamp: <Sun Mar 18 2001 21:23:50 Stardate: [-30]6349.45 hwloidl>
-   $Id: LLC.h,v 1.4 2001/03/22 03:51:11 hwloidl Exp $
 
    Low Level Communications Header (LLC.h)
 

diff --git a/ghc/rts/parallel/LLComms.c b/ghc/rts/parallel/LLComms.c
index db56bc6..baa6ddd 100644 (file)
--- a/ghc/rts/parallel/LLComms.c
+++ b/ghc/rts/parallel/LLComms.c
@@ -1,6 +1,5 @@
 /* ----------------------------------------------------------------------------
  * Time-stamp: <Mon Mar 19 2001 22:10:38 Stardate: [-30]6354.62 hwloidl>
- * $Id: LLComms.c,v 1.5 2001/08/14 13:40:10 sewardj Exp $
  *
  * GUM Low-Level Inter-Task Communication
  *

diff --git a/ghc/rts/parallel/Pack.c b/ghc/rts/parallel/Pack.c
index 75e12e0..e8653f6 100644 (file)
--- a/ghc/rts/parallel/Pack.c
+++ b/ghc/rts/parallel/Pack.c
@@ -1,6 +1,5 @@
 /* 
    Time-stamp: <Wed Mar 21 2001 16:32:47 Stardate: [-30]6363.44 hwloidl>
-   $Id: Pack.c,v 1.8 2001/07/24 05:04:59 ken Exp $
 
    Graph packing and unpacking code for sending it to another processor
    and retrieving the original graph structure from the packet.

diff --git a/ghc/rts/parallel/ParInit.c b/ghc/rts/parallel/ParInit.c
index f77564c..22c9119 100644 (file)
--- a/ghc/rts/parallel/ParInit.c
+++ b/ghc/rts/parallel/ParInit.c
@@ -1,6 +1,5 @@
 /* --------------------------------------------------------------------------
    Time-stamp: <Wed Mar 21 2001 16:37:16 Stardate: [-30]6363.46 hwloidl>
-   $Id: ParInit.c,v 1.5 2001/08/14 13:40:10 sewardj Exp $
 
    Initialising the parallel RTS
 

diff --git a/ghc/rts/parallel/ParTicky.c b/ghc/rts/parallel/ParTicky.c
index 5cc9060..97f8d69 100644 (file)
--- a/ghc/rts/parallel/ParTicky.c
+++ b/ghc/rts/parallel/ParTicky.c
@@ -1,5 +1,4 @@
 /* -------------------------------------------------------------------------
- * $Id: ParTicky.c,v 1.1 2001/03/22 03:51:11 hwloidl Exp $
  *
  * (c) Hans-Wolfgang Loidl, 2000-
  *

diff --git a/ghc/rts/parallel/ParTicky.h b/ghc/rts/parallel/ParTicky.h
index d45272e..1d6e743 100644 (file)
--- a/ghc/rts/parallel/ParTicky.h
+++ b/ghc/rts/parallel/ParTicky.h
@@ -1,5 +1,4 @@
 /* --------------------------------------------------------------------------
- * $Id: ParTicky.h,v 1.1 2001/03/22 03:51:11 hwloidl Exp $
  *
  * (c) Hans-Wolfgang Loidl, 2000-
  *

diff --git a/ghc/rts/parallel/ParTypes.h b/ghc/rts/parallel/ParTypes.h
index b280eae..910a6f2 100644 (file)
--- a/ghc/rts/parallel/ParTypes.h
+++ b/ghc/rts/parallel/ParTypes.h
@@ -1,6 +1,5 @@
 /* ---------------------------------------------------------------------------
  * Time-stamp: <Tue Nov 09 1999 16:31:38 Stardate: [-30]3873.44 hwloidl>
- * $Id: ParTypes.h,v 1.2 2000/01/13 14:34:08 hwloidl Exp $  
  *
  * Runtime system types for GUM
  *

diff --git a/ghc/rts/parallel/ParallelRts.h b/ghc/rts/parallel/ParallelRts.h
index 5ad3c8d..d421296 100644 (file)
--- a/ghc/rts/parallel/ParallelRts.h
+++ b/ghc/rts/parallel/ParallelRts.h
@@ -1,6 +1,5 @@
 /* --------------------------------------------------------------------------
    Time-stamp: <Tue Mar 06 2001 00:25:50 Stardate: [-30]6285.08 hwloidl>
-   $Id: ParallelRts.h,v 1.4 2001/03/22 03:51:12 hwloidl Exp $
 
    Variables and functions specific to the parallel RTS (i.e. GUM or GranSim)
    ----------------------------------------------------------------------- */

diff --git a/ghc/rts/parallel/SysMan.c b/ghc/rts/parallel/SysMan.c
index ea27228..44b3945 100644 (file)
--- a/ghc/rts/parallel/SysMan.c
+++ b/ghc/rts/parallel/SysMan.c
@@ -1,6 +1,5 @@
 /* ----------------------------------------------------------------------------
    Time-stamp: <Wed Mar 21 2001 17:16:28 Stardate: [-30]6363.59 hwloidl>
-   $Id: SysMan.c,v 1.5 2001/08/14 13:40:10 sewardj Exp $
 
    GUM System Manager Program
    Handles startup, shutdown and global synchronisation of the parallel system.
@@ -295,7 +294,7 @@ main (int argc, char **argv) {
 
   IF_PAR_DEBUG(verbose,
               fprintf(stderr,
-                      "==== RFP: GdH enabled SysMan reporting for duty ($Revision: 1.5 $)\n"));
+                      "==== RFP: GdH enabled SysMan reporting for duty ($Revision: 1.6 $)\n"));
   
   if (argc > 1) {
     if (*argv[1] == '-') {