ObjLink error

[Dimitrios Vytiniotis]

I get a strange error when building after a fetch and merge in my tree, in file: 

   compiler/ghci/ObjLink.lhs

The first one is that module GHC.Foreign is not recognized and suggestion 
is to use GHC.ForeignPtr. So I change this and 'make' again. Then the second 
one I get later on and is also on the same file: 

compiler\ghci\ObjLink.lhs:31:27:
    Module `GHC.IO.Encoding' does not export `fileSystemEncoding'
make[1]: *** [compiler/stage2/build/ObjLink.o] Error 1
make: *** [all] Error 2

Any help? (Maybe someone forgot to push a patch for ObjLink?) 

Thanks
d-