From nobody Thu Mar 9 09:49:29 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 4PXPXp1B2zz3wSpl; Thu, 9 Mar 2023 09:49:30 +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 4PXPXp0b8Gz4Y0P; Thu, 9 Mar 2023 09:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355370; 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=mFC9BtYO/1eP+FPVGwUaDDv/jQc47PCoIesPLIvMY7k=; b=tiQdQtOrFIZucNbUC9GtepmpmPYQuXFphxy5NihY6sJsfgRugjeTAYXLVD2uStYdgw5cIZ vAoPImpmll7f45YmUC779gdzy9Vts/iPVXY65MhLmHXl+kKnKdWGe4elENBI4OipKjqGkb eKCNAnG5IgxnYzhrA9xR4mw+Rv++FuuDIPBsJ0dpVgF33cWuKGy4mjtZC/lp5h6TUC5OGF PYqnweFgKEq6M7SznyIcPKy2UHsjHKVsTZ2LsIkl9Qh0rrwQTUr5LtdGtYBP259wDSRw6M qoqCDTcPvyocqkPOVtWEP+pnIqo1lkFYYZuJIpUf3mzEET865MftSFO12r6Wiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355370; 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=mFC9BtYO/1eP+FPVGwUaDDv/jQc47PCoIesPLIvMY7k=; b=BB3waAJ+JbdeVgeqlRWSmwddUOahf4h8uNoDWvcXiHHCbZNPJfU/Bf1yT1vjVRgNTzfgqd C4lMLExRn/sp1R/W2HiDiZvSR1AbNxXzwgqX/ExFYWHVvZ01V+GoZSZzWRCT4AlogG6Vyr Mi5mbVDeub/Tw4mwi/hcXZaHq/FIrr0iGEMI4GBtGMNkIkY+H3MRPAp3wTKBLolcV/b5lW eb664dd+O7K7d+d08vWmEZ2gbXysyNORZKpEWb30ETraqodchIGmW3BCk/46q8OyhnzUm0 jWWltaExy/czTRk1sbtdN7r2ypHqoB6LIg0jJ6Iu/s1CK5pWLCLt3TPIZeGtww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678355370; a=rsa-sha256; cv=none; b=L9NtMXIJfePg1WdSQjFaFIi997FD0RtgKFRcTVGgLQvYUAhGSR8IGEciavcgaK0RVfx1a5 xxrIaN0+S/Xa1vcaqPIt4snUjGggIdXfjdxBteuMxFCMe6U3vk5BPcW7hFW6FJvXD7gHlQ evBDy0KmcVowY21KjvhwuMDLXji5A4BRJK5a2BcUkzF53lvqmdAJpEMEdgapiDvFjhw5l1 bC4p6euCQeO/N6uA6e/40dWlPbl6z694m0Ghebj2T7NXDMZ9+UrEmJVTr+4vzF2KFjVZdY bgxvcN3385pfn/OdmnOQCR4/CbJRIWP3IV+Vlp0aZ6Zi1pNNZYLzhTonGxR4iw== 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 4PXPXn6VQmz12dx; Thu, 9 Mar 2023 09:49:29 +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 3299nT4k056651; Thu, 9 Mar 2023 09:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3299nTMd056650; Thu, 9 Mar 2023 09:49:29 GMT (envelope-from git) Date: Thu, 9 Mar 2023 09:49:29 GMT Message-Id: <202303090949.3299nTMd056650@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 2f784ffe3b4c - main - devel/llvm16: fix patching on powerpc64 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f784ffe3b4c6f884d85d5ef2c9401f63213667c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f784ffe3b4c6f884d85d5ef2c9401f63213667c commit 2f784ffe3b4c6f884d85d5ef2c9401f63213667c Author: Piotr Kubaj AuthorDate: 2023-03-09 09:49:02 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-09 09:49:02 +0000 devel/llvm16: fix patching on powerpc64 Remove the upstreamed patch. --- devel/llvm16/Makefile | 4 ---- .../files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 70161bda7030..76af24c50068 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -226,10 +226,6 @@ MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP .include -.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 -EXTRA_PATCHES= ${FILESDIR}/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp -.endif - # keep in sync with /usr/src/lib/clang/clang.build.mk # ----------- start of sync block ------------------ # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. diff --git a/devel/llvm16/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp b/devel/llvm16/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp deleted file mode 100644 index 37304e59f444..000000000000 --- a/devel/llvm16/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- clang/lib/Driver/ToolChains/Clang.cpp.orig 2021-08-11 19:51:00.122735000 +0200 -+++ clang/lib/Driver/ToolChains/Clang.cpp 2021-08-11 19:51:24.346107000 +0200 -@@ -1921,8 +1921,7 @@ - if (T.isOSBinFormatELF()) { - switch (getToolChain().getArch()) { - case llvm::Triple::ppc64: { -- if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) || -- T.isOSOpenBSD() || T.isMusl()) -+ if (T.isOSFreeBSD() || T.isOSOpenBSD() || T.isMusl()) - ABIName = "elfv2"; - else - ABIName = "elfv1";