diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2018-06-04 15:03:15 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2018-06-04 15:20:02 (GMT) |
| commit | 27d117f7d92f7f26bef35a57650cccd4ae6632ab (patch) | |
| tree | 3347b2fdbfe38ad5642ec28da81b096936129177 | |
| parent | 5d4c388be33414e7a802c4959d3d22f759840587 (diff) | |
| download | mxe-27d117f7d92f7f26bef35a57650cccd4ae6632ab.zip mxe-27d117f7d92f7f26bef35a57650cccd4ae6632ab.tar.gz mxe-27d117f7d92f7f26bef35a57650cccd4ae6632ab.tar.bz2 | |
update mingw-w64
| -rw-r--r-- | src/mingw-w64-1.patch | 47 | ||||
| -rw-r--r-- | src/mingw-w64.mk | 4 |
2 files changed, 5 insertions, 46 deletions
diff --git a/src/mingw-w64-1.patch b/src/mingw-w64-1.patch index 9585acf..ff55a57 100644 --- a/src/mingw-w64-1.patch +++ b/src/mingw-w64-1.patch @@ -29,56 +29,18 @@ index 1111111..2222222 100644 #undef FLT_ROUNDS From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mateusz <mateuszb@poczta.onet.pl> -Date: Mon, 22 Jan 2018 20:58:48 +0100 -Subject: [PATCH 2/2] intrin-impl.h: do not define _xgetbv for GCC 8 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC 8 from r248028 has defined function _xgetbv and we should -avoid double definition of this function. - -Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl> -Signed-off-by: Martin Storsjö <martin@martin.st> - -diff --git a/mingw-w64-headers/include/psdk_inc/intrin-impl.h b/mingw-w64-headers/include/psdk_inc/intrin-impl.h -index 1111111..2222222 100644 ---- a/mingw-w64-headers/include/psdk_inc/intrin-impl.h -+++ b/mingw-w64-headers/include/psdk_inc/intrin-impl.h -@@ -1405,6 +1405,7 @@ __buildmov(__movsd, unsigned __LONG32, "d") - #define __INTRINSIC_DEFINED___movsd - #endif /* __INTRINSIC_PROLOG */ - -+#if !defined(__GNUC__) || __GNUC__ < 8 /* GCC 8 has already defined _xgetbv */ - /* NOTE: This should be in immintrin.h */ - #if __INTRINSIC_PROLOG(_xgetbv) - unsigned __int64 _xgetbv(unsigned int); -@@ -1426,6 +1427,7 @@ unsigned __int64 _xgetbv(unsigned int index) - } - #define __INTRINSIC_DEFINED__xgetbv - #endif /* __INTRINSIC_PROLOG */ -+#endif /* __GNUC__ < 8 */ - - #endif /* defined(__x86_64__) || defined(_AMD64_) || defined(__i386__) || defined(_X86_) */ - -From e9f10474cfd239bbb656a9d15163a439fc0efa78 Mon Sep 17 00:00:00 2001 From: Jonathan Yong <10walls@gmail.com> Date: Fri, 22 Dec 2017 13:01:03 +0000 -Subject: [PATCH] dwmapi.def: Regenegerate from Windows 10 +Subject: [PATCH 2/2] dwmapi.def: Regenegerate from Windows 10 Remove ordinals from x86 library too. Signed-off-by: Jonathan Yong <10walls@gmail.com> Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/ ---- - mingw-w64-crt/lib32/dwmapi.def | 44 ++++++++++++++---------------------------- - mingw-w64-crt/lib64/dwmapi.def | 26 ++++++++++++++++++++++--- - 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/mingw-w64-crt/lib32/dwmapi.def b/mingw-w64-crt/lib32/dwmapi.def -index 798116fb..96009459 100644 +index 1111111..2222222 100644 --- a/mingw-w64-crt/lib32/dwmapi.def +++ b/mingw-w64-crt/lib32/dwmapi.def @@ -5,47 +5,29 @@ @@ -156,7 +118,7 @@ index 798116fb..96009459 100644 DwmUnregisterThumbnail@4 DwmUpdateThumbnailProperties@8 diff --git a/mingw-w64-crt/lib64/dwmapi.def b/mingw-w64-crt/lib64/dwmapi.def -index 871947e5..d8bf23f1 100644 +index 1111111..2222222 100644 --- a/mingw-w64-crt/lib64/dwmapi.def +++ b/mingw-w64-crt/lib64/dwmapi.def @@ -1,8 +1,13 @@ @@ -210,6 +172,3 @@ index 871947e5..d8bf23f1 100644 DwmUnregisterThumbnail DwmUpdateThumbnailProperties - --- -2.13.6 - diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk index f4b1519..ebb933e 100644 --- a/src/mingw-w64.mk +++ b/src/mingw-w64.mk @@ -4,8 +4,8 @@ PKG := mingw-w64 $(PKG)_WEBSITE := https://mingw-w64.sourceforge.io/ $(PKG)_DESCR := MinGW-w64 Runtime $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.3 -$(PKG)_CHECKSUM := 2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4 +$(PKG)_VERSION := 5.0.4 +$(PKG)_CHECKSUM := 5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE) |