Mercurial > mxe-octave
changeset 4554:84c86b41a6a2
mingw-w64: update to v5.0.3
* src/mingw-w64.mk: update version, checksum
* src/mingw-w64-2-pthreads.patch: removed patch
* dist-files.mk: removed ref to mingw-w64-2-pthreads.patch
| author | John D |
|---|---|
| date | Mon, 27 Nov 2017 09:50:38 -0500 |
| parents | b25cf2abab4a |
| children | c2d59e7a4ad3 |
| files | dist-files.mk src/mingw-w64-2-pthreads.patch src/mingw-w64.mk |
| diffstat | 3 files changed, 2 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Mon Nov 27 08:59:54 2017 -0500 +++ b/dist-files.mk Mon Nov 27 09:50:38 2017 -0500 @@ -329,7 +329,6 @@ mingw-texinfo-1-fixes.patch \ mingw-utils-1-portability-fix.patch \ mingw-w64-1-float-h.patch \ - mingw-w64-2-pthreads.patch \ mingw-w64.mk \ mingwrt.mk \ mman-win32-1-include_name_change.patch \
--- a/src/mingw-w64-2-pthreads.patch Mon Nov 27 08:59:54 2017 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -based on https://sourceforge.net/p/mingw-w64/mailman/message/35828127/ - -diff -ur mingw-w64-v5.0.2.orig/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c mingw-w64-v5.0.2/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c ---- mingw-w64-v5.0.2.orig/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c 2017-07-31 16:10:12.189758140 -0400 -+++ mingw-w64-v5.0.2/mingw-w64-libraries/winpthreads/src/libgcc/dll_math.c 2017-07-31 16:16:42.332643290 -0400 -@@ -120,6 +120,7 @@ - u_quad_t __udivdi3(u_quad_t a, u_quad_t b); - u_quad_t __umoddi3(u_quad_t a, u_quad_t b); - int __ucmpdi2(u_quad_t a, u_quad_t b); -+quad_t __divmoddi4(quad_t a, quad_t b, quad_t *rem); - - #endif /* !_LIBKERN_QUAD_H_ */ - -@@ -546,6 +547,31 @@ - (void)__qdivrem(a, b, &r); - return (r); - } -+ -+/* -+ * Divide two signed quads. -+ * This function is new in GCC 7. -+ */ -+quad_t -+__divmoddi4(a, b, rem) -+ quad_t a, b, *rem; -+{ -+ u_quad_t ua, ub, uq, ur; -+ int negq, negr; -+ -+ if (a < 0) -+ ua = -(u_quad_t)a, negq = 1, negr = 1; -+ else -+ ua = a, negq = 0, negr = 0; -+ if (b < 0) -+ ub = -(u_quad_t)b, negq ^= 1; -+ else -+ ub = b; -+ uq = __qdivrem(ua, ub, &ur); -+ if (rem) -+ *rem = (negr ? -ur : ur); -+ return (negq ? -uq : uq); -+} - #else - static int __attribute__((unused)) dummy; - #endif /*deined (_X86_) && !defined (__x86_64__)*/
--- a/src/mingw-w64.mk Mon Nov 27 08:59:54 2017 -0500 +++ b/src/mingw-w64.mk Mon Nov 27 09:50:38 2017 -0500 @@ -3,8 +3,8 @@ PKG := mingw-w64 $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.2 -$(PKG)_CHECKSUM := bb5409f034abb7c021b3e1c14db433fd253cbb59 +$(PKG)_VERSION := 5.0.3 +$(PKG)_CHECKSUM := 96278378b829695007ce6a527278cba19cb829f2 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)