* config/i386/cygming.h (DWARF2_UNWIND_INFO): Error build when
TARGET_BI_ARCH is specified without enabling SJLJ.
* config/i386/mingw32.h (MD_UNWIND_SUPPORT): Define MD_UNWIND_SUPPORT,
if TARGET_64BIT and TARGET_BI_ARCH aren't defined.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150114
138bc75d-0d04-0410-961f-
82ee72b054a4
+2009-07-24 Kai Tietz <kai.tietz@onevision.com>
+
+ * config/i386/cygming.h (DWARF2_UNWIND_INFO): Error build when
+ TARGET_BI_ARCH is specified without enabling SJLJ.
+ * config/i386/mingw32.h (MD_UNWIND_SUPPORT): Define MD_UNWIND_SUPPORT,
+ if TARGET_64BIT and TARGET_BI_ARCH aren't defined.
+
2009-07-26 Mikael Pettersson <mikpe@it.uu.se>
* arm.md (negdi2): Use DImode if forcing a value into a register.
/* The logic of this #if must be kept synchronised with the logic
for selecting the tmake_eh_file fragment in config.gcc. */
#define DWARF2_UNWIND_INFO 1
+/* If multilib is selected break build as sjlj is required. */
+#if defined (TARGET_BI_ARCH)
+#error For 64-bit windows and 32-bit based multilib version of gcc just SJLJ exceptions are supported.
+#endif
#else
#define DWARF2_UNWIND_INFO 0
#endif
#include <windows.h>
#endif
-#if !TARGET_64BIT
+/* For 64-bit Windows we can't use DW2 unwind info. Also for multilib
+ builds we can't use it, too. */
+#if !TARGET_64BIT && !defined (TARGET_BI_ARCH)
#define MD_UNWIND_SUPPORT "config/i386/w32-unwind.h"
#endif