From nobody Fri Jan 10 00:42:47 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YTjYM6z1Kz5kNTY; Fri, 10 Jan 2025 00:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YTjYM63cYz4FQ9; Fri, 10 Jan 2025 00:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736469767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qyCrTGKzaM9HaFAXN/TFzffT+AmwpWTkvmB0FnWcjU=; b=lXlMotzcWP8qGWP36gDOjJHXIiIfTzOFSdC7Je72AY2d9weuTfJ1NIlPzey/OPTm28DF8x xVMvuKTihlvTN/Fk0ng3FNf2MgFsJFXLG6hDYDG62+R1uVohm1frNzynwE27rPlBFFz6FN N9zYZsEPqW+Ek++TvNnFs0LmGbVOX64r//ZSZbmcEIDX76mckz8luVBL0h9ZAa2wpmkybr KCDWt4IkX+Tn7t8VGSeFYSZkIV1qBl0QonmDICuPrdBR2fogNZB1bSUskie83E5wN4ccOy G/4eOPNgJRWr/ptq2N0Q1FWEFmG+2BSvx9OtJTjNBYPZzzD6RLhVM6h0tYq9aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736469767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1qyCrTGKzaM9HaFAXN/TFzffT+AmwpWTkvmB0FnWcjU=; b=DB42yU6DpbtW07ZbnRvsts/vICSKl0H19vMTjlIlAd82WTzrMSbiraZ2BPBrKiW5kvPtIg izbnVTM33Z/8KVNDM3G2hihu6vzuipVP/Iai31SbYGkZUKaVQykYCjvqd77KOQtaOBvAYQ XlCrCuuUOLpPzmJ3G4eXajP2x3HyPe3S0GhRefRMu6Df2uBDpVQtV6DfLPXNc0ryfqb8k7 RAX8OLgd+HxYaZfro6xJSkd1PCJWsE4mu8HCNsZulcdQzx2hM4bmMrY9M8vRsxq7F/XIvI ozuU9VVlBPTfKYNQ7zw9r2k5VC0ci+0HPV5kZ4X6xtk9/ktw7KW0YhDZ/5jLag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736469767; a=rsa-sha256; cv=none; b=UYzmNSDQBoA8XUsvHuBzMXI+/FCxkRhjnFU3juZeiy2Aw6XjGTUaq/3ppoSEgMeQigiSfF HGYNUJagbER5ffBXeSelZi4Oh9VgMSRPDqJo8+s4d2CyGwJTLB0b1oE/E1lNxZzp3nxn/1 T3zxpXZJkjY3GHpcohQ9ZCw4iIpVXGF/pn7F9P3L2X4Hz5eFp0ZfkWAFHFL18krRv8Ww3e q97cUoSddyKUO707gyF1dMSaJVTmXlBtSwRYx/hzIH4GjCxJjdUclzki1hxAz8yuwjp7sF 56+ppxz2DDW+mm+U3FtfMAX1ngSVS0AMTbUNl0IFVm4G7UApx09scDpFlqKx7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YTjYM5L3NzqPN; Fri, 10 Jan 2025 00:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50A0gleO049699; Fri, 10 Jan 2025 00:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50A0glTR049696; Fri, 10 Jan 2025 00:42:47 GMT (envelope-from git) Date: Fri, 10 Jan 2025 00:42:47 GMT Message-Id: <202501100042.50A0glTR049696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 9592edb43243 - main - devel/llvm16: backport flang fixes for llvm19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9592edb43243a6a2bdef59c99a69e5a309df910f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=9592edb43243a6a2bdef59c99a69e5a309df910f commit 9592edb43243a6a2bdef59c99a69e5a309df910f Author: Brooks Davis AuthorDate: 2025-01-10 00:35:34 +0000 Commit: Brooks Davis CommitDate: 2025-01-10 00:42:12 +0000 devel/llvm16: backport flang fixes for llvm19 The FLANG option is off by default so this wasn't noted in the llvm19 import. Backport 7bc7672925f81 from upstream LLVM. The patches to fold-real.cpp and reduction-templates.h were hand applied. PR: 283966 Reported by: ohartmann@walstatt.org --- devel/llvm16/files/patch-backport-7bc7672925f81 | 75 +++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/devel/llvm16/files/patch-backport-7bc7672925f81 b/devel/llvm16/files/patch-backport-7bc7672925f81 new file mode 100644 index 000000000000..f3c8c2cfe769 --- /dev/null +++ b/devel/llvm16/files/patch-backport-7bc7672925f81 @@ -0,0 +1,75 @@ +commit 7bc7672925f8154be3b8220365d3f269ac43621c +Author: David Spickett +Date: Mon Jun 3 15:21:26 2024 +0100 + + [flang] Fix compilation errors due to new clang template requirements (#94204) + + Since https://github.com/llvm/llvm-project/pull/80801 clang requires a + template argument list after the use of the template keyword. + + https://lab.llvm.org/buildbot/#/builders/176/builds/10230 + + error: a template argument list is expected after a name prefixed by the + template keyword [-Wmissing-template-arg-list-after-template-kw] + + This fixes the instances found by the AArch64 Linux builds. + +diff --git flang/include/flang/Evaluate/integer.h flang/include/flang/Evaluate/integer.h +index 10a13115a39e..4c7d88328a71 100644 +--- flang/include/flang/Evaluate/integer.h ++++ flang/include/flang/Evaluate/integer.h +@@ -315,7 +315,7 @@ public: + } + result.overflow = false; + } else if constexpr (bits < FROM::bits) { +- auto back{FROM::template ConvertSigned(result.value)}; ++ auto back{FROM::template ConvertSigned(result.value)}; + result.overflow = back.value.CompareUnsigned(that) != Ordering::Equal; + } + return result; +diff --git flang/lib/Evaluate/fold-real.cpp flang/lib/Evaluate/fold-real.cpp +index 238ce34adfb7..f71addcc4094 100644 +--- flang/lib/Evaluate/fold-real.cpp ++++ flang/lib/Evaluate/fold-real.cpp + #ifndef _MSC_VER + template + #endif +- SCALE(y)}; ++ SCALE>(y)}; + if (result.flags.test(RealFlag::Overflow)) { + context.messages().Say( + "SCALE intrinsic folding overflow"_warn_en_US); +diff --git flang/runtime/reduction-templates.h flang/runtime/reduction-templates.h +index d102e5642547..a51404c96376 100644 +--- flang/runtime/reduction-templates.h ++++ flang/runtime/reduction-templates.h +@@ -85,9 +85,9 @@ + DoTotalReduction(x, dim, mask, accumulator, intrinsic, terminator); + CppType result; + #ifdef _MSC_VER // work around MSVC spurious error +- accumulator.GetResult(&result); ++ accumulator.GetResult(&result); + #else +- accumulator.template GetResult(&result); ++ accumulator.template GetResult(&result); + #endif + return result; + } +@@ -128,7 +128,7 @@ + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(result, zeroBasedDim); + #else +- accumulator.template GetResult(result, zeroBasedDim); ++ accumulator.template GetResult(result, zeroBasedDim); + #endif + } + +@@ -156,7 +156,7 @@ + #ifdef _MSC_VER // work around MSVC spurious error + accumulator.GetResult(result, zeroBasedDim); + #else +- accumulator.template GetResult(result, zeroBasedDim); ++ accumulator.template GetResult(result, zeroBasedDim); + #endif + } +