[project @ 2000-12-04 12:31:19 by simonmar]
authorsimonmar <unknown>
Mon, 4 Dec 2000 12:31:23 +0000 (12:31 +0000)
committersimonmar <unknown>
Mon, 4 Dec 2000 12:31:23 +0000 (12:31 +0000)
commit9ac55e08e159d7a4647ab01e7872e69dd762f275
tree425ced43cb577ec931cb7b6f8ffb5709116cced9
parentfc24db9ef648205faad96cb54b56710a9780a847
[project @ 2000-12-04 12:31:19 by simonmar]
merge recent changes from before-ghci-branch onto the HEAD
46 files changed:
ghc/compiler/absCSyn/CLabel.lhs
ghc/compiler/absCSyn/CallConv.lhs
ghc/compiler/nativeGen/MachCode.lhs
ghc/compiler/nativeGen/StixPrim.lhs
ghc/compiler/prelude/primops.txt
ghc/compiler/simplCore/Simplify.lhs
ghc/compiler/simplStg/StgVarInfo.lhs
ghc/compiler/typecheck/Inst.lhs
ghc/driver/Makefile
ghc/includes/Assembler.h
ghc/includes/ClosureMacros.h
ghc/includes/HsFFI.h
ghc/includes/Linker.h [new file with mode: 0644]
ghc/includes/PrimOps.h
ghc/includes/SchedAPI.h
ghc/includes/Stg.h
ghc/includes/StgMacros.h
ghc/includes/StgMiscClosures.h
ghc/includes/Updates.h
ghc/lib/std/PrelGHC.hi-boot
ghc/rts/Exception.h
ghc/rts/Exception.hc
ghc/rts/GC.c
ghc/rts/Hash.c
ghc/rts/Hash.h
ghc/rts/MBlock.c
ghc/rts/MBlock.h
ghc/rts/PrimOps.hc
ghc/rts/ProfHeap.c
ghc/rts/RtsAPI.c
ghc/rts/RtsFlags.c
ghc/rts/RtsFlags.h
ghc/rts/RtsStartup.c
ghc/rts/Sanity.c
ghc/rts/Schedule.c
ghc/rts/Schedule.h
ghc/rts/Stats.c
ghc/rts/Stats.h
ghc/rts/StgCRun.c
ghc/rts/StgMiscClosures.hc
ghc/rts/StgStdThunks.hc
ghc/rts/Storage.c
ghc/rts/Storage.h
ghc/rts/StoragePriv.h
ghc/rts/Updates.hc
ghc/rts/Weak.c