Update to 9.0.0

This commit is contained in:
Sandro Mani 2021-07-08 18:18:01 +02:00
parent 6bdbe1b1b9
commit 4c2f7752be
5 changed files with 29 additions and 40 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/mingw-w64-v7.0.0.tar.bz2
/mingw-w64-v8.0.0.tar.bz2
/mingw-w64-v8.0.2.tar.bz2
/mingw-w64-v9.0.0.tar.bz2

View File

@ -1,12 +0,0 @@
diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/include/windef.h mingw-w64-v8.0.2-new/mingw-w64-tools/widl/include/windef.h
--- mingw-w64-v8.0.2/mingw-w64-tools/widl/include/windef.h 2021-05-09 08:38:05.000000000 +0200
+++ mingw-w64-v8.0.2-new/mingw-w64-tools/widl/include/windef.h 2021-05-17 10:22:10.567083587 +0200
@@ -107,7 +107,7 @@ extern "C" {
#endif
#ifndef __ms_va_list
-# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__)
+# if (defined(__x86_64__)) && defined (__GNUC__)
# define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list)

View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v8.0.2-new/mingw-w64-tools/widl/include/basetsd.h
--- mingw-w64-v8.0.2/mingw-w64-tools/widl/include/basetsd.h 2021-05-09 08:38:05.000000000 +0200
+++ mingw-w64-v8.0.2-new/mingw-w64-tools/widl/include/basetsd.h 2021-05-17 10:22:10.313083581 +0200
diff -rupN --no-dereference mingw-w64-v9.0.0/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v9.0.0-new/mingw-w64-tools/widl/include/basetsd.h
--- mingw-w64-v9.0.0/mingw-w64-tools/widl/include/basetsd.h 2021-05-22 14:34:25.000000000 +0200
+++ mingw-w64-v9.0.0-new/mingw-w64-tools/widl/include/basetsd.h 2021-06-22 09:42:24.542066184 +0200
@@ -36,7 +36,7 @@ extern "C" {
* 64-bit.
*/
@ -10,7 +10,7 @@ diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/include/basets
#define _WIN64
#endif
@@ -289,6 +289,8 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY
@@ -295,6 +295,8 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY
# define WORDS_BIGENDIAN
#elif defined(__MIPSEL__)
# undef WORDS_BIGENDIAN
@ -19,10 +19,10 @@ diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/include/basets
#elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl)
# error Unknown CPU architecture!
#endif
diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/include/winnt.h mingw-w64-v8.0.2-new/mingw-w64-tools/widl/include/winnt.h
--- mingw-w64-v8.0.2/mingw-w64-tools/widl/include/winnt.h 2021-05-09 08:38:05.000000000 +0200
+++ mingw-w64-v8.0.2-new/mingw-w64-tools/widl/include/winnt.h 2021-05-17 10:22:10.314083581 +0200
@@ -2335,6 +2335,36 @@ typedef struct _STACK_FRAME_HEADER
diff -rupN --no-dereference mingw-w64-v9.0.0/mingw-w64-tools/widl/include/winnt.h mingw-w64-v9.0.0-new/mingw-w64-tools/widl/include/winnt.h
--- mingw-w64-v9.0.0/mingw-w64-tools/widl/include/winnt.h 2021-05-22 14:34:25.000000000 +0200
+++ mingw-w64-v9.0.0-new/mingw-w64-tools/widl/include/winnt.h 2021-06-22 09:42:24.543066195 +0200
@@ -2396,6 +2396,36 @@ typedef struct _STACK_FRAME_HEADER
#endif /* __powerpc__ */
@ -59,10 +59,10 @@ diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/include/winnt.
#if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
#error You need to define a CONTEXT for your CPU
#endif
diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/src/widl.c mingw-w64-v8.0.2-new/mingw-w64-tools/widl/src/widl.c
--- mingw-w64-v8.0.2/mingw-w64-tools/widl/src/widl.c 2021-05-09 08:38:05.000000000 +0200
+++ mingw-w64-v8.0.2-new/mingw-w64-tools/widl/src/widl.c 2021-05-17 10:22:10.314083581 +0200
@@ -104,6 +104,8 @@ enum target_cpu target_cpu = CPU_POWERPC
diff -rupN --no-dereference mingw-w64-v9.0.0/mingw-w64-tools/widl/src/widl.c mingw-w64-v9.0.0-new/mingw-w64-tools/widl/src/widl.c
--- mingw-w64-v9.0.0/mingw-w64-tools/widl/src/widl.c 2021-05-22 14:34:25.000000000 +0200
+++ mingw-w64-v9.0.0-new/mingw-w64-tools/widl/src/widl.c 2021-06-22 09:42:24.546066227 +0200
@@ -106,6 +106,8 @@ enum target_cpu target_cpu = CPU_POWERPC
enum target_cpu target_cpu = CPU_ARM;
#elif defined(__aarch64__)
enum target_cpu target_cpu = CPU_ARM64;
@ -71,15 +71,15 @@ diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/src/widl.c min
#else
#error Unsupported CPU
#endif
@@ -302,6 +304,7 @@ static void set_target( const char *targ
{ "armv7a", CPU_ARM },
{ "arm64", CPU_ARM64 },
{ "aarch64", CPU_ARM64 },
+ { "s390x", CPU_S390X }
@@ -301,6 +303,7 @@ static void set_target( const char *targ
{ "armv7a", CPU_ARM },
{ "arm64", CPU_ARM64 },
{ "aarch64", CPU_ARM64 },
+ { "s390x", CPU_S390X },
};
unsigned int i;
@@ -788,6 +791,7 @@ int main(int argc,char *argv[])
@@ -787,6 +790,7 @@ int main(int argc,char *argv[])
else pointer_size = 4;
break;
case CPU_x86_64:
@ -87,15 +87,15 @@ diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/src/widl.c min
if (pointer_size == 4) target_cpu = CPU_x86;
else pointer_size = 8;
break;
diff -rupN --no-dereference mingw-w64-v8.0.2/mingw-w64-tools/widl/src/widl.h mingw-w64-v8.0.2-new/mingw-w64-tools/widl/src/widl.h
--- mingw-w64-v8.0.2/mingw-w64-tools/widl/src/widl.h 2021-05-09 08:38:05.000000000 +0200
+++ mingw-w64-v8.0.2-new/mingw-w64-tools/widl/src/widl.h 2021-05-17 10:22:10.314083581 +0200
diff -rupN --no-dereference mingw-w64-v9.0.0/mingw-w64-tools/widl/src/widl.h mingw-w64-v9.0.0-new/mingw-w64-tools/widl/src/widl.h
--- mingw-w64-v9.0.0/mingw-w64-tools/widl/src/widl.h 2021-05-22 14:34:25.000000000 +0200
+++ mingw-w64-v9.0.0-new/mingw-w64-tools/widl/src/widl.h 2021-06-22 09:42:24.546066227 +0200
@@ -76,7 +76,7 @@ extern int char_number;
enum target_cpu
{
- CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_LAST = CPU_ARM64
+ CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_S390X, CPU_LAST = CPU_S390X
- CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_LAST = CPU_POWERPC64
+ CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_POWERPC64, CPU_S390X, CPU_LAST = CPU_S390X
};
extern enum target_cpu target_cpu;

View File

@ -4,7 +4,7 @@
#%%global branch trunk
Name: mingw-w64-tools
Version: 8.0.2
Version: 9.0.0
Release: 1%{?dist}
Summary: Supplementary tools which are part of the mingw-w64 toolchain
@ -26,9 +26,6 @@ Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}
# just to make widl to build on s390
Patch0: mingw-w64-tools-s390.patch
# aarch64 does not seem to know about __builtin_ms_va_list
Patch1: mingw-w64-tools-aarch64.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: mingw32-filesystem >= 95
@ -101,6 +98,9 @@ popd
%changelog
* Thu Jul 08 2021 Sandro Mani <manisandro@gmail.com> - 9.0.0-1
- Update to 9.0.0
* Mon May 17 2021 Sandro Mani <manisandro@gmail.com> - 8.0.2-1
- Update to 8.0.2

View File

@ -1 +1 @@
SHA512 (mingw-w64-v8.0.2.tar.bz2) = a2eb0891ab153fed41969a3d86b770dbaf65dfc836dae83888ddbb79459b51301b91f3ec25292a8f236ab4df863e1bb58393d024bf078dc7e51492124c599b0c
SHA512 (mingw-w64-v9.0.0.tar.bz2) = 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386