2009-10-22 Ivan Maidanski <ivmai@mail.ru>

	* include/private/gcconfig.h: Move DebugBreak() workaround (for
	x86mingw32ce toolchain) to gc_priv.h (after windows.h inclusion).

diff --git a/ChangeLog b/ChangeLog
index 60a2b5f1642b2b9b5f29c895a5af6c4ea3192980..95909b527ed5302b2dd0c67fbbb9722bab76de28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-22  Ivan Maidanski <ivmai@mail.ru>
+
+       * include/private/gcconfig.h: Move DebugBreak() workaround (for
+       x86mingw32ce toolchain) to gc_priv.h (after windows.h inclusion).
+
 2009-10-22  Ivan Maidanski <ivmai@mail.ru>
 
        * 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 c9a0e61dffbbc8bcd869b3e442211361a7333a0b..d109fc794e0d8df91610073a8415e5e3e9158c54 100644 (file)
--- 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 ab2243bc9506b171145cab8dfc4a66792b77eb2f..3d4902374a7d8fa240ce18a38da3dabb63a610f7 100644 (file)
--- 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