This reverts commit 0449cb06.

Conflicts:

	.gitignore

To make batch linking work now that haskell98 is not automatically linked.

mkdepenC has gone away, and we don't care about C sources in nofib anyway

This allows you to use nofib in a tree built with validate

Run each nofib program multiple times, tunable by the $(NoFibRuns)
variable.  nofib-analyse already knows how to average the times from
multiple runs.

Suppress printing of the runstdtest command line in GHCi mode.

More fixes for the GHCi way

Fixes to get NoFibWithGHCi going again.

oops, I broke overriding of suffix rules when I moved the include of
suffix.mk into target.mk.  Hence, hack around it here by moving
nofib's suffix.mk after the include of target.mk.

wibbles to do with the FAST/NORM/SLOW modes.  We default to the normal
.stdout file if the .$(mode)stdout file doesn't exist, and similarly
for stderr.

Fix to make NoFib work with GHCi again.

Add ability for NoFib to be run with various different modes.

The mode is set by changing a variable called "mode".

This allows tests to be run for different lengths of time, depending on what kin
d of test is wanted.

Current modes are:

<unset> = default mode. Like previous NoFib.
"slow" = tries to run for around 10-20 seconds on my workstation.

A test is given several modes by giving it the following:
        <test>.stdout -> <test>.<mode>stdout
        <test>.stdin -> <test>.<mode>stdin

Args are set in the makefile as

<mode>_OPTS

Add way to ==nofib== banner (it's now `==nofib==' for normal and
`==nofib_way==' for way `way'.  At the moment nofib-analyse only looks
for `==nofib==', and so now it won't be misled by, e.g., excessive
runtimes for the ticky way.

To collect stats from non-standard ways, nofib-analyse will have to be
modified.

Switch over to the new hierarchical libraries
---------------------------------------------

This commit reorganises our libraries to use the new hierarchical
module namespace extension.

The basic story is this:

   - fptools/libraries contains the new hierarchical libraries.
     Everything in here is "clean", i.e. most deprecated stuff has
     been removed.

	- fptools/libraries/base is the new base package
	  (replacing "std") and contains roughly what was previously
	  in std, lang, and concurrent, minus deprecated stuff.
	  Things that are *not allowed* in libraries/base include:
		Addr, ForeignObj, ByteArray, MutableByteArray,
		_casm_, _ccall_, ``'', PrimIO

	  For ByteArrays and MutableByteArrays we use UArray and
	  STUArray/IOUArray respectively now.

	  Modules previously called PrelFoo are now under
	  fptools/libraries/GHC.  eg. PrelBase is now GHC.Base.

	- fptools/libraries/haskell98 provides the Haskell 98 std.
	  libraries (Char, IO, Numeric etc.) as a package.  This
	  package is enabled by default.

	- fptools/libraries/network is a rearranged version of
	  the existing net package (the old package net is still
	  available; see below).

	- Other packages will migrate to fptools/libraries in
	  due course.

     NB. you need to checkout fptools/libraries as well as
     fptools/hslibs now.  The nightly build scripts will need to be
     tweaked.

   - fptools/hslibs still contains (almost) the same stuff as before.
     Where libraries have moved into the new hierarchy, the hslibs
     version contains a "stub" that just re-exports the new version.
     The idea is that code will gradually migrate from fptools/hslibs
     into fptools/libraries as it gets cleaned up, and in a version or
     two we can remove the old packages altogether.

   - I've taken the opportunity to make some changes to the build
     system, ripping out the old hslibs Makefile stuff from
     mk/target.mk; the new package building Makefile code is in
     mk/package.mk (auto-included from mk/target.mk).

     The main improvement is that packages now register themselves at
     make boot time using ghc-pkg, and the monolithic package.conf
     in ghc/driver is gone.

     I've updated the standard packages but haven't tested win32,
     graphics, xlib, object-io, or OpenGL yet.  The Makefiles in
     these packages may need some further tweaks, and they'll need
     pkg.conf.in files added.

   - Unfortunately all this rearrangement meant I had to bump the
     interface-file version and create a bunch of .hi-boot-6 files :-(

An ugly hack is now needed in here after my build system changes the
other day.  Oh dear, I hope I haven't created a monster.  Well, it can
always be backed out I suppose.

Allow the stdin file to be specified by setting STDIN_FILE.

Wibbles to the GHCi support.  Most of the spectral suite goes through now.

More hacks to run the Nofib with GHCi:

    - allow arguments to be given the program: these are now
      set using PROG_ARGS in the Makefile rather than just
      adding to SRC_RUNTEST_OPTS as we did before.

    - pass $(HC_OPTS) to GHCi (after filtering out some
      undesirable stuff).

Nofib support for running with GHCi.  Run like this:

    make NoFibWithGHCi=YES

or set NoFibWithGHCi=YES in your build.mk.

Cleanup in parallel section of nofib suite. The fibish fcts are ok, i.e.
std way should succeed, parallel way should build.
Parallel way has to be run by hand (problems redirecting stdout), so not
automatic check whether output is identical to the provided file.
Added a bunch of test prgs for GdH in distributed section. Still need
to be integrated into nofib build machinery (currently standalone Makefiles).
Modified Makefiles to work with a parallel build. Have to omit runtest for now.

-*- outline -*-
Time-stamp: <Thu Mar 22 2001 03:50:16 Stardate: [-30]6365.79 hwloidl>

This commit covers changes in GHC to get GUM (way=mp) and GUM/GdH (way=md)
working. It is a merge of my working version of GUM, based on GHC 4.06,
with GHC 4.11. Almost all changes are in the RTS (see below).

GUM is reasonably stable, we used the 4.06 version in large-ish programs for
recent papers. Couple of things I want to change, but nothing urgent.
GUM/GdH has just been merged and needs more testing. Hope to do that in the
next weeks. It works in our working build but needs tweaking to run.
GranSim doesn't work yet (*sigh*). Most of the code should be in, but needs
more debugging.

ToDo: I still want to make the following minor modifications before the release
- Better wrapper skript for parallel execution [ghc/compiler/main]
- Update parallel docu: started on it but it's minimal [ghc/docs/users_guide]
- Clean up [nofib/parallel]: it's a real mess right now (*sigh*)
- Update visualisation tools (minor things only IIRC) [ghc/utils/parallel]
- Add a Klingon-English glossary

* RTS:

Almost all changes are restricted to ghc/rts/parallel and should not
interfere with the rest. I only comment on changes outside the parallel
dir:

- Several changes in Schedule.c (scheduling loop; createThreads etc);
  should only affect parallel code
- Added ghc/rts/hooks/ShutdownEachPEHook.c
- ghc/rts/Linker.[ch]: GUM doesn't know about Stable Names (ifdefs)!!
- StgMiscClosures.h: END_TSO_QUEUE etc now defined here (from StgMiscClosures.hc)
                     END_ECAF_LIST was missing a leading stg_
- SchedAPI.h: taskStart now defined in here; it's only a wrapper around
              scheduleThread now, but might use some init, shutdown later
- RtsAPI.h: I have nuked the def of rts_evalNothing

* Compiler:

- ghc/compiler/main/DriverState.hs
  added PVM-ish flags to the parallel way
  added new ways for parallel ticky profiling and distributed exec

- ghc/compiler/main/DriverPipeline.hs
  added a fct run_phase_MoveBinary which is called with way=mp after linking;
  it moves the bin file into a PVM dir and produces a wrapper script for
  parallel execution
  maybe cleaner to add a MoveBinary phase in DriverPhases.hs but this way
  it's less intrusive and MoveBinary makes probably only sense for mp anyway

* Nofib:

- nofib/spectral/Makefile, nofib/real/Makefile, ghc/tests/programs/Makefile:
  modified to skip some tests if HWL_NOFIB_HACK is set; only tmp to record
  which test prgs cause problems in my working build right now

Don't pass -K in SRC_HC_OPTS, as it is no longer supported.

Remove spurious white space (esp. potentially make-confusing tabs).