From 9d26399311018b98c3e4e2ffd9726f207d80f23c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 8 Aug 2015 15:50:19 +0100 Subject: [PATCH] gcc-git: Refresh patches, do the seds that are still needed --- mingw-w64-gcc-git/0001-Relocate-libintl.patch | 2 +- ...e-_ZTC-in-libstdc-exports-deprecated.patch | 6 +-- ..._weakref__-on-__MINGW32__-deprecated.patch | 2 +- ...osix-dir-exists-semantics-more-close.patch | 4 +- ...not-in-progpath-and-leave-case-as-is.patch | 2 +- ...on-t-ignore-native-system-header-dir.patch | 6 +-- ...-feature-to-allow-overriding-lmsvcrt.patch | 4 +- ..._malloc_cleared-instead-of-gomp_mall.patch | 8 +-- .../0009-Build-EXTRA_GNATTOOLS-for-Ada.patch | 2 +- .../0010-Prettify-linking-no-undefined.patch | 10 ++-- ...in-header-cplusplus-compatible-depre.patch | 2 +- ...too-late-resolved-__EH_FRAME_BEGIN__.patch | 2 +- .../0013-Fix-using-large-PCH.patch | 10 ++-- .../0014-Enable-shared-gnat-implib.patch | 6 +-- .../0015-MinGW-w64-Enable-libitm.patch | 12 ++--- .../0016-MinGW-w64-Enable-libsanitizer.patch | 2 +- .../0017-MinGW-w64-Enable-shared-gnat.patch | 2 +- .../0018-MinGW-w64-No-fpic-in-sanitizer.patch | 26 +++++----- .../0019-MinGW-w64-Port-sanitizer.patch | 8 +-- ...ing-to-libgcc_s_dw2-1.dll-deprecated.patch | 4 +- mingw-w64-gcc-git/PKGBUILD | 50 +++++++++++-------- 21 files changed, 89 insertions(+), 81 deletions(-) diff --git a/mingw-w64-gcc-git/0001-Relocate-libintl.patch b/mingw-w64-gcc-git/0001-Relocate-libintl.patch index 259fa7824a..0d7d005406 100644 --- a/mingw-w64-gcc-git/0001-Relocate-libintl.patch +++ b/mingw-w64-gcc-git/0001-Relocate-libintl.patch @@ -1,4 +1,4 @@ -From b6b426d1dff238d33d20d154dadd86cd132d80b6 Mon Sep 17 00:00:00 2001 +From 555202a31b9136ae0db5eebf79430aaf2a885d45 Mon Sep 17 00:00:00 2001 From: Erwin Waterlander Date: Wed, 5 Aug 2015 23:36:03 +0100 Subject: [PATCH 01/20] Relocate libintl diff --git a/mingw-w64-gcc-git/0002-PR54314-Include-_ZTC-in-libstdc-exports-deprecated.patch b/mingw-w64-gcc-git/0002-PR54314-Include-_ZTC-in-libstdc-exports-deprecated.patch index 991365ba0c..383a587276 100644 --- a/mingw-w64-gcc-git/0002-PR54314-Include-_ZTC-in-libstdc-exports-deprecated.patch +++ b/mingw-w64-gcc-git/0002-PR54314-Include-_ZTC-in-libstdc-exports-deprecated.patch @@ -1,4 +1,4 @@ -From 2b44424aaa56ecd90639f251f687dce613908066 Mon Sep 17 00:00:00 2001 +From 7cbef7a503bc1b5c6c0bf7302c854272110d1ce8 Mon Sep 17 00:00:00 2001 From: gee Date: Wed, 5 Aug 2015 23:36:04 +0100 Subject: [PATCH 02/20] PR54314: Include _ZTC* in libstdc++ exports @@ -37,10 +37,10 @@ Add thunk _ZTv0_n12_NS* like in gnu.ver 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver -index d42cd37..7502fee 100644 +index 120b133..f029a05 100644 --- a/libstdc++-v3/config/abi/pre/gnu.ver +++ b/libstdc++-v3/config/abi/pre/gnu.ver -@@ -2064,7 +2064,7 @@ CXXABI_1.3.6 { +@@ -2056,7 +2056,7 @@ CXXABI_1.3.6 { __cxa_allocate_dependent_exception; __cxa_free_dependent_exception; __cxa_deleted_virtual; diff --git a/mingw-w64-gcc-git/0003-PR52300-Avoid-__weakref__-on-__MINGW32__-deprecated.patch b/mingw-w64-gcc-git/0003-PR52300-Avoid-__weakref__-on-__MINGW32__-deprecated.patch index dfe16360bb..652a6eda15 100644 --- a/mingw-w64-gcc-git/0003-PR52300-Avoid-__weakref__-on-__MINGW32__-deprecated.patch +++ b/mingw-w64-gcc-git/0003-PR52300-Avoid-__weakref__-on-__MINGW32__-deprecated.patch @@ -1,4 +1,4 @@ -From 260b7904701b0aa02c4e1ab43c2542e5606a0e79 Mon Sep 17 00:00:00 2001 +From fb18215bf3a49d395e51a91bb264f0de9bd43489 Mon Sep 17 00:00:00 2001 From: niXman Date: Wed, 5 Aug 2015 23:36:06 +0100 Subject: [PATCH 03/20] PR52300: Avoid __weakref__ on __MINGW32__ [deprecated] diff --git a/mingw-w64-gcc-git/0004-Windows-Follow-Posix-dir-exists-semantics-more-close.patch b/mingw-w64-gcc-git/0004-Windows-Follow-Posix-dir-exists-semantics-more-close.patch index 5408f3c838..8a7cfc1a6b 100644 --- a/mingw-w64-gcc-git/0004-Windows-Follow-Posix-dir-exists-semantics-more-close.patch +++ b/mingw-w64-gcc-git/0004-Windows-Follow-Posix-dir-exists-semantics-more-close.patch @@ -1,4 +1,4 @@ -From bd65a78dd2f1292a8b955beb1211d6a7a1fb80c9 Mon Sep 17 00:00:00 2001 +From aa08dd84fd1eb14d401e6367423bd617aa56aa72 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 5 Aug 2015 23:36:07 +0100 Subject: [PATCH 04/20] Windows: Follow Posix dir-exists semantics more closely @@ -14,7 +14,7 @@ compiling GNU/Linux glibc on Windows. 1 file changed, 87 insertions(+) diff --git a/libcpp/files.c b/libcpp/files.c -index 8c388d8..e45665c 100644 +index 2f49122..644701d 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -30,6 +30,13 @@ along with this program; see the file COPYING3. If not see diff --git a/mingw-w64-gcc-git/0005-Windows-Use-not-in-progpath-and-leave-case-as-is.patch b/mingw-w64-gcc-git/0005-Windows-Use-not-in-progpath-and-leave-case-as-is.patch index 769f5c133d..ad70a59b1d 100644 --- a/mingw-w64-gcc-git/0005-Windows-Use-not-in-progpath-and-leave-case-as-is.patch +++ b/mingw-w64-gcc-git/0005-Windows-Use-not-in-progpath-and-leave-case-as-is.patch @@ -1,4 +1,4 @@ -From ea5fee260bab088a1592850841ffacf31a4d372c Mon Sep 17 00:00:00 2001 +From f15e87721b070ec4ccf59195504a59da5c92ce8c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 5 Aug 2015 23:36:09 +0100 Subject: [PATCH 05/20] Windows: Use '/' not '\' in progpath and leave case diff --git a/mingw-w64-gcc-git/0006-Windows-Don-t-ignore-native-system-header-dir.patch b/mingw-w64-gcc-git/0006-Windows-Don-t-ignore-native-system-header-dir.patch index 2414e05e44..1219e58abf 100644 --- a/mingw-w64-gcc-git/0006-Windows-Don-t-ignore-native-system-header-dir.patch +++ b/mingw-w64-gcc-git/0006-Windows-Don-t-ignore-native-system-header-dir.patch @@ -1,4 +1,4 @@ -From 24d814492323f52213bfcc11faddd7595438feb7 Mon Sep 17 00:00:00 2001 +From 9aaca7dac257a7ddf7406e9bae515dd27eee996d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 5 Aug 2015 23:36:11 +0100 Subject: [PATCH 06/20] Windows: Don't ignore native system header dir @@ -8,10 +8,10 @@ Subject: [PATCH 06/20] Windows: Don't ignore native system header dir 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/config.gcc b/gcc/config.gcc -index 24f6d35..8c79739 100644 +index 3ede69b..f25325f 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc -@@ -1722,7 +1722,10 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) +@@ -1693,7 +1693,10 @@ i[34567]86-*-mingw* | x86_64-*-mingw*) tmake_file="${tmake_file} i386/t-mingw-w32" ;; esac diff --git a/mingw-w64-gcc-git/0007-Windows-New-feature-to-allow-overriding-lmsvcrt.patch b/mingw-w64-gcc-git/0007-Windows-New-feature-to-allow-overriding-lmsvcrt.patch index 0e7a9ff419..e8741e328d 100644 --- a/mingw-w64-gcc-git/0007-Windows-New-feature-to-allow-overriding-lmsvcrt.patch +++ b/mingw-w64-gcc-git/0007-Windows-New-feature-to-allow-overriding-lmsvcrt.patch @@ -1,4 +1,4 @@ -From f8ac675147aad6e4e9b0f8191850219275f5e84b Mon Sep 17 00:00:00 2001 +From 57391e17c94357f69c683db2c77cc42d7a8f0258 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 5 Aug 2015 23:36:13 +0100 Subject: [PATCH 07/20] Windows: New feature to allow overriding -lmsvcrt @@ -26,7 +26,7 @@ index c7e398f..dfddaf8 100644 Target RejectNegative Generate code for a DLL diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h -index eef90fb..47e12e7 100644 +index f139761..0950304 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -140,7 +140,7 @@ along with GCC; see the file COPYING3. If not see diff --git a/mingw-w64-gcc-git/0008-libgomp-Use-gomp_malloc_cleared-instead-of-gomp_mall.patch b/mingw-w64-gcc-git/0008-libgomp-Use-gomp_malloc_cleared-instead-of-gomp_mall.patch index c1d7bdfe64..052a5d3dd4 100644 --- a/mingw-w64-gcc-git/0008-libgomp-Use-gomp_malloc_cleared-instead-of-gomp_mall.patch +++ b/mingw-w64-gcc-git/0008-libgomp-Use-gomp_malloc_cleared-instead-of-gomp_mall.patch @@ -1,4 +1,4 @@ -From fd726b253eacd3eff277ba657356a05118ad6293 Mon Sep 17 00:00:00 2001 +From 2d03a8b28a5be995fd2af3f750cd6a21048da1d8 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 5 Aug 2015 23:36:16 +0100 Subject: [PATCH 08/20] libgomp: Use gomp_malloc_cleared instead of gomp_malloc @@ -14,10 +14,10 @@ is probably not needed. 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libgomp/team.c b/libgomp/team.c -index 7671b05..f9024c0 100644 +index b98b233..c1f6deb 100644 --- a/libgomp/team.c +++ b/libgomp/team.c -@@ -224,7 +224,7 @@ free_team (struct gomp_team *team) +@@ -197,7 +197,7 @@ free_team (struct gomp_team *team) static struct gomp_thread_pool *gomp_new_thread_pool (void) { struct gomp_thread_pool *pool @@ -26,7 +26,7 @@ index 7671b05..f9024c0 100644 pool->threads = NULL; pool->threads_size = 0; pool->threads_used = 0; -@@ -964,7 +964,7 @@ struct gomp_task_icv * +@@ -940,7 +940,7 @@ struct gomp_task_icv * gomp_new_icv (void) { struct gomp_thread *thr = gomp_thread (); diff --git a/mingw-w64-gcc-git/0009-Build-EXTRA_GNATTOOLS-for-Ada.patch b/mingw-w64-gcc-git/0009-Build-EXTRA_GNATTOOLS-for-Ada.patch index aaa6bffe54..d9373e7c97 100644 --- a/mingw-w64-gcc-git/0009-Build-EXTRA_GNATTOOLS-for-Ada.patch +++ b/mingw-w64-gcc-git/0009-Build-EXTRA_GNATTOOLS-for-Ada.patch @@ -1,4 +1,4 @@ -From 9c42e39d4a2bc38c6075d365b1002c2adb61fc59 Mon Sep 17 00:00:00 2001 +From 2840cdcc4a2c68a6cbe4b72515cf6d2143bf1ff3 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 5 Aug 2015 23:36:17 +0100 Subject: [PATCH 09/20] Build EXTRA_GNATTOOLS for Ada diff --git a/mingw-w64-gcc-git/0010-Prettify-linking-no-undefined.patch b/mingw-w64-gcc-git/0010-Prettify-linking-no-undefined.patch index dfcdfa2f79..50529bba5f 100644 --- a/mingw-w64-gcc-git/0010-Prettify-linking-no-undefined.patch +++ b/mingw-w64-gcc-git/0010-Prettify-linking-no-undefined.patch @@ -1,4 +1,4 @@ -From 2fa200353a8b283c4a40e34f5d54ff423c55d55a Mon Sep 17 00:00:00 2001 +From 3e6638629ae7b84ff78a79f3716ae5bc93825ad6 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 5 Aug 2015 23:36:19 +0100 Subject: [PATCH 10/20] Prettify linking -no-undefined @@ -11,10 +11,10 @@ conditional block for Windows only? 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am -index 0e816ac..0477605 100644 +index 31eb986..f8ef020 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am -@@ -44,7 +44,7 @@ libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) +@@ -50,7 +50,7 @@ libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) cafexeclib_LTLIBRARIES = libcaf_single.la cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libcaf_single_la_SOURCES = caf/single.c @@ -24,10 +24,10 @@ index 0e816ac..0477605 100644 libcaf_single_la_LINK = $(LINK) $(libcaf_single_la_LDFLAGS) diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in -index ab71b38..77374d4 100644 +index 0f60e6e..8473026 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in -@@ -605,7 +605,7 @@ libgfortran_la_DEPENDENCIES = $(version_dep) libgfortran.spec $(LIBQUADLIB_DEP) +@@ -615,7 +615,7 @@ libgfortranbegin_la_LINK = $(LINK) $(libgfortranbegin_la_LDFLAGS) cafexeclib_LTLIBRARIES = libcaf_single.la cafexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libcaf_single_la_SOURCES = caf/single.c diff --git a/mingw-w64-gcc-git/0011-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch b/mingw-w64-gcc-git/0011-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch index 004a9633e8..d31f30bf8f 100644 --- a/mingw-w64-gcc-git/0011-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch +++ b/mingw-w64-gcc-git/0011-gcc-make-xmmintrin-header-cplusplus-compatible-depre.patch @@ -1,4 +1,4 @@ -From dd682ffedda9ea45d2008cc5d3e5d9df84112094 Mon Sep 17 00:00:00 2001 +From 0605cd773a8ebac39b3e91eee0dc1633d8c76165 Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Wed, 5 Aug 2015 23:36:21 +0100 Subject: [PATCH 11/20] gcc: make xmmintrin header cplusplus compatible diff --git a/mingw-w64-gcc-git/0012-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch b/mingw-w64-gcc-git/0012-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch index f78db3f263..9a50cd9cb4 100644 --- a/mingw-w64-gcc-git/0012-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch +++ b/mingw-w64-gcc-git/0012-Work-around-un-too-late-resolved-__EH_FRAME_BEGIN__.patch @@ -1,4 +1,4 @@ -From 859f1a908eda9dd3d2ebb7c3230f0ff154fd8eb8 Mon Sep 17 00:00:00 2001 +From 71bfd7c63c1c431138efa1951ce1cecf7222fdff Mon Sep 17 00:00:00 2001 From: Matt Breedlove Date: Wed, 5 Aug 2015 23:36:22 +0100 Subject: [PATCH 12/20] Work around {un-,too-late-}resolved __EH_FRAME_BEGIN__ diff --git a/mingw-w64-gcc-git/0013-Fix-using-large-PCH.patch b/mingw-w64-gcc-git/0013-Fix-using-large-PCH.patch index 27d0bff5ac..b6516f01b3 100644 --- a/mingw-w64-gcc-git/0013-Fix-using-large-PCH.patch +++ b/mingw-w64-gcc-git/0013-Fix-using-large-PCH.patch @@ -1,4 +1,4 @@ -From 6f20aa489fc64a1087e73c948c0f607260a95d84 Mon Sep 17 00:00:00 2001 +From 9e87ad0651d41d9259c1bead74fc0efe54583e29 Mon Sep 17 00:00:00 2001 From: Martin Richter Date: Wed, 5 Aug 2015 23:36:25 +0100 Subject: [PATCH 13/20] Fix using large PCH @@ -64,10 +64,10 @@ index aa17378..631d9c4 100644 diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c -index 5096837..f741f2c 100644 +index 03fbe7d..3a5df8a 100644 --- a/gcc/ggc-common.c +++ b/gcc/ggc-common.c -@@ -599,7 +599,9 @@ gt_pch_restore (FILE *f) +@@ -603,7 +603,9 @@ gt_pch_restore (FILE *f) size_t i; struct mmap_info mmi; int result; @@ -78,7 +78,7 @@ index 5096837..f741f2c 100644 /* Delete any deletable objects. This makes ggc_pch_read much faster, as it can be sure that no GCable objects remain other than the ones just read in. */ -@@ -607,20 +609,24 @@ gt_pch_restore (FILE *f) +@@ -611,20 +613,24 @@ gt_pch_restore (FILE *f) for (rti = *rt; rti->base != NULL; rti++) memset (rti->base, 0, rti->stride); @@ -111,7 +111,7 @@ index 5096837..f741f2c 100644 if (fread (&mmi, sizeof (mmi), 1, f) != 1) fatal_error (input_location, "can%'t read PCH file: %m"); -@@ -631,12 +637,35 @@ gt_pch_restore (FILE *f) +@@ -635,12 +641,35 @@ gt_pch_restore (FILE *f) if (result == 0) { if (fseek (f, mmi.offset, SEEK_SET) != 0 diff --git a/mingw-w64-gcc-git/0014-Enable-shared-gnat-implib.patch b/mingw-w64-gcc-git/0014-Enable-shared-gnat-implib.patch index 504c0310a4..b88cfaac3c 100644 --- a/mingw-w64-gcc-git/0014-Enable-shared-gnat-implib.patch +++ b/mingw-w64-gcc-git/0014-Enable-shared-gnat-implib.patch @@ -1,4 +1,4 @@ -From fe617455ae9c85165aad65094e351ec9d5fdeb39 Mon Sep 17 00:00:00 2001 +From a7daaf8cf35bdb88e867a79bd917e4698acc6281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Pfeifer?= Date: Wed, 5 Aug 2015 23:36:27 +0100 Subject: [PATCH 14/20] Enable shared gnat implib @@ -13,10 +13,10 @@ https://github.com/Alexpux/MINGW-packages/commit/51b4eb3b702fdb38df0460180c2f820 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in -index 1d03f86..dd4453c 100644 +index 5559269..c0a1d1c 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in -@@ -2886,13 +2886,16 @@ gnatlib-shared-win32: +@@ -2851,13 +2851,16 @@ gnatlib-shared-win32: $(PICFLAG_FOR_TARGET) \ -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ diff --git a/mingw-w64-gcc-git/0015-MinGW-w64-Enable-libitm.patch b/mingw-w64-gcc-git/0015-MinGW-w64-Enable-libitm.patch index cf27f7df7f..3a2903799c 100644 --- a/mingw-w64-gcc-git/0015-MinGW-w64-Enable-libitm.patch +++ b/mingw-w64-gcc-git/0015-MinGW-w64-Enable-libitm.patch @@ -1,4 +1,4 @@ -From 3dc72ea0a2664ea703fe42bd63be5caa4849589d Mon Sep 17 00:00:00 2001 +From 18ef2a6e58914ffcfdfdd9e7c393679c4ac23be3 Mon Sep 17 00:00:00 2001 From: LRN Date: Wed, 5 Aug 2015 23:36:29 +0100 Subject: [PATCH 15/20] MinGW-w64: Enable libitm @@ -25,10 +25,10 @@ index 1dce82d..0ea39f2 100644 libitm_la_SOURCES = \ aatree.cc alloc.cc alloc_c.cc alloc_cpp.cc barrier.cc beginend.cc \ diff --git a/libitm/Makefile.in b/libitm/Makefile.in -index 138eeb1..a25c6d2 100644 +index 6c4d253..5898bd8 100644 --- a/libitm/Makefile.in +++ b/libitm/Makefile.in -@@ -307,6 +307,7 @@ libtool_VERSION = @libtool_VERSION@ +@@ -279,6 +279,7 @@ libtool_VERSION = @libtool_VERSION@ link_itm = @link_itm@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -36,7 +36,7 @@ index 138eeb1..a25c6d2 100644 mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ -@@ -357,7 +358,7 @@ libitm_version_info = -version-info $(libtool_VERSION) +@@ -329,7 +330,7 @@ libitm_version_info = -version-info $(libtool_VERSION) # want or need libstdc++. libitm_la_DEPENDENCIES = $(libitm_version_dep) libitm_la_LINK = $(LINK) $(libitm_la_LDFLAGS) @@ -46,7 +46,7 @@ index 138eeb1..a25c6d2 100644 barrier.cc beginend.cc clone.cc eh_cpp.cc local.cc query.cc \ retry.cc rwlock.cc useraction.cc util.cc sjlj.S tls.cc \ diff --git a/libitm/configure b/libitm/configure -index 55332bb..8f19e0a 100644 +index e924228..a23c011 100644 --- a/libitm/configure +++ b/libitm/configure @@ -630,6 +630,7 @@ MAINTAINER_MODE_FALSE @@ -57,7 +57,7 @@ index 55332bb..8f19e0a 100644 CXXCPP CPP OTOOL64 -@@ -15149,6 +15150,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -15144,6 +15145,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Only expand once: diff --git a/mingw-w64-gcc-git/0016-MinGW-w64-Enable-libsanitizer.patch b/mingw-w64-gcc-git/0016-MinGW-w64-Enable-libsanitizer.patch index 7bd54b7854..42101a88c6 100644 --- a/mingw-w64-gcc-git/0016-MinGW-w64-Enable-libsanitizer.patch +++ b/mingw-w64-gcc-git/0016-MinGW-w64-Enable-libsanitizer.patch @@ -1,4 +1,4 @@ -From b829a3d7b647c59b8bb86a599d125e6c049342f6 Mon Sep 17 00:00:00 2001 +From 86dd58be9ae146f818bef7dca26ac3edd91f38cc Mon Sep 17 00:00:00 2001 From: LRN Date: Wed, 5 Aug 2015 23:36:31 +0100 Subject: [PATCH 16/20] MinGW-w64: Enable libsanitizer diff --git a/mingw-w64-gcc-git/0017-MinGW-w64-Enable-shared-gnat.patch b/mingw-w64-gcc-git/0017-MinGW-w64-Enable-shared-gnat.patch index fc519d2a70..68147e0290 100644 --- a/mingw-w64-gcc-git/0017-MinGW-w64-Enable-shared-gnat.patch +++ b/mingw-w64-gcc-git/0017-MinGW-w64-Enable-shared-gnat.patch @@ -1,4 +1,4 @@ -From 7a5f7b5a63c67cbe9ed3f58f6f917fffab396eab Mon Sep 17 00:00:00 2001 +From 5da31325c6650fa1ee4a7cf4171cf53abb1259e9 Mon Sep 17 00:00:00 2001 From: LRN Date: Wed, 5 Aug 2015 23:36:33 +0100 Subject: [PATCH 17/20] MinGW-w64: Enable shared gnat diff --git a/mingw-w64-gcc-git/0018-MinGW-w64-No-fpic-in-sanitizer.patch b/mingw-w64-gcc-git/0018-MinGW-w64-No-fpic-in-sanitizer.patch index 5103bc9895..0341c6581d 100644 --- a/mingw-w64-gcc-git/0018-MinGW-w64-No-fpic-in-sanitizer.patch +++ b/mingw-w64-gcc-git/0018-MinGW-w64-No-fpic-in-sanitizer.patch @@ -1,4 +1,4 @@ -From 7658d287f15ccc9c1c38e5d7a70cd14f7eafca2f Mon Sep 17 00:00:00 2001 +From 554461ed4b65bca3bff9484cd273302d7e878a4a Mon Sep 17 00:00:00 2001 From: LRN Date: Wed, 5 Aug 2015 23:36:35 +0100 Subject: [PATCH 18/20] MinGW-w64: No -fpic in sanitizer @@ -32,10 +32,10 @@ index 54c74ce..1dc515e 100644 AM_CXXFLAGS += -std=gnu++11 ACLOCAL_AMFLAGS = -I $(top_srcdir) -I $(top_srcdir)/config diff --git a/libsanitizer/asan/Makefile.in b/libsanitizer/asan/Makefile.in -index edbed4d..690d41a 100644 +index a56c6b1..2ed29ec 100644 --- a/libsanitizer/asan/Makefile.in +++ b/libsanitizer/asan/Makefile.in -@@ -297,7 +297,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) +@@ -269,7 +269,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ @@ -58,10 +58,10 @@ index 4fb69a9..6df9645 100644 AM_CXXFLAGS += -std=gnu++11 ACLOCAL_AMFLAGS = -I m4 diff --git a/libsanitizer/interception/Makefile.in b/libsanitizer/interception/Makefile.in -index 3dfa774..422593f 100644 +index 5a49650..8ff18f4 100644 --- a/libsanitizer/interception/Makefile.in +++ b/libsanitizer/interception/Makefile.in -@@ -247,7 +247,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) +@@ -225,7 +225,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ @@ -84,10 +84,10 @@ index 03ec4fe..55a1d33 100644 AM_CXXFLAGS += -std=gnu++11 ACLOCAL_AMFLAGS = -I m4 diff --git a/libsanitizer/lsan/Makefile.in b/libsanitizer/lsan/Makefile.in -index b02c373..bb0475f 100644 +index 49fa874..360787b 100644 --- a/libsanitizer/lsan/Makefile.in +++ b/libsanitizer/lsan/Makefile.in -@@ -288,7 +288,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) +@@ -260,7 +260,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -I $(top_srcdir) # May be used by toolexeclibdir. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ @@ -110,10 +110,10 @@ index d541717..7b302b3 100644 AM_CXXFLAGS += -std=gnu++11 if LIBBACKTRACE_SUPPORTED diff --git a/libsanitizer/sanitizer_common/Makefile.in b/libsanitizer/sanitizer_common/Makefile.in -index 6614524..d2fd290 100644 +index 77ad416..fe46773 100644 --- a/libsanitizer/sanitizer_common/Makefile.in +++ b/libsanitizer/sanitizer_common/Makefile.in -@@ -275,7 +275,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system +@@ -253,7 +253,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/include -isystem $(top_srcdir)/include/system # May be used by toolexeclibdir. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ @@ -136,10 +136,10 @@ index abfafb7..5e8a6ba 100644 AM_CXXFLAGS += -std=gnu++11 ACLOCAL_AMFLAGS = -I m4 diff --git a/libsanitizer/tsan/Makefile.in b/libsanitizer/tsan/Makefile.in -index 8b20d28..ec5243d 100644 +index ed594a6..8365961 100644 --- a/libsanitizer/tsan/Makefile.in +++ b/libsanitizer/tsan/Makefile.in -@@ -301,7 +301,7 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include +@@ -273,7 +273,7 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include # May be used by toolexeclibdir. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ @@ -162,10 +162,10 @@ index 12d1ffa..83b6b5c 100644 AM_CXXFLAGS += -std=gnu++11 ACLOCAL_AMFLAGS = -I m4 diff --git a/libsanitizer/ubsan/Makefile.in b/libsanitizer/ubsan/Makefile.in -index 64aad19..f5748b9 100644 +index 0973a7a..8f30452 100644 --- a/libsanitizer/ubsan/Makefile.in +++ b/libsanitizer/ubsan/Makefile.in -@@ -284,7 +284,7 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include +@@ -256,7 +256,7 @@ AM_CPPFLAGS = -I $(top_srcdir) -I $(top_srcdir)/include # May be used by toolexeclibdir. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) AM_CXXFLAGS = -Wall -W -Wno-unused-parameter -Wwrite-strings -pedantic \ diff --git a/mingw-w64-gcc-git/0019-MinGW-w64-Port-sanitizer.patch b/mingw-w64-gcc-git/0019-MinGW-w64-Port-sanitizer.patch index b1b8843bee..47314225ed 100644 --- a/mingw-w64-gcc-git/0019-MinGW-w64-Port-sanitizer.patch +++ b/mingw-w64-gcc-git/0019-MinGW-w64-Port-sanitizer.patch @@ -1,4 +1,4 @@ -From 5a233414dafa9df519ed3482d9d3bea9cee57d0c Mon Sep 17 00:00:00 2001 +From a2efd837133281c5c07038720a748a613abe4c9e Mon Sep 17 00:00:00 2001 From: LRN Date: Wed, 5 Aug 2015 23:36:37 +0100 Subject: [PATCH 19/20] MinGW-w64: Port sanitizer @@ -26,7 +26,7 @@ index b002876..7b93331 100644 } diff --git a/libsanitizer/configure b/libsanitizer/configure -index 809f0d7..75fbc0e 100755 +index 1efbd53..2c58716 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -628,6 +628,7 @@ TSAN_SUPPORTED_FALSE @@ -37,7 +37,7 @@ index 809f0d7..75fbc0e 100755 CXXCPP OTOOL64 OTOOL -@@ -15387,6 +15388,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -15382,6 +15383,31 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu @@ -69,7 +69,7 @@ index 809f0d7..75fbc0e 100755 for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -15514,10 +15540,10 @@ done +@@ -15509,10 +15535,10 @@ done # Common libraries that we need to link against for all sanitizer libs. diff --git a/mingw-w64-gcc-git/0020-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch b/mingw-w64-gcc-git/0020-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch index 66b01ed3fe..833e4fbcf5 100644 --- a/mingw-w64-gcc-git/0020-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch +++ b/mingw-w64-gcc-git/0020-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch @@ -1,4 +1,4 @@ -From cfaf509bf9361774b06207d35d996cec42ff52da Mon Sep 17 00:00:00 2001 +From 8b3a397c31331655a3d0c45531cf6d03bf60a855 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 5 Aug 2015 23:36:39 +0100 Subject: [PATCH 20/20] Force linking to libgcc_s_dw2-1.dll [deprecated] @@ -53,7 +53,7 @@ index 2186937..7f71ccc 100644 } " #else diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h -index 47e12e7..9afe794 100644 +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 diff --git a/mingw-w64-gcc-git/PKGBUILD b/mingw-w64-gcc-git/PKGBUILD index 53bd39007f..e1243981ef 100644 --- a/mingw-w64-gcc-git/PKGBUILD +++ b/mingw-w64-gcc-git/PKGBUILD @@ -10,7 +10,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-${_realname}-fortran-git" "${MINGW_PACKAGE_PREFIX}-${_realname}-ada-git" "${MINGW_PACKAGE_PREFIX}-${_realname}-objc-git") -pkgver=r140393.28c4d97 +pkgver=r138262.b510e09 _realpkgver=5.2.1 pkgrel=1 pkgdesc="GCC for the MinGW-w64" @@ -56,26 +56,26 @@ source=("git://gcc.gnu.org/git/gcc.git#branch=gcc-5-branch" "0019-MinGW-w64-Port-sanitizer.patch" "0020-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch") md5sums=('SKIP' - '65a9fc75d46e8c8a051fd246709b2652' - 'fc900d3c2b23921fc7bfe973d7c889ad' - '4d7e9bf23ee71b77a8d742589c77a56b' - 'c609e63914e83176477759f1aa27925d' - 'eb4d9cf6da0acd9f22277f60618b6bbb' - '04f1d877bf817047b90b5d3f4ca03d2d' - '5d774e23da45388220d677a7d06b5c71' - '0eeb7046d938fcdc6123adb5e9eeda07' - '5525a022098fb671dc54db298b8b56b0' - '2f314182cea4027a00a908957b37709f' - '5c77a36ac59f6b1a69b290728b02a41f' - '207f21a4bccfe6e9acbaa5af5f5fb389' - '6fbcd16a25c725c60e8b09480d7a30fb' - 'a71c072f7ba76cf11582332cdd0f2061' - 'cd71518ec43aab8a2a78a309a56b3b42' - '107a5222e034c4c58ae9b9a9fbd81f61' - 'c35021a8e0ffca8d6a78a49869cde573' - '3cb246fc3d5f605e02f2e242f1ac91a7' - '7e5fb2f55e36eee93a7a4b8f35211f79' - '4dad9a8c6300c24a1bb64f1dde20cdca') + 'd7d87c91e5cb749041dc6a76e3851c99' + 'aa208c2fd0e22fd3d705f0c566e1b7bd' + 'e56ac082dc2271c1f2e26c4c495ab1ef' + '7aa7577aa1f4b84bf545a36590b6a9b8' + 'c68ec5d0b4c598e1d821c7a2a5c09cc8' + '9db2310ba56d26e4591f8ed1465cb27b' + '948b52fafbd76243ad428f6676f983e1' + '8402da5e347d1af994330770bbfa482f' + '35c9c03bab8fbf35496c00505e155de5' + '598be0b3c075f34ee9412e544444a37d' + '297dcacc3dddffb4bb7f84c027d05de6' + 'f5d5df3c8cdf415887efdd03919a45d8' + 'c44cd8adfd8925669ff0dcad75a0a738' + 'edfb64089ffd93d59ce25dd657acc033' + '11bb407bb7189d99ee484dc7271e079d' + 'c6bb9ae076b9bf912a4fdee61dc4e85d' + '1c9eec9d73f8cddad416ebc6eec74d6f' + '4039f5f797aafc0ea6a8c19bbf3884c6' + '66099fb679608bcaa011ffb802eec59f' + '5e8e5881e4e64afc50e6848859c50fbe') _threads="posix" @@ -107,6 +107,14 @@ prepare() { git am "${srcdir}"/0018-MinGW-w64-No-fpic-in-sanitizer.patch git am "${srcdir}"/0019-MinGW-w64-Port-sanitizer.patch git am "${srcdir}"/0020-Force-linking-to-libgcc_s_dw2-1.dll-deprecated.patch + + # do not expect $prefix/mingw symlink - this should be superceded by + # 0006-Windows-Don-t-ignore-native-system-header-dir.patch .. but isn't! + sed -i 's/${prefix}\/mingw\//${prefix}\//g' configure + + # change hardcoded /mingw prefix to the real prefix + local MINGW_NATIVE_PREFIX=$(cygpath -am ${MINGW_PREFIX}/${MINGW_CHOST}) + sed -i "s/\\/mingw\\//${MINGW_NATIVE_PREFIX//\//\\/}\\//g" gcc/config/i386/mingw32.h } build() {