Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/d66b9cb07b0e03282c8010bcf76168e64cb4acde >--------------------------------------------------------------- commit d66b9cb07b0e03282c8010bcf76168e64cb4acde Author: Ian Lynagh <[email protected]> Date: Fri Mar 16 15:56:04 2012 +0000 For now, turn off the SEH code on Win64 >--------------------------------------------------------------- rts/RtsMain.c | 4 ++-- rts/win32/seh_excn.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rts/RtsMain.c b/rts/RtsMain.c index e89445d..435df42 100644 --- a/rts/RtsMain.c +++ b/rts/RtsMain.c @@ -108,11 +108,11 @@ int hs_main (int argc, char *argv[], // program args progmain_closure = main_closure; rtsconfig = rts_config; -#if defined(mingw32_HOST_OS) +#if defined(mingw32_HOST_OS) && defined(i386_HOST_ARCH) BEGIN_CATCH #endif real_main(); -#if defined(mingw32_HOST_OS) +#if defined(mingw32_HOST_OS) && defined(i386_HOST_ARCH) END_CATCH #endif } diff --git a/rts/win32/seh_excn.c b/rts/win32/seh_excn.c index 5da7579..da5f64d 100644 --- a/rts/win32/seh_excn.c +++ b/rts/win32/seh_excn.c @@ -1,9 +1,11 @@ +#include "ghcconfig.h" #include "seh_excn.h" /* * Exception / signal handlers. */ -#if defined(__MINGW32__) +#if defined(mingw32_HOST_OS) +#if defined(i386_HOST_ARCH) jmp_buf seh_unwind_to; unsigned long seh_excn_code; /* variable used to communicate what kind of exception we've caught;nice. */ @@ -39,4 +41,5 @@ catchDivZero(struct _EXCEPTION_RECORD* rec, return ExceptionContinueSearch; } #endif +#endif _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
