From e25b532c19f27ff5fd6a42233edb2b460fa2ffa4 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Tue, 10 Jan 2023 21:41:27 +0530 Subject: [PATCH] angle: Fix mingw32 build with stdcall fixup --- mingw-w64-angleproject/001-add-mingw-toolchain.patch | 3 ++- mingw-w64-angleproject/PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mingw-w64-angleproject/001-add-mingw-toolchain.patch b/mingw-w64-angleproject/001-add-mingw-toolchain.patch index de2447980b..85307941c0 100644 --- a/mingw-w64-angleproject/001-add-mingw-toolchain.patch +++ b/mingw-w64-angleproject/001-add-mingw-toolchain.patch @@ -800,7 +800,7 @@ index a5075393b..bc8f4e2c6 100644 if (current_cpu == "x86") { asmflags = [ # When /safeseh is specified, the linker will only produce an image if it -@@ -214,6 +215,14 @@ config("compiler") { +@@ -214,6 +215,15 @@ config("compiler") { # the source file is a no-op. "/ignore:4221", ] @@ -808,6 +808,7 @@ index a5075393b..bc8f4e2c6 100644 + cflags = [ "-msse3" ] + if (current_cpu == "x86") { + ldflags = [ "-m32" ] ++ ldflags += [ "-Wl,--enable-stdcall-fixup" ] + } else if (current_cpu == "x64") { + ldflags = [ "-m64" ] + } diff --git a/mingw-w64-angleproject/PKGBUILD b/mingw-w64-angleproject/PKGBUILD index 000c2bcfa3..4bbd574daa 100644 --- a/mingw-w64-angleproject/PKGBUILD +++ b/mingw-w64-angleproject/PKGBUILD @@ -41,7 +41,7 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - '7c8e890af24101d88296b62bf47dbdc8d32b58190dedf9b89e5f10363b907a18' + '06dccfcdfe271177574572aa0601c61e1724f9b0ed939f399048323bf9e02be3' 'd73b808fe69914ee9d9934fad79389706af2c1ac280c1c0296d1046c482febad' '0bd71b129c4c067bd73116aa21c0fb59d7a930ded6ab8b28d59aeb538b44bfd4' 'bf878de3203a62e2a7f81bd4cd79237adc74804b4b692d9277da005ed56d4f2a'