From nobody Fri Jun 23 20:57:20 2023 X-Original-To: dev-commits-ports-main@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 4QnqLS6jrlz4gKw8; Fri, 23 Jun 2023 20:57:20 +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 4QnqLS6H7sz43cB; Fri, 23 Jun 2023 20:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687553840; 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=0h/GR1VRHwdJ+ZMRrij03BShjtAJ1JIUWSShnjRdvYs=; b=rP1wjgbef2wArH5FKVbIBAQyn541EimAjSFh7Ji1W49B1N7tc5pfWByWk8Hl6tjiBfkRcC YR+LroY1YE9Be/LpQCxFVZX7vXjZDzvZ1ygYxx4PVF2t2ZjF2J7c4nurSr3ff0aKFIP6Xz IxUPD4FreVUXxORTRP+ctHXDEztghcSWEsku0XfoHP2Vz2MKpfPQas1iEXd0hVESYlmpK0 vTAzWaPSvSLONrBKK7B2ywJLiTD2i5lOvhiMq07Ahj5/YIHBBQ0Vt7O+GdnyfKM65D4Mp3 1uAQn9HxyO5wouBNsBBVPLNNRCF7U3j1sj4Qzgbd8sOZnt6L9xvYs/R6tI4wfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687553840; 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=0h/GR1VRHwdJ+ZMRrij03BShjtAJ1JIUWSShnjRdvYs=; b=MwHaVlHPGTS5B97SayoF6imEAv+i1ZLCQFPoTjR9Ij29xFVElp5qB1vqxq7XmRWleyOdeP bV3X6Deh2FfoenOD2+kJdafkFrWrQ6dlxCU6AdTicoCBZm1td7ByvcnCRlUP7wBC85XsNe gofGYCnZ36uuHJ49aLagFqgepJcDnhARc4rx01uihNrhwX8FXjcc8Oo6vO3WDfYaHrOdmk iXFzLa8tF/Oxc2bZYE7bjawLNmW3/TzOa26l/jKAGZMjcFWYSuOfg/uN6PhiY6ixg/DUlK s9Z4z9AUov5eY9siUch4nnUq18w3OJRXBo/MWp0180C0qP758+OHrRiRG//xxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687553840; a=rsa-sha256; cv=none; b=yUku2Be+usORUVe4zpXA1SFoJhbxo2XHdRFo9A0uRgnIDJiLe0jPXr2y8qjGAN+ygnUsve lA2IvGtzvSatQ5e5Ry3p8aE4Tt62phLc0cvS4GjsgFfcRkzK6c2rvdIgx3bQDLifV+Y9s6 oe9/64+o42eGtUqx26wIvM0fIIjulQlD8y+x4T9k9GLaXukWMLZ+Hu8kb7aGsIMwJUEZ35 CylWPq/Qe119FxH795qukeeJvHQ+0aUNhTjRstwymK4TfaaL9ctjOQtOeCKl/32vMI9gHY YCwsbcM502JENh43Qtihjo5Yy73Ftz68ZjjNTJOS9/f/BuYpmdmP8w3VvGfYVQ== 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 4QnqLS5LG6zK1q; Fri, 23 Jun 2023 20:57:20 +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 35NKvK0F013392; Fri, 23 Jun 2023 20:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NKvKhc013391; Fri, 23 Jun 2023 20:57:20 GMT (envelope-from git) Date: Fri, 23 Jun 2023 20:57:20 GMT Message-Id: <202306232057.35NKvKhc013391@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: 4b887326f2a1 - main - devel/llvm16: backport fix for generate arm_neon.h List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 4b887326f2a149bbcf9adb2ab4365aeea4116cbc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b887326f2a149bbcf9adb2ab4365aeea4116cbc commit 4b887326f2a149bbcf9adb2ab4365aeea4116cbc Author: Brooks Davis AuthorDate: 2023-06-23 20:54:07 +0000 Commit: Brooks Davis CommitDate: 2023-06-23 20:57:03 +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. --- 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 6fe1894268ad..d58a2732df08 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";