From nobody Fri Jun 23 23:38:06 2023 X-Original-To: dev-commits-ports-branches@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 4Qntvz2w6mz4gQqm; Fri, 23 Jun 2023 23:38:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qntvy6lfbz3pQb; Fri, 23 Jun 2023 23:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687563486; 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=k13WJLRGlRW2VAUFR28y/D+cXQo+Plpy1bOHah2jaao=; b=jFKARmJCvdIuuvm/Edm1VWMNRmJoJ/mXvi3G7mvTXopmV8WTThTceIlH2/tvwoynD6UwMO h9pC8tNB9r2rlbbZk0JN8lXPtoE3imJg60cZyhH1CBlK6Xkkrn0fe2CwZGzJbdAUQrct1Q olFSdnzGnbcpecgM6DZCk1eTlIQ74cm5A2vzwvWaLOTIdZ7PhjwoGg8QbNOqkN8j3wJwbQ Gc3AmmVnFQVxf6iJD9kUIjT6OsG5aNwJ99nTdyFS1aFjHiHMTlG9roGJpizbbcPAfgcW5n qFQ9/woxECLjaDWaipJDeq/bOzAaqZDiAQBV9/r7OQ0er88gCpkMSkVkOGewvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687563486; 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=k13WJLRGlRW2VAUFR28y/D+cXQo+Plpy1bOHah2jaao=; b=pIAaBlhWn/Mp+H+oLEugUusYb+WrCEcZzPWED9b3tN20xKxSNQIUFPu8ktBW02tybKljgg oHCg5M4VgVLBZZ48EpbLyREIF8Hd7LS25TpBPvc9GrVqVpgTLULBmLmTn5lfZOakz+Ld2C /orpho+wajM2z+fSj3/sG0bmJCUptC11ny51X0s2WRk6w++FmzUxjxNXiWpzlyGfwnZFMT s/4GwqfNVsempJfGkRljoK+rxIjL8AxX1J7nVYIE80MGGpCr9jupMs3ouMVPaFM0xtESCW tMQqbt2QMsbyfuxzhwNKaDJtplvHJ4Qers7QjJqO0fDMheBw2S4Yd/X5pdmxig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687563487; a=rsa-sha256; cv=none; b=SGt4kqxBFFEjLmCpgqGNCRcUHm/JwoqgJtvF0J+8czBoms7o8jDXutT2FcpM4yxSCKNfzW sInF41CTYrUMHLvEetYgwj8TzXgErhfCJoCVjXSivy4REpAAd6SWdz7ANwUaolELPkY/0S qbdFhYJGeJT5bR/wGtGDT41dW2jgzzuls1aBBLpRcZkWirCKruuB3BRf8pqI3YYR+UXlXu sURfHLwhnjBCNkyD+D64tSeR+rMkoqURzPoPGUMocbXf5vZrpvkYEh/FNvC+I9kd0m/9aN 2yVOhxZWT6Ac4oTp6lFai5lqPcmdCx0xQ0pflbeY7NELJC2VlLaL+JXywF0Vsw== 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 4Qntvy5gX8zNdp; Fri, 23 Jun 2023 23:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35NNc6qp076877; Fri, 23 Jun 2023 23:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NNc6OE076876; Fri, 23 Jun 2023 23:38:06 GMT (envelope-from git) Date: Fri, 23 Jun 2023 23:38:06 GMT Message-Id: <202306232338.35NNc6OE076876@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: 4ab820d58246 - 2023Q2 - devel/llvm16: backport fix for generate arm_neon.h List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 4ab820d58246c800467103fda108aa4f643f1211 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ab820d58246c800467103fda108aa4f643f1211 commit 4ab820d58246c800467103fda108aa4f643f1211 Author: Brooks Davis AuthorDate: 2023-06-23 20:54:07 +0000 Commit: Brooks Davis CommitDate: 2023-06-23 21:02:19 +0000 devel/llvm16: backport fix for generate arm_neon.h Backport db49231: [clang][BFloat] Avoid redefining bfloat16_t in arm_neon.h. This fixes builds of FreeBSD/aarch64. The change was merged to the llvm16 in src prior to commit. (cherry picked from commit 4b887326f2a149bbcf9adb2ab4365aeea4116cbc) --- devel/llvm16/Makefile | 2 +- devel/llvm16/files/patch-backport-llvm-db49231 | 50 ++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 025003aef3a9..03b7afe59371 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 16.0.6 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/ diff --git a/devel/llvm16/files/patch-backport-llvm-db49231 b/devel/llvm16/files/patch-backport-llvm-db49231 new file mode 100644 index 000000000000..04823b527c7a --- /dev/null +++ b/devel/llvm16/files/patch-backport-llvm-db49231 @@ -0,0 +1,50 @@ +commit db492316399a0edc26788265c7fce78c63a0f838 +Author: Dimitry Andric +Date: Wed May 3 17:53:59 2023 +0200 + + [clang][BFloat] Avoid redefining bfloat16_t in arm_neon.h + + As of https://reviews.llvm.org/D79708, clang-tblgen generates `arm_neon.h`, + `arm_sve.h` and `arm_bf16.h`, and all those generated files will contain a + typedef of `bfloat16_t`. However, `arm_neon.h` and `arm_sve.h` include + `arm_bf16.h` immediately before their own typedef: + + #include + typedef __bf16 bfloat16_t; + + With a recent version of clang (I used 16.0.1) this results in warnings: + + /usr/lib/clang/16/include/arm_neon.h:38:16: error: redefinition of typedef 'bfloat16_t' is a C11 feature [-Werror,-Wtypedef-redefinition] + + Since `arm_bf16.h` is very likely supposed to be the one true place where + `bfloat16_t` is defined, I propose to delete the duplicate typedefs from the + generated `arm_neon.h` and `arm_sve.h`. + + Reviewed By: sdesmalen, simonbutcher + + Differential Revision: https://reviews.llvm.org/D148822 + +diff --git clang/utils/TableGen/NeonEmitter.cpp clang/utils/TableGen/NeonEmitter.cpp +index 51bb774c6da9..6ef5790731a6 100644 +--- clang/utils/TableGen/NeonEmitter.cpp ++++ clang/utils/TableGen/NeonEmitter.cpp +@@ -2353,7 +2353,6 @@ void NeonEmitter::run(raw_ostream &OS) { + OS << "#include \n\n"; + + OS << "#include \n"; +- OS << "typedef __bf16 bfloat16_t;\n"; + + // Emit NEON-specific scalar typedefs. + OS << "typedef float float32_t;\n"; +diff --git clang/utils/TableGen/SveEmitter.cpp clang/utils/TableGen/SveEmitter.cpp +index bc50cbad4b54..d5d3f5fe558a 100644 +--- clang/utils/TableGen/SveEmitter.cpp ++++ clang/utils/TableGen/SveEmitter.cpp +@@ -1103,7 +1103,6 @@ void SVEEmitter::createHeader(raw_ostream &OS) { + OS << "typedef __SVBFloat16_t svbfloat16_t;\n"; + + OS << "#include \n"; +- OS << "typedef __bf16 bfloat16_t;\n"; + + OS << "typedef __SVFloat32_t svfloat32_t;\n"; + OS << "typedef __SVFloat64_t svfloat64_t;\n";