From 1c934c582841982ea80a5aa3cb7afc82b9ef5e3d Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Mon, 4 Apr 2016 22:29:02 +0000 Subject: [PATCH] PR target/67172 * libgcc2.c (L__main): Undefine __LIBGCC_EH_FRAME_SECTION_NAME__ if __MINGW32__ is defined. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@234727 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgcc/ChangeLog | 6 ++++++ libgcc/libgcc2.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 7c761b0351dc..6011d2cccfb1 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-28 James Bowman * libgcc/config/ft32/lib1funcs.S (*divsi3, *modsi3): New. diff --git a/libgcc/libgcc2.c b/libgcc/libgcc2.c index 340d1f725fd4..6bc9a2f6c40b 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" -- 2.47.3