diff --git a/mingw-w64-gcc/0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch b/mingw-w64-gcc/0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch deleted file mode 100644 index d0d5630959..0000000000 --- a/mingw-w64-gcc/0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch +++ /dev/null @@ -1,84 +0,0 @@ -From f1da5efbf1f96f3648d0e8a7daa79aecf9261e1b Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 5 Aug 2015 23:36:39 +0100 -Subject: [PATCH 15/15] Force linking to libgcc_s_dw2-1.dll [deprecated] - -.. by adding to specs: -*libgcc ---undefined=___deregister_frame_info ---undefined=___register_frame_info - -These flags get added twice to the ld command line -because of %G appearing twice in: -*link_gcc_c_sequence -%G %L %G -so this should be tidied up really. - -20150805 update: - -Looking at this again, it seems that the -SHARED_LIBGCC_UNDEFS_SPEC stuff added in commit 7d804f -does the same thing, so my hack may not be needed. It -would appear that for some time, DWARF2_UNWIND_INFO -was not defined, but it's OK now. Latest specs have: -*shared_libgcc_undefs: -%{shared-libgcc: -u ___register_frame_info -u ___deregister_frame_info} ---- - gcc/config/i386/cygwin.h | 6 +++++- - gcc/config/i386/mingw32.h | 8 ++++++-- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/i386/cygwin.h b/gcc/config/i386/cygwin.h -index 2186937..7f71ccc 100644 ---- a/gcc/config/i386/cygwin.h -+++ b/gcc/config/i386/cygwin.h -@@ -55,6 +55,10 @@ along with GCC; see the file COPYING3. If not see - fvtable-verify=std:vtv_end.o%s} \ - crtend.o%s" - -+/* There is a bug when building i686 dw-2 exceptions -+ where gcc_s gets stripped which this works around */ -+#define PREVENT_STRIP_REG_FRAME_INFO "--undefined=___deregister_frame_info --undefined=___register_frame_info" -+ - /* Normally, -lgcc is not needed since everything in it is in the DLL, but we - want to allow things to be added to it when installing new versions of - GCC without making a new CYGWIN.DLL, so we leave it. Profiling is handled -@@ -65,7 +69,7 @@ along with GCC; see the file COPYING3. If not see - %{static|static-libgcc:-lgcc -lgcc_eh} \ - %{!static: \ - %{!static-libgcc: \ -- -lgcc_s -lgcc \ -+ -lgcc_s " PREVENT_STRIP_REG_FRAME_INFO " -lgcc \ - } \ - } " - #else -diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h -index 0950304..ca73137 100644 ---- a/gcc/config/i386/mingw32.h -+++ b/gcc/config/i386/mingw32.h -@@ -120,6 +120,10 @@ along with GCC; see the file COPYING3. If not see - %{shared|mdll: " SUB_LINK_ENTRY " --enable-auto-image-base} \ - %(shared_libgcc_undefs)" - -+/* There is a bug when building i686 dw-2 exceptions -+ where gcc_s gets stripped which this works around */ -+#define PREVENT_STRIP_REG_FRAME_INFO "--undefined=___deregister_frame_info --undefined=___register_frame_info" -+ - /* Include in the mingw32 libraries with libgcc */ - #ifdef ENABLE_SHARED_LIBGCC - #define SHARED_LIBGCC_SPEC " \ -@@ -128,9 +132,9 @@ along with GCC; see the file COPYING3. If not see - %{!static-libgcc: \ - %{!shared: \ - %{!shared-libgcc:-lgcc -lgcc_eh} \ -- %{shared-libgcc:-lgcc_s -lgcc} \ -+ %{shared-libgcc:-lgcc_s " PREVENT_STRIP_REG_FRAME_INFO " -lgcc} \ - } \ -- %{shared:-lgcc_s -lgcc} \ -+ %{shared:-lgcc_s " PREVENT_STRIP_REG_FRAME_INFO " -lgcc} \ - } \ - } " - #else --- -2.8.1 - diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD index d9d23e5a88..ff461e03ca 100644 --- a/mingw-w64-gcc/PKGBUILD +++ b/mingw-w64-gcc/PKGBUILD @@ -51,7 +51,6 @@ source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver}/${_realname}-${pkgve "0012-MinGW-w64-Enable-libitm.patch" "0013-MinGW-w64-Enable-shared-gnat.patch" "0014-gcc-6-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch" - "0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch" "0016-disable-weak-refs-in-libstdc++.patch" "0017-diagnostic-color.patch" "0018-PR-77333-Set-clone-call-fntype-to-callee-type.patch" @@ -77,7 +76,6 @@ sha256sums=('8a8136c235f64c6fef69cac0d73a46a1a09bb250776a050aec8f9fc880bebc17' 'fc34b667c94df53c96a1f39c7e89a737c64e59df19169b02182dde84b6bec39e' 'bab73267116024d0b0d2a9dcb78a0ad839bb6a232f1ebbee7ed8fd54c8d71087' '60a58ed41389691a68ef4b7d47a0328df4d28d26e6c680a6b06b31191481ca65' - '262c6fb0f6c9951d69e4c2dcc27949aa8f2cca8e672faf66740a7dbba4a4cd2c' '09f27e0dae8d962f2a46a33a9891f2d14303629bb40f91ed8c5824c90da653a9' 'af291b64812ed6d1d1d357c9fb5fe5a520154aa072f342a72dc9a190732952e0' '62dccf1e2e85068ee1060af24162c760ca5d76b0d9690efa62fac9d959b6aac6' @@ -131,7 +129,6 @@ prepare() { apply_patch_with_msg 0013-MinGW-w64-Enable-shared-gnat.patch \ 0014-gcc-6-branch-clone_function_name_1-Retain-any-stdcall-suffix.patch \ - 0015-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch \ 0016-disable-weak-refs-in-libstdc++.patch \ 0017-diagnostic-color.patch \ 0018-PR-77333-Set-clone-call-fntype-to-callee-type.patch