aboutsummaryrefslogtreecommitdiffstats
path: root/meta-boot2qt-distro
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2023-06-06 04:18:22 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2023-06-15 05:19:11 +0000
commited1e897bac205179e55555ecb78b77e527a6e500 (patch)
tree101181db811a6d62042bfb4f95f82ea145fcf16e /meta-boot2qt-distro
parent0d382ddff7d47ff59edb8904eaae9aa58fc82fc1 (diff)
gcc: update patch
Update patch to apply to GCC 13.1.1. Change-Id: I0e8f47a31d5d85a760d26e0ab6f3c3e7e6444a86 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Diffstat (limited to 'meta-boot2qt-distro')
-rw-r--r--meta-boot2qt-distro/recipes-devtools/gcc/gcc/0001-mingw-use-UCRT-instead-msvcrt.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-boot2qt-distro/recipes-devtools/gcc/gcc/0001-mingw-use-UCRT-instead-msvcrt.patch b/meta-boot2qt-distro/recipes-devtools/gcc/gcc/0001-mingw-use-UCRT-instead-msvcrt.patch
index 40d60730..697719d1 100644
--- a/meta-boot2qt-distro/recipes-devtools/gcc/gcc/0001-mingw-use-UCRT-instead-msvcrt.patch
+++ b/meta-boot2qt-distro/recipes-devtools/gcc/gcc/0001-mingw-use-UCRT-instead-msvcrt.patch
@@ -1,4 +1,4 @@
-From 0f74aff547da30db47f67f28e6c2d19f2eab89b3 Mon Sep 17 00:00:00 2001
+From 0f3faaaaccf3ed7d8a98dc63254d69241d96735f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 16 Aug 2022 13:21:28 +0000
Subject: [PATCH] mingw: use UCRT instead msvcrt
@@ -8,15 +8,15 @@ Subject: [PATCH] mingw: use UCRT instead msvcrt
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h
-index d3ca0cd0279..f5ab7490970 100644
+index 6a55baaa458..348e97c8c74 100644
--- a/gcc/config/i386/mingw32.h
+++ b/gcc/config/i386/mingw32.h
-@@ -185,7 +185,7 @@ along with GCC; see the file COPYING3. If not see
+@@ -184,7 +184,7 @@ along with GCC; see the file COPYING3. If not see
#define REAL_LIBGCC_SPEC \
"%{mthreads:-lmingwthrd} -lmingw32 \
" SHARED_LIBGCC_SPEC " \
-- -lmoldname -lmingwex -lmsvcrt -lkernel32"
-+ -lmoldname -lmingwex -lucrt -lkernel32"
+- -lmoldname -lmingwex -lmsvcrt -lkernel32 " MCFGTHREAD_SPEC
++ -lmoldname -lmingwex -lucrt -lkernel32 " MCFGTHREAD_SPEC
#undef STARTFILE_SPEC
#define STARTFILE_SPEC "%{shared|mdll:dllcrt2%O%s} \