Skip to content
Snippets Groups Projects
Commit 11951410 authored by importbot's avatar importbot
Browse files

import mingw-w64-tools-12.0.0-2.el10

parent 011f3402
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
.mingw-w64-tools.metadata
+ 1
− 1
View file @ 11951410
3f66bce069ee8bed7439a1a13da7cb91a5e67ea6170f21317ac7f5794625ee10 SOURCES/mingw-w64-v11.0.1.tar.bz2 cc41898aac4b6e8dd5cffd7331b9d9515b912df4420a3a612b5ea2955bbeed2f SOURCES/mingw-w64-v12.0.0.tar.bz2
SOURCES/mingw-w64-tools-riscv64-on-s390x-ppc66le.patch deleted 100644 → 0
+ 0
− 108
View file @ 011f3402
diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h
--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h 2023-08-17 12:36:09.565149909 +0200
+++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h 2023-08-17 12:36:09.572149926 +0200
@@ -36,7 +36,7 @@ extern "C" {
* 64-bit.
*/
-#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(__s390x__)) && !defined(_WIN64)
+#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64))) && !defined(_WIN64)
#define _WIN64
#endif
@@ -327,6 +327,8 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY
# undef WORDS_BIGENDIAN
#elif defined(__s390__)
# define WORDS_BIGENDIAN
+#elif defined(__riscv) && (__riscv_xlen == 64)
+# undef WORDS_BIGENDIAN
#elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl)
# error Unknown CPU architecture!
#endif
diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/include/winnt.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h
--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/winnt.h 2023-08-17 12:36:09.567149914 +0200
+++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h 2023-08-17 12:36:09.574149930 +0200
@@ -1809,6 +1809,36 @@ typedef struct _CONTEXT
#endif /* __PPC64__ */
+#if (defined(__riscv) && (__riscv_xlen == 64))
+
+/*
+ * FIXME:
+ *
+ * There is no official CONTEXT structure defined for the riscv64
+ * architecture, so I just made one up, too.
+ *
+ * This structure is completely dummy, made just to build widl.
+ *
+ */
+
+#define CONTEXT_RISCV64 0x10000000
+
+#define CONTEXT_CONTROL (CONTEXT_RISCV64 | 0x00000001)
+#define CONTEXT_FLOATING_POINT (CONTEXT_RISCV64 | 0x00000002)
+#define CONTEXT_INTEGER (CONTEXT_RISCV64 | 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 /* __riscv64 */
+
#if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
#error You need to define a CONTEXT for your CPU
#endif
diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h
--- mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h 2023-08-17 12:36:09.568149916 +0200
+++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h 2023-08-17 12:36:09.574149930 +0200
@@ -88,7 +88,7 @@
struct target
{
- enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_S390X, CPU_PPC64 } cpu;
+ enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_S390X, CPU_PPC64, CPU_RISCV64 } cpu;
enum
{
@@ -453,6 +453,8 @@ static inline struct target get_default_
target.cpu = CPU_S390X;
#elif defined(__PPC64__)
target.cpu = CPU_PPC64;
+#elif (defined(__riscv) && (__riscv_xlen == 64))
+ target.cpu = CPU_RISCV64;
#else
#error Unsupported CPU
#endif
@@ -489,6 +491,7 @@ static inline unsigned int get_target_pt
[CPU_ARM64] = 8,
[CPU_S390X] = 8,
[CPU_PPC64] = 8,
+ [CPU_RISCV64] = 8,
};
return sizes[target.cpu];
}
@@ -533,7 +536,8 @@ static inline int get_cpu_from_name( con
{ "arm64", CPU_ARM64 },
{ "arm", CPU_ARM },
{ "s390x", CPU_S390X },
- { "ppc64", CPU_PPC64 }
+ { "ppc64", CPU_PPC64 },
+ { "riscv64", CPU_RISCV64 }
};
unsigned int i;
@@ -582,6 +586,7 @@ static inline const char *get_arch_dir(
[CPU_ARM64] = "aarch64",
[CPU_S390X] = "s390x",
[CPU_PPC64] = "ppc64",
+ [CPU_RISCV64]= "riscv64"
};
if (!cpu_names[target.cpu]) return "";
SOURCES/mingw-w64-tools-s390x-ppc66le.patch deleted 100644 → 0
+ 0
− 143
View file @ 011f3402
diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h
--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/basetsd.h 2023-04-29 11:15:30.000000000 +0200
+++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/basetsd.h 2023-08-17 12:36:09.203149051 +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
@@ -325,6 +325,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-v11.0.1/mingw-w64-tools/widl/include/winnt.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h
--- mingw-w64-v11.0.1/mingw-w64-tools/widl/include/winnt.h 2023-04-29 11:15:30.000000000 +0200
+++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/include/winnt.h 2023-08-17 12:36:09.204149054 +0200
@@ -1749,6 +1749,66 @@ typedef struct _KNONVOLATILE_CONTEXT_POI
#endif /* __aarch64__ */
+#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__ */
+
+#ifdef __PPC64__
+
+/*
+ * FIXME:
+ *
+ * There is no official CONTEXT structure defined for the PPC64
+ * architecture, so I just made one up.
+ *
+ * This structure is completely dummy, made just to build widl.
+ *
+ */
+
+#define CONTEXT_PPC64 0x10000000
+
+#define CONTEXT_CONTROL (CONTEXT_PPC64 | 0x00000001)
+#define CONTEXT_FLOATING_POINT (CONTEXT_PPC64 | 0x00000002)
+#define CONTEXT_INTEGER (CONTEXT_PPC64 | 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 /* __PPC64__ */
+
#if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
#error You need to define a CONTEXT for your CPU
#endif
diff -rupN --no-dereference mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h
--- mingw-w64-v11.0.1/mingw-w64-tools/widl/tools.h 2023-04-29 11:15:30.000000000 +0200
+++ mingw-w64-v11.0.1-new/mingw-w64-tools/widl/tools.h 2023-08-17 12:36:09.204149054 +0200
@@ -88,7 +88,7 @@
struct target
{
- enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64 } cpu;
+ enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_S390X, CPU_PPC64 } cpu;
enum
{
@@ -449,6 +449,10 @@ static inline struct target get_default_
target.cpu = CPU_ARM;
#elif defined(__aarch64__)
target.cpu = CPU_ARM64;
+#elif defined(__s390x__)
+ target.cpu = CPU_S390X;
+#elif defined(__PPC64__)
+ target.cpu = CPU_PPC64;
#else
#error Unsupported CPU
#endif
@@ -483,6 +487,8 @@ static inline unsigned int get_target_pt
[CPU_x86_64] = 8,
[CPU_ARM] = 4,
[CPU_ARM64] = 8,
+ [CPU_S390X] = 8,
+ [CPU_PPC64] = 8,
};
return sizes[target.cpu];
}
@@ -526,6 +532,8 @@ static inline int get_cpu_from_name( con
{ "aarch64", CPU_ARM64 },
{ "arm64", CPU_ARM64 },
{ "arm", CPU_ARM },
+ { "s390x", CPU_S390X },
+ { "ppc64", CPU_PPC64 }
};
unsigned int i;
@@ -571,7 +579,9 @@ static inline const char *get_arch_dir(
[CPU_i386] = "i386",
[CPU_x86_64] = "x86_64",
[CPU_ARM] = "arm",
- [CPU_ARM64] = "aarch64"
+ [CPU_ARM64] = "aarch64",
+ [CPU_S390X] = "s390x",
+ [CPU_PPC64] = "ppc64",
};
if (!cpu_names[target.cpu]) return "";
SOURCES/widl-cpu.patch 0 → 100644
+ 21
− 0
View file @ 11951410
diff -rupN --no-dereference mingw-w64-v12.0.0/mingw-w64-tools/widl/tools.h mingw-w64-v12.0.0-new/mingw-w64-tools/widl/tools.h
--- mingw-w64-v12.0.0/mingw-w64-tools/widl/tools.h 2024-05-22 09:07:14.000000000 +0200
+++ mingw-w64-v12.0.0-new/mingw-w64-tools/widl/tools.h 2024-07-16 14:12:13.330779850 +0200
@@ -90,7 +90,7 @@ extern char **environ;
struct target
{
- enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_ARM64EC } cpu;
+ enum { CPU_i386, CPU_x86_64, CPU_ARM, CPU_ARM64, CPU_ARM64EC, CPU_UNSPECIFIED } cpu;
enum
{
@@ -448,7 +448,7 @@ static inline struct target get_default_
#elif defined(__aarch64__)
target.cpu = CPU_ARM64;
#else
-#error Unsupported CPU
+ target.cpu = CPU_UNSPECIFIED;
#endif
#ifdef __APPLE__
SOURCES/widl-missing-cpu-info.patch 0 → 100644
+ 12
− 0
View file @ 11951410
diff -rupN --no-dereference mingw-w64-v12.0.0/mingw-w64-tools/widl/include/basetsd.h mingw-w64-v12.0.0-new/mingw-w64-tools/widl/include/basetsd.h
--- mingw-w64-v12.0.0/mingw-w64-tools/widl/include/basetsd.h 2024-05-22 09:07:14.000000000 +0200
+++ mingw-w64-v12.0.0-new/mingw-w64-tools/widl/include/basetsd.h 2024-07-16 14:12:12.551825573 +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(__sparc64__) || defined(__ia64__) || defined(__s390x__)) && !defined(_WIN64)
#define _WIN64
#endif
SOURCES/widl-no-context.patch 0 → 100644
+ 536
− 0
View file @ 11951410
This diff is collapsed.
SPECS/mingw-w64-tools.spec
+ 13
− 6
View file @ 11951410
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
#%%global branch trunk #%%global branch trunk
Name: mingw-w64-tools Name: mingw-w64-tools
Version: 11.0.1 Version: 12.0.0
Release: 6%{?dist} Release: 2%{?dist}
Summary: Supplementary tools which are part of the mingw-w64 toolchain Summary: Supplementary tools which are part of the mingw-w64 toolchain
# Fix build on s390x and ppc64le # From Debian: Add missing CPU information (ia64, s390, s390x)
Patch0: mingw-w64-tools-s390x-ppc66le.patch Patch0: widl-missing-cpu-info.patch
# Fix build on riscv64, this patch can only be applied after mingw-w64-tools-s390x-ppc66le.patch # From Debian: Drop unused platform-specific context definitions
Patch1: mingw-w64-tools-riscv64-on-s390x-ppc66le.patch Patch1: widl-no-context.patch
# From Debian: Don't error out on non-Windows CPUs
Patch2: widl-cpu.patch
# http://sourceforge.net/mailarchive/forum.php?thread_name=5157C0FC.1010309%40users.sourceforge.net&forum_name=mingw-w64-public # http://sourceforge.net/mailarchive/forum.php?thread_name=5157C0FC.1010309%40users.sourceforge.net&forum_name=mingw-w64-public
# The tools gendef and genidl are GPLv3+, widl is LGPLv2+ # The tools gendef and genidl are GPLv3+, widl is LGPLv2+
...@@ -108,6 +111,10 @@ popd ...@@ -108,6 +111,10 @@ popd
%changelog %changelog
* Tue Jan 14 2025 Miroslav Rezanina <mrezanin@redhat.com> - 12.0.0-2
- Synchronize with Fedora Rawhide
Resolves: RHEL-73824
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 11.0.1-6 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 11.0.1-6
- Bump release for October 2024 mass rebuild: - Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018 Resolves: RHEL-64018
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment