Skip to content

Commit 4c376e8

Browse files
committed
msys2-runtime: update to 4b3a2e08f545432b62461313082193d6df09b6b8
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 096891d commit 4c376e8

File tree

3 files changed

+44
-7
lines changed

3 files changed

+44
-7
lines changed
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 4b3a2e08f545432b62461313082193d6df09b6b8 Mon Sep 17 00:00:00 2001
2+
From: Johannes Schindelin <[email protected]>
3+
Date: Mon, 8 Jul 2024 14:22:48 +0200
4+
Subject: [PATCH 67/N] Cygwin: suppress a warning generated with w32api >=
5+
12.0.0
6+
7+
w32api 12.0.0 adds the returns_twice attribute to RtlCaptureContext().
8+
There's some data-flow interaction with using it inside a while loop
9+
which causes a maybe-uninitialized warning.
10+
11+
../../../../winsup/cygwin/exceptions.cc: In member function 'int _cygtls::call_signal_handler()':
12+
../../../../winsup/cygwin/exceptions.cc:1720:33: error: '<anonymous>' may be used uninitialized in this function [-Werror=maybe-uninitialized]
13+
14+
Backported-from: 7e3c833592 (Cygwin: suppress a warning generated with w32api >= 12.0.0, 2024-06-07)
15+
Signed-off-by: Johannes Schindelin <[email protected]>
16+
---
17+
winsup/cygwin/exceptions.cc | 3 +++
18+
1 file changed, 3 insertions(+)
19+
20+
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
21+
index b843063..1faeda2 100644
22+
--- a/winsup/cygwin/exceptions.cc
23+
+++ b/winsup/cygwin/exceptions.cc
24+
@@ -1646,7 +1646,10 @@ _cygtls::call_signal_handler ()
25+
context, unwind to the caller and in case we're called
26+
from sigdelayed, fix the instruction pointer accordingly. */
27+
context.uc_mcontext.ctxflags = CONTEXT_FULL;
28+
+#pragma GCC diagnostic push
29+
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
30+
RtlCaptureContext ((PCONTEXT) &context.uc_mcontext);
31+
+#pragma GCC diagnostic pop
32+
__unwind_single_frame ((PCONTEXT) &context.uc_mcontext);
33+
if (stackptr > stack)
34+
{

msys2-runtime/PKGBUILD

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
pkgbase=msys2-runtime
55
pkgname=('msys2-runtime' 'msys2-runtime-devel')
66
pkgver=3.4.10
7-
pkgrel=2
7+
pkgrel=3
88
pkgdesc="Cygwin POSIX emulation engine"
99
arch=('x86_64')
1010
url="https://www.cygwin.com/"
@@ -92,9 +92,10 @@ source=('msys2-runtime'::git+https://github.com/cygwin/cygwin#tag=cygwin-${pkgve
9292
0063-Cygwin-console-Avoid-slipping-past-disable_master_th.patch
9393
0064-Cygwin-pty-Fix-handle-leak-in-master-process.patch
9494
0065-Cygwin-pty-Fix-potential-handle-leak-regarding-CallN.patch
95-
0066-Cygwin-console-Make-VMIN-and-VTIME-work.patch)
96-
sha256sums=('SKIP'
97-
'a27c84e3755895bc81bb5bc5f6f3d9ac67de80f42a551480fc539b0a9670dd89'
95+
0066-Cygwin-console-Make-VMIN-and-VTIME-work.patch
96+
0067-Cygwin-suppress-a-warning-generated-with-w32api-12.0.patch)
97+
sha256sums=('4fb94e9f3bab9666dcab50c8940de6e8801d0aae900f0b5a6f79406479e757f1'
98+
'06e14933861636ce850cf4cfb1a28abca7393e3efd6271981265a643e00b5d28'
9899
'351bb1efdbdafe80c981e92d6b425c6ab71c85ce4e990db184e2118158eb2ab6'
99100
'd3d3a01feeae9f7d5e6cb32f4662df74fc9476ff11a1aac3dad2df3e43fd88e4'
100101
'2e50ecd65f2fd413baaf39e5058a6b252245abc7d34f4ebf17dd4f7ffed60ced'
@@ -160,7 +161,8 @@ sha256sums=('SKIP'
160161
'd309a8ea69a0b1b173d56e5bb5a0003613a937d48c6d7736a5ed358ac25c1ef4'
161162
'f661eb5b8ea9270888ad8bb129b307af5408fbf02a046bed91692666b54fc610'
162163
'8177e7300bcd0a2d96de2d29faf0b21a7fec74c77ac0ac66bbb8244e37efb541'
163-
'22a99a0f9f1b90ab6d7fb1cee76c76f7c82d2185a5d0acf7bd60553f54fc9e80')
164+
'22a99a0f9f1b90ab6d7fb1cee76c76f7c82d2185a5d0acf7bd60553f54fc9e80'
165+
'11c89890557f23dfaf754bc11381d8fd82e3db0755d56df6b6e30e018d2c3ef3')
164166

165167
# Helper macros to help make tasks easier #
166168
apply_patch_with_msg() {
@@ -280,7 +282,8 @@ prepare() {
280282
0063-Cygwin-console-Avoid-slipping-past-disable_master_th.patch \
281283
0064-Cygwin-pty-Fix-handle-leak-in-master-process.patch \
282284
0065-Cygwin-pty-Fix-potential-handle-leak-regarding-CallN.patch \
283-
0066-Cygwin-console-Make-VMIN-and-VTIME-work.patch
285+
0066-Cygwin-console-Make-VMIN-and-VTIME-work.patch \
286+
0067-Cygwin-suppress-a-warning-generated-with-w32api-12.0.patch
284287
}
285288

286289
build() {

msys2-runtime/msys2-runtime.commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
87d5722901e1172a57aa4d4e3db84fbafe70d19b
1+
4b3a2e08f545432b62461313082193d6df09b6b8

0 commit comments

Comments
 (0)