summaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-04 22:29:02 +0000
committerebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-04 22:29:02 +0000
commit1c934c582841982ea80a5aa3cb7afc82b9ef5e3d (patch)
treed7460cd194cf18efe3df82e63a44cc5ea3f541f9 /libgcc
parent61b25b61d9812a3dd44c3560cdcdcf5da3e316fa (diff)
downloadgcc-1c934c582841982ea80a5aa3cb7afc82b9ef5e3d.tar.gz
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
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog6
-rw-r--r--libgcc/libgcc2.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 7c761b0351d..6011d2cccfb 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-04 Eric Botcazou <ebotcazou@adacore.com>
+
+ PR target/67172
+ * libgcc2.c (L__main): Undefine __LIBGCC_EH_FRAME_SECTION_NAME__ if
+ __MINGW32__ is defined.
+
2016-03-28 James Bowman <james.bowman@ftdichip.com>
* libgcc/config/ft32/lib1funcs.S (*divsi3, *modsi3): New.
diff --git a/libgcc/libgcc2.c b/libgcc/libgcc2.c
index 340d1f725fd..6bc9a2f6c40 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"