Update to 10.0.0

This commit is contained in:
Sandro Mani 2022-04-27 14:44:04 +02:00
parent 53836d902f
commit bcb3e05146
4 changed files with 8 additions and 107 deletions

1
.gitignore vendored
View File

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

View File

@ -1,101 +0,0 @@
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.
*/
-#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__)) && !defined(_WIN64)
+#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(__s390x__)) && !defined(_WIN64)
#define _WIN64
#endif
@@ -295,6 +295,8 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY
# define WORDS_BIGENDIAN
#elif defined(__MIPSEL__)
# undef WORDS_BIGENDIAN
+#elif defined(__s390__)
+# define WORDS_BIGENDIAN
#elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl)
# error Unknown CPU architecture!
#endif
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__ */
+#ifdef __s390x__
+
+/*
+ * FIXME:
+ *
+ * There is no official CONTEXT structure defined for the S/390
+ * architecture, so I just made one up.
+ *
+ * This structure is completely dummy, made just to build widl.
+ *
+ */
+
+#define CONTEXT_S390X 0x10000000
+
+#define CONTEXT_CONTROL (CONTEXT_S390X | 0x00000001)
+#define CONTEXT_FLOATING_POINT (CONTEXT_S390X | 0x00000002)
+#define CONTEXT_INTEGER (CONTEXT_S390X | 0x00000004)
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_FLOATING_POINT | CONTEXT_INTEGER)
+
+#define EXCEPTION_READ_FAULT 0
+#define EXCEPTION_WRITE_FAULT 1
+#define EXCEPTION_EXECUTE_FAULT 8
+
+typedef struct _CONTEXT
+{
+} CONTEXT, *PCONTEXT;
+
+#endif /* __s390x__ */
+
#if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
#error You need to define a CONTEXT for your CPU
#endif
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;
+#elif defined(__s390x__)
+enum target_cpu target_cpu = CPU_S390X;
#else
#error Unsupported CPU
#endif
@@ -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;
@@ -787,6 +790,7 @@ int main(int argc,char *argv[])
else pointer_size = 4;
break;
case CPU_x86_64:
+ case CPU_S390X:
if (pointer_size == 4) target_cpu = CPU_x86;
else pointer_size = 8;
break;
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_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,8 +4,8 @@
#%%global branch trunk
Name: mingw-w64-tools
Version: 9.0.0
Release: 4%{?dist}
Version: 10.0.0
Release: 1%{?dist}
Summary: Supplementary tools which are part of the mingw-w64 toolchain
# http://sourceforge.net/mailarchive/forum.php?thread_name=5157C0FC.1010309%40users.sourceforge.net&forum_name=mingw-w64-public
@ -23,10 +23,8 @@ Source0: http://sourceforge.net/code-snapshots/git/m/mi/mingw-w64/mingw-w
%else
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
%endif
# just to make widl to build on s390
Patch0: mingw-w64-tools-s390.patch
BuildRequires: make
BuildRequires: make
BuildRequires: gcc
BuildRequires: mingw32-filesystem >= 133
BuildRequires: mingw64-filesystem >= 133
@ -106,6 +104,9 @@ popd
%changelog
* Tue Apr 26 2022 Sandro Mani <manisandro@gmail.com> - 10.0.0-1
- Update to 10.0.0
* Wed Feb 23 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 9.0.0-4
- Add ucrt64 target.

View File

@ -1 +1 @@
SHA512 (mingw-w64-v9.0.0.tar.bz2) = 6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386
SHA512 (mingw-w64-v10.0.0.tar.bz2) = 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516