Compare commits
No commits in common. "c9-beta" and "c8s" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
SOURCES/mingw-w64-v11.0.1.tar.bz2
|
/mingw-w64-v5.0.2.tar.bz2
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
ab23c9af10fb38388ac75145dd9ffed3c64d1eeb SOURCES/mingw-w64-v11.0.1.tar.bz2
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
From 8243669e8dba9220d7a30b5eb3617b2ecedae4d8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: sezero <sezero@users.sourceforge.net>
|
||||||
|
Date: Thu, 15 Jun 2017 09:45:52 +0300
|
||||||
|
Subject: [PATCH 1/2] genpeimg.c (pass_args): add a /* fallthru */ comment in
|
||||||
|
the switch after show_usage() to avoid -Wimplicit-fallthrough (show_usage):
|
||||||
|
mark the function with noreturn attribute.
|
||||||
|
|
||||||
|
---
|
||||||
|
mingw-w64-tools/genpeimg/src/genpeimg.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
|
||||||
|
index f8ac44e1..19bc5e2c 100644
|
||||||
|
--- a/mingw-w64-tools/genpeimg/src/genpeimg.c
|
||||||
|
+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
|
||||||
|
@@ -28,7 +28,7 @@ unsigned short mask_pe_opt_hdr_dll_chara = 0xffff;
|
||||||
|
int dump_information = 0;
|
||||||
|
static char *file_name = NULL;
|
||||||
|
|
||||||
|
-static void
|
||||||
|
+static void __attribute__((noreturn))
|
||||||
|
show_usage (void)
|
||||||
|
{
|
||||||
|
fprintf (stderr, "genpeimg [options] files...\n");
|
||||||
|
@@ -204,6 +204,7 @@ pass_args (int argc, char **argv)
|
||||||
|
case 'h':
|
||||||
|
if (h[2] == 0)
|
||||||
|
show_usage ();
|
||||||
|
+ /* fallthru */
|
||||||
|
default:
|
||||||
|
error_point:
|
||||||
|
fprintf (stderr, "Unknown option ,%s'\n", h);
|
||||||
|
--
|
||||||
|
2.13.0
|
||||||
|
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
From b5d311c8e573a17a7b9b38d303fa7db6dc45e98f Mon Sep 17 00:00:00 2001
|
||||||
|
From: sezero <sezero@users.sourceforge.net>
|
||||||
|
Date: Thu, 15 Jun 2017 09:50:00 +0300
|
||||||
|
Subject: [PATCH 2/2] gendef.c (getMemonic): add /* fallthru */ comments in the
|
||||||
|
switch to avoid -Wimplicit-fallthrough
|
||||||
|
|
||||||
|
---
|
||||||
|
mingw-w64-tools/gendef/src/gendef.c | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
|
||||||
|
index 9d3c7954..12fd1e73 100644
|
||||||
|
--- a/mingw-w64-tools/gendef/src/gendef.c
|
||||||
|
+++ b/mingw-w64-tools/gendef/src/gendef.c
|
||||||
|
@@ -836,7 +836,7 @@ disassembleRetIntern (uint32_t pc, uint32_t *retpop, sAddresses *seen, sAddresse
|
||||||
|
if (!sz || code == c_ill)
|
||||||
|
{
|
||||||
|
PRDEBUG(" %s = 0x08%x ILL (%u) at least one==%d\n",name,
|
||||||
|
- (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
|
||||||
|
+ (unsigned int) pc, (unsigned int) sz,atleast_one[0]);
|
||||||
|
#if ENABLE_DEBUG == 1
|
||||||
|
{
|
||||||
|
unsigned char *ppc = (unsigned char *) map_va (pc);
|
||||||
|
@@ -1031,10 +1031,10 @@ redo_switch:
|
||||||
|
PRDEBUG(" 0x%x illegal ", (unsigned int) b);
|
||||||
|
#endif
|
||||||
|
*aCode=c_ill; return 0;
|
||||||
|
- case c_4: sz++;
|
||||||
|
- case c_3: sz++;
|
||||||
|
+ case c_4: sz++;/* fallthru */
|
||||||
|
+ case c_3: sz++;/* fallthru */
|
||||||
|
case c_lb:
|
||||||
|
- case c_2: sz++;
|
||||||
|
+ case c_2: sz++;/* fallthru */
|
||||||
|
case c_retn: case c_retf:
|
||||||
|
case c_iret: case c_int3:
|
||||||
|
case c_ad: case c_op:
|
||||||
|
@@ -1061,7 +1061,7 @@ redo_switch:
|
||||||
|
p = (unsigned char *) map_va (pc + sz);
|
||||||
|
if (!p) { *aCode=c_ill; return 0; }
|
||||||
|
#if ENABLE_DEBUG == 1
|
||||||
|
- enter_save_insn(lw,p[0]);
|
||||||
|
+ enter_save_insn(lw,p[0]);
|
||||||
|
#endif
|
||||||
|
b&=~0x7; b|=(p[0]&7);
|
||||||
|
sz+=1;
|
||||||
|
--
|
||||||
|
2.13.0
|
||||||
|
|
||||||
@ -1,108 +0,0 @@
|
|||||||
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 "";
|
|
||||||
@ -1,143 +0,0 @@
|
|||||||
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 "";
|
|
||||||
63
mingw-w64-tools-2.0.999-s390.patch
Normal file
63
mingw-w64-tools-2.0.999-s390.patch
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
diff -up mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h.s390 mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h
|
||||||
|
--- mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h.s390 2012-01-24 11:11:33.000000000 +0100
|
||||||
|
+++ mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/basetsd.h 2012-03-28 14:18:17.000000000 +0200
|
||||||
|
@@ -36,7 +36,7 @@
|
||||||
|
* 64-bit.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__)) && !defined(_WIN64)
|
||||||
|
+#if (defined(__x86_64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__aarch64__) || defined(__s390x__)) && !defined(_WIN64)
|
||||||
|
#define _WIN64
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -305,6 +305,10 @@ typedef ULONG_PTR KAFFINITY, *PKAFFINITY
|
||||||
|
# undef WORDS_BIGENDIAN
|
||||||
|
# undef BITFIELDS_BIGENDIAN
|
||||||
|
# undef ALLOW_UNALIGNED_ACCESS
|
||||||
|
+#elif defined(__s390__)
|
||||||
|
+# define WORDS_BIGENDIAN
|
||||||
|
+# define BITFIELDS_BIGENDIAN
|
||||||
|
+# define ALLOW_UNALIGNED_ACCESS
|
||||||
|
#elif !defined(RC_INVOKED) && !defined(__WIDL__) && !defined(__midl)
|
||||||
|
# error Unknown CPU architecture!
|
||||||
|
#endif
|
||||||
|
diff -up mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/winnt.h.s390 mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/winnt.h
|
||||||
|
--- mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/winnt.h.s390 2012-01-24 11:11:33.000000000 +0100
|
||||||
|
+++ mingw-w64-v2.0.999/mingw/mingw-w64-tools/widl/include/winnt.h 2012-03-28 14:20:07.000000000 +0200
|
||||||
|
@@ -1910,6 +1910,36 @@ typedef struct _CONTEXT
|
||||||
|
|
||||||
|
#endif /* __powerpc__ */
|
||||||
|
|
||||||
|
+#ifdef __s390__
|
||||||
|
+
|
||||||
|
+/*
|
||||||
|
+ * 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_S390 0x10000000
|
||||||
|
+
|
||||||
|
+#define CONTEXT_CONTROL (CONTEXT_S390 | 0x00000001)
|
||||||
|
+#define CONTEXT_FLOATING_POINT (CONTEXT_S390 | 0x00000002)
|
||||||
|
+#define CONTEXT_INTEGER (CONTEXT_S390 | 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;
|
||||||
|
+
|
||||||
|
+#endif /* __s390__ */
|
||||||
|
+
|
||||||
|
#if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
|
||||||
|
#error You need to define a CONTEXT for your CPU
|
||||||
|
#endif
|
||||||
22
mingw-w64-tools-widl-includedir.patch
Normal file
22
mingw-w64-tools-widl-includedir.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
--- mingw-w64-v5.0.2/mingw-w64-tools/widl/Makefile.am.orig 2017-06-19 12:09:10.579443494 +0200
|
||||||
|
+++ mingw-w64-v5.0.2/mingw-w64-tools/widl/Makefile.am 2017-06-19 12:09:44.896439319 +0200
|
||||||
|
@@ -58,7 +58,7 @@
|
||||||
|
include/pathtools.h \
|
||||||
|
include/winnt.rh
|
||||||
|
|
||||||
|
-widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(includedir)/../$(target)/include\" -DDEFAULT_BINDIR=\"$(bindir)\"
|
||||||
|
+widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(prefix)/$(target)/sys-root/mingw/include\" -DDEFAULT_BINDIR=\"$(bindir)\"
|
||||||
|
widl_CFLAGS = -Wall -Wformat -Wpacked -Wmissing-declarations -Wimplicit-function-declaration -Wmissing-prototypes -Wstrict-aliasing=2
|
||||||
|
|
||||||
|
DISTCHECK_CONFIGURE_FLAGS = --host=$(host) --target=$(target)
|
||||||
|
--- mingw-w64-v5.0.2/mingw-w64-tools/widl/Makefile.in.orig 2017-06-19 12:09:18.051442585 +0200
|
||||||
|
+++ mingw-w64-v5.0.2/mingw-w64-tools/widl/Makefile.in 2017-06-19 12:10:12.177436000 +0200
|
||||||
|
@@ -285,7 +285,7 @@
|
||||||
|
include/pathtools.h \
|
||||||
|
include/winnt.rh
|
||||||
|
|
||||||
|
-widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(includedir)/../$(target)/include\" -DDEFAULT_BINDIR=\"$(bindir)\"
|
||||||
|
+widl_CPPFLAGS = -I$(top_srcdir)/include -DDEFAULT_INCLUDE_DIR=\"$(prefix)/$(target)/sys-root/mingw/include\" -DDEFAULT_BINDIR=\"$(bindir)\"
|
||||||
|
widl_CFLAGS = -Wall -Wformat -Wpacked -Wmissing-declarations -Wimplicit-function-declaration -Wmissing-prototypes -Wstrict-aliasing=2
|
||||||
|
DISTCHECK_CONFIGURE_FLAGS = --host=$(host) --target=$(target)
|
||||||
|
all: all-am
|
||||||
@ -4,17 +4,13 @@
|
|||||||
#%%global branch trunk
|
#%%global branch trunk
|
||||||
|
|
||||||
Name: mingw-w64-tools
|
Name: mingw-w64-tools
|
||||||
Version: 11.0.1
|
Version: 5.0.2
|
||||||
Release: 3%{?dist}
|
Release: 5%{?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
|
|
||||||
Patch0: mingw-w64-tools-s390x-ppc66le.patch
|
|
||||||
# Fix build on riscv64, this patch can only be applied after mingw-w64-tools-s390x-ppc66le.patch
|
|
||||||
Patch1: mingw-w64-tools-riscv64-on-s390x-ppc66le.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+
|
||||||
License: GPL-3.0-or-later AND LGPL-2.0-or-later
|
License: GPLv3+ and LGPLv2+
|
||||||
|
|
||||||
URL: http://mingw-w64.sourceforge.net/
|
URL: http://mingw-w64.sourceforge.net/
|
||||||
%if 0%{?snapshot_date}
|
%if 0%{?snapshot_date}
|
||||||
@ -27,12 +23,19 @@ Source0: http://sourceforge.net/code-snapshots/git/m/mi/mingw-w64/mingw-w
|
|||||||
%else
|
%else
|
||||||
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
|
# just to make widl to build on s390
|
||||||
|
Patch0: mingw-w64-tools-2.0.999-s390.patch
|
||||||
|
|
||||||
BuildRequires: make
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1047727
|
||||||
BuildRequires: gcc
|
Patch1: mingw-w64-tools-widl-includedir.patch
|
||||||
BuildRequires: mingw32-filesystem >= 133
|
|
||||||
BuildRequires: mingw64-filesystem >= 133
|
# Backported from upstream
|
||||||
BuildRequires: ucrt64-filesystem >= 133
|
Patch2: 0001-genpeimg.c-pass_args-add-a-fallthru-comment-in-the-s.patch
|
||||||
|
Patch3: 0002-gendef.c-getMemonic-add-fallthru-comments-in-the-swi.patch
|
||||||
|
|
||||||
|
BuildRequires: mingw32-filesystem >= 95
|
||||||
|
BuildRequires: mingw64-filesystem >= 95
|
||||||
|
ExclusiveArch: %{ix86} x86_64
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -46,10 +49,14 @@ rm -rf mingw-w64-v%{version}
|
|||||||
mkdir mingw-w64-v%{version}
|
mkdir mingw-w64-v%{version}
|
||||||
cd mingw-w64-v%{version}
|
cd mingw-w64-v%{version}
|
||||||
unzip %{S:0}
|
unzip %{S:0}
|
||||||
%autosetup -p1 -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev}
|
%setup -q -D -T -n mingw-w64-v%{version}/mingw-w64-mingw-w64-%{snapshot_rev}
|
||||||
%else
|
%else
|
||||||
%autosetup -p1 -n mingw-w64-v%{version}
|
%setup -q -n mingw-w64-v%{version}
|
||||||
%endif
|
%endif
|
||||||
|
%patch0 -p2 -b .s390
|
||||||
|
%patch1 -p1 -b .widl-includedir
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -71,18 +78,13 @@ pushd mingw-w64-tools
|
|||||||
%global _configure ../configure
|
%global _configure ../configure
|
||||||
mkdir win32
|
mkdir win32
|
||||||
pushd win32
|
pushd win32
|
||||||
%configure --target=%{mingw32_target} --program-prefix=%{mingw32_target}- --with-widl-includedir=%{mingw32_includedir}
|
%configure --target=%{mingw32_target} --program-prefix=%{mingw32_target}-
|
||||||
%make_build
|
make %{?_smp_mflags}
|
||||||
popd
|
popd
|
||||||
mkdir win64
|
mkdir win64
|
||||||
pushd win64
|
pushd win64
|
||||||
%configure --target=%{mingw64_target} --program-prefix=%{mingw64_target}- --with-widl-includedir=%{mingw64_includedir}
|
%configure --target=%{mingw64_target} --program-prefix=%{mingw64_target}-
|
||||||
%make_build
|
make %{?_smp_mflags}
|
||||||
popd
|
|
||||||
mkdir ucrt64
|
|
||||||
pushd ucrt64
|
|
||||||
%configure --target=%{ucrt64_target} --program-prefix=%{ucrt64_target}- --with-widl-includedir=%{ucrt64_includedir}
|
|
||||||
%make_build
|
|
||||||
popd
|
popd
|
||||||
popd
|
popd
|
||||||
popd
|
popd
|
||||||
@ -90,11 +92,10 @@ popd
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
pushd mingw-w64-tools
|
pushd mingw-w64-tools
|
||||||
%make_install -C gendef
|
make -C gendef DESTDIR=$RPM_BUILD_ROOT install
|
||||||
%make_install -C genidl
|
make -C genidl DESTDIR=$RPM_BUILD_ROOT install
|
||||||
%make_install -C widl/win32
|
make -C widl/win32 DESTDIR=$RPM_BUILD_ROOT install
|
||||||
%make_install -C widl/win64
|
make -C widl/win64 DESTDIR=$RPM_BUILD_ROOT install
|
||||||
%make_install -C widl/ucrt64
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
@ -104,85 +105,12 @@ popd
|
|||||||
%{_bindir}/genidl
|
%{_bindir}/genidl
|
||||||
%{_bindir}/%{mingw32_target}-widl
|
%{_bindir}/%{mingw32_target}-widl
|
||||||
%{_bindir}/%{mingw64_target}-widl
|
%{_bindir}/%{mingw64_target}-widl
|
||||||
%{_bindir}/%{ucrt64_target}-widl
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.1-3
|
* Tue Aug 14 2018 Victor Toso <victortoso@redhat.com> - 5.0.2-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
- ExclusiveArch: i686, x86_64
|
||||||
|
- Related: rhbz#1615874
|
||||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.1-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Aug 17 2023 Sandro Mani <manisandro@gmail.com> - 11.0.1-1
|
|
||||||
- Update to 11.0.1
|
|
||||||
|
|
||||||
* Mon Aug 7 2023 Konstantin Kostiuk <kkostiuk@redhat.com> - 11.0.0-2
|
|
||||||
- Update license to SPDX format
|
|
||||||
- Resolves: RHEL-1045
|
|
||||||
|
|
||||||
* Sun Apr 30 2023 Sandro Mani <manisandro@gmail.com> - 11.0.0-1
|
|
||||||
- Update to 11.0.0
|
|
||||||
|
|
||||||
* Sun Feb 05 2023 Nianqing Yao <imbearchild@outlook.com> - 10.0.0-4
|
|
||||||
- Fix build on riscv64.
|
|
||||||
|
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* 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.
|
|
||||||
|
|
||||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* 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
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 15 2021 Sandro Mani <manisandro@gmail.com> - 8.0.0-1
|
|
||||||
- Update to 8.0.0
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jun 20 2020 Sandro Mani <manisandro@gmail.com> - 7.0.0-1
|
|
||||||
- Update to 7.0.0
|
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue May 07 2019 Sandro Mani <manisandro@gmail.com> - 6.0.0-1
|
|
||||||
- Update to 6.0.0
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 09 2018 Kalev Lember <klember@redhat.com> - 5.0.4-1
|
|
||||||
- Update to 5.0.4
|
|
||||||
|
|
||||||
* Thu Jun 14 2018 Sandro Mani <manisandro@gmail.com> - 5.0.3-1
|
|
||||||
- Update to 5.0.3
|
|
||||||
|
|
||||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-4
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
Loading…
Reference in New Issue
Block a user