From c8252d8fcf63dc3c5844bd52c8f61f2952dc4e38 Mon Sep 17 00:00:00 2001 From: ivmai Date: Thu, 22 Oct 2009 20:26:19 +0000 Subject: [PATCH] 2009-10-22 Ivan Maidanski * include/private/gcconfig.h: Move DebugBreak() workaround (for x86mingw32ce toolchain) to gc_priv.h (after windows.h inclusion). --- ChangeLog | 5 +++++ include/private/gc_priv.h | 7 +++++-- include/private/gcconfig.h | 5 ----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60a2b5f1..95909b52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-10-22 Ivan Maidanski + + * include/private/gcconfig.h: Move DebugBreak() workaround (for + x86mingw32ce toolchain) to gc_priv.h (after windows.h inclusion). + 2009-10-22 Ivan Maidanski * allchblk.c (GC_unmap_old, GC_merge_unmapped, GC_allochblk, diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h index c9a0e61d..d109fc79 100644 --- a/include/private/gc_priv.h +++ b/include/private/gc_priv.h @@ -388,10 +388,13 @@ typedef char * ptr_t; /* A generic pointer to which we can add */ # ifdef PCR # define ABORT(s) PCR_Base_Panic(s) # else -# if defined(MSWINCE) && !defined(UNDER_CE) && !defined(DebugBreak) +# if defined(MSWINCE) && !defined(DebugBreak) \ + && (!defined(UNDER_CE) || (defined(__MINGW32CE__) && !defined(ARM32))) /* This simplifies linking for WinCE (and, probably, doesn't */ /* hurt debugging much); use -DDebugBreak=DebugBreak to override */ - /* this behavior if really needed. */ + /* this behavior if really needed. This is also a workaround for */ + /* x86mingw32ce toolchain (if it is still declaring DebugBreak() */ + /* instead of defining it as a macro). */ # define DebugBreak() _exit(-1) /* there is no abort() in WinCE */ # endif # ifdef SMALL_CONFIG diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index ab2243bc..3d490237 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -393,11 +393,6 @@ # endif # if defined(x86) || defined(__i386__) # define I386 -# if defined(__MINGW32CE__) && !defined(DebugBreak) - /* A workaround for x86mingw32ce toolchain (if it is still */ - /* declaring DebugBreak() instead of defining it as a macro). */ -# define DebugBreak() _exit(-1) -# endif # endif # if defined(_M_ARM) || defined(ARM) || defined(_ARM_) # define ARM32 -- 2.40.0