From aa9e26b1be6d2f9d88b6b4cc534d3867dfdef9c0 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Mon, 4 Apr 2016 22:29:45 +0000 Subject: [PATCH] re PR target/67172 (i686-w64-mingw32 dwarf2 bootstrap fails with undefined reference to __EH_FRAME_BEGIN__) PR target/67172 * libgcc2.c (L__main): Undefine __LIBGCC_EH_FRAME_SECTION_NAME__ if __MINGW32__ is defined. From-SVN: r234728 --- libgcc/ChangeLog | 6 ++++++ libgcc/libgcc2.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 2648ed6b2723..3e73b7694d76 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,9 @@ +2016-04-04 Eric Botcazou + + PR target/67172 + * libgcc2.c (L__main): Undefine __LIBGCC_EH_FRAME_SECTION_NAME__ if + __MINGW32__ is defined. + 2016-03-21 Rainer Orth Backport from mainline diff --git a/libgcc/libgcc2.c b/libgcc/libgcc2.c index c7376206d64f..0ef8823428a6 100644 --- a/libgcc/libgcc2.c +++ b/libgcc/libgcc2.c @@ -2209,7 +2209,12 @@ TRANSFER_FROM_TRAMPOLINE #if !defined (HAS_INIT_SECTION) || !defined (OBJECT_FORMAT_ELF) /* Some ELF crosses use crtstuff.c to provide __CTOR_LIST__, but use this - code to run constructors. In that case, we need to handle EH here, too. */ + code to run constructors. In that case, we need to handle EH here, too. + But MINGW32 is special because it handles CRTSTUFF and EH on its own. */ + +#ifdef __MINGW32__ +#undef __LIBGCC_EH_FRAME_SECTION_NAME__ +#endif #ifdef __LIBGCC_EH_FRAME_SECTION_NAME__ #include "unwind-dw2-fde.h"