diff --git a/mingw-w64-flang/0003-flang-Inherit-target-specific-code-for-BIND-C-types.patch b/mingw-w64-flang/0003-flang-Inherit-target-specific-code-for-BIND-C-types.patch deleted file mode 100644 index 190bee9ed8..0000000000 --- a/mingw-w64-flang/0003-flang-Inherit-target-specific-code-for-BIND-C-types.patch +++ /dev/null @@ -1,50 +0,0 @@ -From afd990ed84c308d5d4d06f461d6bf80b670ddf16 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Markus=20M=C3=BCtzel?= -Date: Mon, 3 Mar 2025 10:32:22 +0100 -Subject: [PATCH] [flang] Inherit target specific code for BIND(C) types on - Windows (#114035) - -Inherit target specific code for Windows i386 and x86_64 from the classes that -define that code for the respective processors on non-Windows operating -systems. -Only overload parts that differ. - -That allows re-using the existing implementation for BIND(C) types on -non-Windows x86_64 also for Windows x86_64 targets. ---- - lib/Optimizer/CodeGen/Target.cpp | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/lib/Optimizer/CodeGen/Target.cpp b/lib/Optimizer/CodeGen/Target.cpp -index 2a1eb0bc33f5..b03c1dd492ab 100644 ---- a/lib/Optimizer/CodeGen/Target.cpp -+++ b/lib/Optimizer/CodeGen/Target.cpp -@@ -199,10 +199,8 @@ struct TargetI386 : public GenericTarget { - //===----------------------------------------------------------------------===// - - namespace { --struct TargetI386Win : public GenericTarget { -- using GenericTarget::GenericTarget; -- -- static constexpr int defaultWidth = 32; -+struct TargetI386Win : public TargetI386 { -+ using TargetI386::TargetI386; - - CodeGenSpecifics::Marshalling - complexArgumentType(mlir::Location loc, mlir::Type eleTy) const override { -@@ -718,10 +716,8 @@ struct TargetX86_64 : public GenericTarget { - //===----------------------------------------------------------------------===// - - namespace { --struct TargetX86_64Win : public GenericTarget { -- using GenericTarget::GenericTarget; -- -- static constexpr int defaultWidth = 64; -+struct TargetX86_64Win : public TargetX86_64 { -+ using TargetX86_64::TargetX86_64; - - CodeGenSpecifics::Marshalling - complexArgumentType(mlir::Location loc, mlir::Type eleTy) const override { --- -2.47.1.windows.2 - diff --git a/mingw-w64-flang/PKGBUILD b/mingw-w64-flang/PKGBUILD index 7a5c51519b..d7b47b4f75 100644 --- a/mingw-w64-flang/PKGBUILD +++ b/mingw-w64-flang/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") _pkgver=20.1.0 pkgver=${_pkgver/-/} -pkgrel=1 +pkgrel=2 pkgdesc="Fortran frontend for LLVM (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') @@ -39,7 +39,6 @@ source=("${_url}/${_pkgfn}.tar.xz"{,.sig} "${_url}/cmake-${_pkgver}.src.tar.xz"{,.sig} "0001-fold-double-bessel-functions-on-windows.patch" "0002-cmake-22162.patch" - "0003-flang-Inherit-target-specific-code-for-BIND-C-types.patch" "0004-do-not-define-pid_t-on-mingw.patch" "0005-Fix-c_long_double-value-on-mingw-aarch64.patch" "0007-add-municode-flag-on-mingw.patch" @@ -50,7 +49,6 @@ sha256sums=('08b1e0665bed7d91741e3eea06b9802c78e73a7dc581efb8b4b2f12e16d658e1' 'SKIP' 'ae666c454909f6695bcd69f067b9c5abf8a6e82ce2930955b8598ab3b58a5204' '77fb0612217b6af7a122f586a9d0d334cd48bb201509bf72e8f8e6244616e895' - 'bb7336e461a09d4af29cde2fd32081c8fcca7f93e9f9b6779eb074b3780fd002' '90bec8f2a9a8d62b57959722f3b15a54dfdaf24e0a5ea884bf6b1288d0853be8' 'a1811227e2a26c2786b0c8577528580e679111f6c0889afea57d08333e2d5e4f' '45f8da68b2cb48c85db7099e174e7eebeabe90207a23ff19c7fe1e7f1f8541d8' @@ -75,7 +73,6 @@ prepare() { apply_patch_with_msg \ "0001-fold-double-bessel-functions-on-windows.patch" \ "0002-cmake-22162.patch" \ - "0003-flang-Inherit-target-specific-code-for-BIND-C-types.patch" \ "0004-do-not-define-pid_t-on-mingw.patch" \ "0005-Fix-c_long_double-value-on-mingw-aarch64.patch" \ "0007-add-municode-flag-on-mingw.patch" \