Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/02cf6d6f71b5772aa4ddf1b70c192a802886e2c2 >--------------------------------------------------------------- commit 02cf6d6f71b5772aa4ddf1b70c192a802886e2c2 Author: Manuel M T Chakravarty <[email protected]> Date: Tue May 1 17:47:49 2012 +1000 Revert "Fix build of rts/Linker.c on Win32" This reverts commit 0042c478f1169ddd9392fb39de7d0aed865a272e. >--------------------------------------------------------------- rts/Linker.c | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/rts/Linker.c b/rts/Linker.c index a2c54c5..879fe32 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -414,15 +414,9 @@ typedef struct _RtsSymbolVal { #endif #if defined(i386_HOST_ARCH) -#define RTS_WIN32_ONLY(X) X +#define RTS_MINGW32_ONLY(X) X #else -#define RTS_WIN32_ONLY(X) /**/ -#endif - -#if defined(x86_64_HOST_ARCH) -#define RTS_WIN64_ONLY(X) X -#else -#define RTS_WIN64_ONLY(X) /**/ +#define RTS_MINGW32_ONLY(X) /**/ #endif /* These are statically linked from the mingw libraries into the ghc @@ -454,7 +448,7 @@ typedef struct _RtsSymbolVal { SymI_HasProto(strcpy) \ SymI_HasProto(strncpy) \ SymI_HasProto(abort) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_alloca)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_alloca)) \ SymI_HasProto(isxdigit) \ SymI_HasProto(isupper) \ SymI_HasProto(ispunct) \ @@ -505,43 +499,43 @@ typedef struct _RtsSymbolVal { SymI_HasProto(rts_InstallConsoleEvent) \ SymI_HasProto(rts_ConsoleHandlerDone) \ SymI_NeedsProto(mktime) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_imp___timezone)) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_imp___tzname)) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_imp__tzname)) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_imp___iob)) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_imp___osver)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_imp___timezone)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_imp___tzname)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_imp__tzname)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_imp___iob)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_imp___osver)) \ SymI_NeedsProto(localtime) \ SymI_NeedsProto(gmtime) \ SymI_NeedsProto(opendir) \ SymI_NeedsProto(readdir) \ SymI_NeedsProto(rewinddir) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_imp____mb_cur_max)) \ - RTS_WIN32_ONLY(SymI_NeedsProto(_imp___pctype)) \ - RTS_WIN32_ONLY(SymI_NeedsProto(__chkstk)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_imp____mb_cur_max)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(_imp___pctype)) \ + RTS_MINGW32_ONLY(SymI_NeedsProto(__chkstk)) \ SymI_NeedsProto(__imp___iob_func) \ SymI_NeedsProto(___chkstk_ms) \ SymI_NeedsProto(__imp_localeconv) \ SymI_NeedsProto(__imp_islower) \ SymI_NeedsProto(__imp_isspace) \ SymI_NeedsProto(__imp_isxdigit) \ - RTS_WIN64_ONLY(SymI_HasProto(close)) \ - RTS_WIN64_ONLY(SymI_HasProto(read)) \ - RTS_WIN64_ONLY(SymI_HasProto(dup)) \ - RTS_WIN64_ONLY(SymI_HasProto(dup2)) \ - RTS_WIN64_ONLY(SymI_HasProto(write)) \ + SymI_HasProto(close) \ + SymI_HasProto(read) \ + SymI_HasProto(dup) \ + SymI_HasProto(dup2) \ + SymI_HasProto(write) \ SymI_NeedsProto(getpid) \ - RTS_WIN64_ONLY(SymI_HasProto(access)) \ + SymI_HasProto(access) \ SymI_HasProto(chmod) \ - RTS_WIN64_ONLY(SymI_HasProto(creat)) \ - RTS_WIN64_ONLY(SymI_HasProto(umask)) \ + SymI_HasProto(creat) \ + SymI_HasProto(umask) \ SymI_HasProto(unlink) \ SymI_NeedsProto(__imp__errno) \ SymI_NeedsProto(ftruncate64) \ - RTS_WIN64_ONLY(SymI_HasProto(setmode)) \ + SymI_HasProto(setmode) \ SymI_NeedsProto(__imp__wstat64) \ SymI_NeedsProto(__imp__fstat64) \ SymI_NeedsProto(__imp__wsopen) \ - RTS_WIN64_ONLY(SymI_HasProto(__imp__environ)) \ + SymI_HasProto(__imp__environ) \ SymI_NeedsProto(__imp_GetFileType) \ SymI_NeedsProto(__imp_GetLastError) \ SymI_NeedsProto(__imp_QueryPerformanceFrequency) \ @@ -553,7 +547,7 @@ typedef struct _RtsSymbolVal { SymI_NeedsProto(__imp_PeekNamedPipe) \ SymI_NeedsProto(__imp__isatty) \ SymI_NeedsProto(__imp_select) \ - RTS_WIN64_ONLY(SymI_HasProto(isatty)) \ + SymI_HasProto(isatty) \ SymI_NeedsProto(__imp__get_osfhandle) \ SymI_NeedsProto(__imp_GetConsoleMode) \ SymI_NeedsProto(__imp_SetConsoleMode) \ _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
