cvs commit: fptools/ghc/compiler/absCSyn CLabel.lhs CallConv.lhs fptools/ghc/compiler/nativeGen MachCode.lhs StixPrim.lhs fptools/ghc/compiler/prelude primops.txt fptools/ghc/compiler/simplCore Simplify.lhs fptools/ghc/compiler/simplStg StgVarInfo.lhs ...

[Simon Marlow]

simonmar    2000/12/04 04:31:23 PST

  Modified files:
    ghc/compiler/absCSyn CLabel.lhs CallConv.lhs 
    ghc/compiler/nativeGen MachCode.lhs 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 ClosureMacros.h HsFFI.h 
                         PrimOps.h SchedAPI.h Stg.h StgMacros.h 
                         StgMiscClosures.h Updates.h 
    ghc/lib/std          PrelGHC.hi-boot 
    ghc/rts              Exception.h Exception.hc GC.c Hash.c 
                         Hash.h MBlock.c MBlock.h PrimOps.hc 
                         ProfHeap.c RtsAPI.c RtsFlags.c RtsFlags.h 
                         RtsStartup.c Sanity.c Schedule.c 
                         Schedule.h Stats.c Stats.h StgCRun.c 
                         StgMiscClosures.hc StgStdThunks.hc 
                         Storage.c Storage.h StoragePriv.h 
                         Updates.hc Weak.c 
    hslibs/OpenGL        Makefile 
    hslibs/OpenGL/GL     GL.hs GL_BasicTypes.hs GL_Constants.hs 
    hslibs/lang          IOExts.lhs 
  Added files:
    ghc/includes         Linker.h 
    hslibs/OpenGL        .cvsignore configure.in 
    hslibs/OpenGL/GL     GLUT.hs GLUT_CBGlobal.hs GLUT_CBWindow.hs 
                         GLUT_CallbackUtils.hs GLUT_Constants.hs 
                         GLUT_Init.hs GLUT_Window.hs 
                         GL_BeginEnd.hs GL_Colors.hs 
                         GL_CoordTrans.hs GL_FlushFinish.hs 
                         GL_Framebuffer.hs GL_Marshall.hs 
                         GL_Rectangles.hs GL_VertexSpec.hs 
  Log:
  merge recent changes from before-ghci-branch onto the HEAD
  
  Revision  Changes    Path
  1.44      +1 -1      fptools/ghc/compiler/absCSyn/CLabel.lhs
  1.5       +0 -25     fptools/ghc/compiler/absCSyn/CallConv.lhs
  1.62      +19 -9     fptools/ghc/compiler/nativeGen/MachCode.lhs
  1.57      +9 -2      fptools/ghc/compiler/nativeGen/StixPrim.lhs
  1.7       +8 -1      fptools/ghc/compiler/prelude/primops.txt
  1.94      +25 -11    fptools/ghc/compiler/simplCore/Simplify.lhs
  1.26      +10 -4     fptools/ghc/compiler/simplStg/StgVarInfo.lhs
  1.69      +6 -4      fptools/ghc/compiler/typecheck/Inst.lhs
  1.47      +1 -1      fptools/ghc/driver/Makefile
  1.20      +1 -2      fptools/ghc/includes/Assembler.h
  1.29      +1 -173    fptools/ghc/includes/ClosureMacros.h
  1.11      +1 -1      fptools/ghc/includes/HsFFI.h
  1.68      +38 -9     fptools/ghc/includes/PrimOps.h
  1.12      +1 -1      fptools/ghc/includes/SchedAPI.h
  1.34      +3 -1      fptools/ghc/includes/Stg.h
  1.37      +1 -1      fptools/ghc/includes/StgMacros.h
  1.23      +1 -1      fptools/ghc/includes/StgMiscClosures.h
  1.21      +1 -1      fptools/ghc/includes/Updates.h
  1.46      +2 -0      fptools/ghc/lib/std/PrelGHC.hi-boot
  1.4       +1 -1      fptools/ghc/rts/Exception.h
  1.18      +1 -1      fptools/ghc/rts/Exception.hc
  1.90      +14 -1     fptools/ghc/rts/GC.c
  1.3       +1 -1      fptools/ghc/rts/Hash.c
  1.4       +1 -1      fptools/ghc/rts/Hash.h
  1.19      +2 -41     fptools/ghc/rts/MBlock.c
  1.7       +40 -1     fptools/ghc/rts/MBlock.h
  1.60      +1 -1      fptools/ghc/rts/PrimOps.hc
  1.19      +1 -1      fptools/ghc/rts/ProfHeap.c
  1.23      +1 -1      fptools/ghc/rts/RtsAPI.c
  1.34      +1 -1      fptools/ghc/rts/RtsFlags.c
  1.29      +1 -1      fptools/ghc/rts/RtsFlags.h
  1.45      +1 -1      fptools/ghc/rts/RtsStartup.c
  1.23      +2 -2      fptools/ghc/rts/Sanity.c
  1.83      +1 -1      fptools/ghc/rts/Schedule.c
  1.21      +1 -1      fptools/ghc/rts/Schedule.h
  1.22      +9 -1      fptools/ghc/rts/Stats.c
  1.9       +3 -1      fptools/ghc/rts/Stats.h
  1.23      +6 -2      fptools/ghc/rts/StgCRun.c
  1.52      +26 -42    fptools/ghc/rts/StgMiscClosures.hc
  1.14      +1 -1      fptools/ghc/rts/StgStdThunks.hc
  1.29      +1 -1      fptools/ghc/rts/Storage.c
  1.18      +206 -5    fptools/ghc/rts/Storage.h
  1.13      +11 -1     fptools/ghc/rts/StoragePriv.h
  1.31      +1 -1      fptools/ghc/rts/Updates.hc
  1.17      +1 -1      fptools/ghc/rts/Weak.c
  1.2       +10 -5     fptools/hslibs/OpenGL/Makefile
  1.2       +24 -2     fptools/hslibs/OpenGL/GL/GL.hs
  1.2       +84 -4     fptools/hslibs/OpenGL/GL/GL_BasicTypes.hs
  1.2       +757 -2    fptools/hslibs/OpenGL/GL/GL_Constants.hs
  1.22      +1 -1      fptools/hslibs/lang/IOExts.lhs