diff --git a/mingw-w64-gcc-git/0009-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch b/mingw-w64-gcc-git/0009-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch deleted file mode 100644 index a1f0e21bc4..0000000000 --- a/mingw-w64-gcc-git/0009-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a7e709b1999c3f6d57a236c4de9e75b214f06682 Mon Sep 17 00:00:00 2001 -From: Matt Breedlove -Date: Wed, 5 Aug 2015 23:36:22 +0100 -Subject: [PATCH 09/19] Work around {un-,too-late-}resolved __EH_FRAME_BEGIN__ - -Here's the dwarf2 patch I'm using. With the change to checking -__LIBGCC_EH_FRAME_SECTION_NAME__, an undefined reference to -__EH_FRAME_BEGIN__ gets emitted within __main.o. The actual symbol -for it is defined within cygming-crtbegin.c (crtbegin.o) which is -listed before __main.o when linking libgcc leaving the undefined -reference unresolved. This restores behavior to the 4.9 branch only -for this specific instance (confirmed by comparing pre-processed -output). Will update with bugtraq info. - -Relevant references: - -https://gcc.gnu.org/ml/gcc-patches/2014-09/msg00409.html -http://gcc.gcc.gnu.narkive.com/RMY4RcbE/asm-output-section-name-cleanup-patch-problem - -Posted to mingw-w64 ML: - -https://sourceforge.net/p/mingw-w64/mailman/message/34101954/ -https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01212.html ---- - libgcc/libgcc2.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libgcc/libgcc2.c b/libgcc/libgcc2.c -index 340d1f7..4512232 100644 ---- a/libgcc/libgcc2.c -+++ b/libgcc/libgcc2.c -@@ -2211,7 +2211,7 @@ TRANSFER_FROM_TRAMPOLINE - /* 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. */ - --#ifdef __LIBGCC_EH_FRAME_SECTION_NAME__ -+#ifdef EH_FRAME_SECTION_NAME - #include "unwind-dw2-fde.h" - extern unsigned char __EH_FRAME_BEGIN__[]; - #endif -@@ -2231,7 +2231,7 @@ __do_global_dtors (void) - (*(p-1)) (); - } - #endif --#if defined (__LIBGCC_EH_FRAME_SECTION_NAME__) && !defined (HAS_INIT_SECTION) -+#if defined (EH_FRAME_SECTION_NAME) && !defined (HAS_INIT_SECTION) - { - static int completed = 0; - if (! completed) -@@ -2250,7 +2250,7 @@ __do_global_dtors (void) - void - __do_global_ctors (void) - { --#ifdef __LIBGCC_EH_FRAME_SECTION_NAME__ -+#ifdef EH_FRAME_SECTION_NAME - { - static struct object object; - __register_frame_info (__EH_FRAME_BEGIN__, &object); --- -2.7.1 - diff --git a/mingw-w64-gcc-git/PKGBUILD b/mingw-w64-gcc-git/PKGBUILD index b37ac94473..92ee960b56 100644 --- a/mingw-w64-gcc-git/PKGBUILD +++ b/mingw-w64-gcc-git/PKGBUILD @@ -52,7 +52,6 @@ source=("git://gcc.gnu.org/git/gcc.git#branch=${_branch}" "0006-Build-EXTRA_GNATTOOLS-for-Ada.patch" "0007-Prettify-linking-no-undefined.patch" "0008-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch" - "0009-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch" "0010-Fix-using-large-PCH.patch" "0011-Enable-shared-gnat-implib.patch" "0012-MinGW-w64-Enable-libitm.patch" @@ -73,7 +72,6 @@ sha256sums=('SKIP' '2f1c9280a9a379c6a1b91b5b7d7f14db65490bd024b1db4e71834cea73582316' 'd08cfe014f879cd396eb8af29356d5bedf73495aafd5f0153ad7ddc0dda9059e' 'eecb90bf47894b886463dbd5e0634fc9003b32686f3a1f498b75b675c3f6c0fc' - '220e5ace3dd130196bf1c5ff8d56c507ae4ac5004d3848cae161296052043e5f' 'f9ef7a16105abca37dd6b8bbf5f2318d4f809bb5a8f83a2281c4fcdc2e0d28e4' '25fec6456b6e97833acd3bafc68013da2f673ced246f7d52fca38057d4a73961' '63061c3e1d68951659b427df2e1642d5da8ca1da028c793704e265f51042ce62' @@ -103,7 +101,6 @@ prepare() { git am "${srcdir}"/0006-Build-EXTRA_GNATTOOLS-for-Ada.patch git am "${srcdir}"/0007-Prettify-linking-no-undefined.patch git am "${srcdir}"/0008-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch - git am "${srcdir}"/0009-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch git am "${srcdir}"/0010-Fix-using-large-PCH.patch git am "${srcdir}"/0011-Enable-shared-gnat-implib.patch git am "${srcdir}"/0012-MinGW-w64-Enable-libitm.patch