From 39aa206dc51d1d90e301a3b19a0b549b811f0cd2 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 15 Oct 2024 10:42:06 +0200
Subject: [PATCH] speedo: Enable additional runtime protections on Windows.

* build-aux/speedo.mk (speedo_w32_cflags): Remove -mms-bitfields
because it is for a long time the gcc default.  Enable control flow
protection.
--

Note that due to mingw static linking problems with libssp the stack
protector is not yet enabled.

(cherry picked from commit afe87ffc08e14317f4ef5bbe2940d07203a43808)
---
 build-aux/speedo.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index b887c506a..545a28f22 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -702,7 +702,7 @@ ifeq ($(TARGETOS),w32)
             --build-w64)
   speedo_host_build_option := --host=$(host) --build=$(build)
   speedo_host_build_option6 := --host=$(host6) --build=$(build)
-  speedo_w32_cflags := -mms-bitfields
+  speedo_w32_cflags := -fcf-protection=full
 else
   speedo_autogen_buildopt :=
   host :=