From nobody Fri Nov 12 17:50:27 2021 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 239331838809; Fri, 12 Nov 2021 17:50:28 +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 4HrR2C6rNBz4cFd; Fri, 12 Nov 2021 17:50:27 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BFA1723BAF; Fri, 12 Nov 2021 17:50:27 +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 1ACHoR51043790; Fri, 12 Nov 2021 17:50:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ACHoR8P043789; Fri, 12 Nov 2021 17:50:27 GMT (envelope-from git) Date: Fri, 12 Nov 2021 17:50:27 GMT Message-Id: <202111121750.1ACHoR8P043789@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: 7199fa9647da - 2021Q4 - devel/llvm1[123]: Fix VIA PadLock xstore 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 7199fa9647da955f378022eb37ec6a6568b80577 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=7199fa9647da955f378022eb37ec6a6568b80577 commit 7199fa9647da955f378022eb37ec6a6568b80577 Author: Brooks Davis AuthorDate: 2021-11-12 17:31:00 +0000 Commit: Brooks Davis CommitDate: 2021-11-12 17:31:00 +0000 devel/llvm1[123]: Fix VIA PadLock xstore Pull in the code gen portion of upstream LLVM's 2d8c18fbbdd1. MFH: 2021Q4 Sponsored by: DARPA (cherry picked from commit 0cb1a5fe81b339b760e1d671269285e63d82c689) --- devel/llvm11/Makefile | 2 +- devel/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td | 11 +++++++++++ devel/llvm12/Makefile | 2 +- .../llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td | 11 +++++++++++ devel/llvm13/Makefile | 2 +- .../llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td | 11 +++++++++++ 6 files changed, 36 insertions(+), 3 deletions(-) diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index 5169370c65af..22fcb59ae045 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 11.0.1 -PORTREVISION= 2 +PORTREVISION= 3 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/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td b/devel/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td new file mode 100644 index 000000000000..383e72a07cfc --- /dev/null +++ b/devel/llvm11/files/patch-lib_Target_X86_X86InstrSystem.td @@ -0,0 +1,11 @@ +--- lib/Target/X86/X86InstrSystem.td.orig ++++ lib/Target/X86/X86InstrSystem.td +@@ -573,7 +573,7 @@ + //===----------------------------------------------------------------------===// + // VIA PadLock crypto instructions + let Defs = [RAX, RDI], Uses = [RDX, RDI], SchedRW = [WriteSystem] in +- def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB, REP; ++ def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB; + + def : InstAlias<"xstorerng", (XSTORE)>; + diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index 3a8cc22c1b28..f15b786f8a0a 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 12.0.1 -PORTREVISION= 5 +PORTREVISION= 6 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/llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td b/devel/llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td new file mode 100644 index 000000000000..c855644e7719 --- /dev/null +++ b/devel/llvm12/files/patch-llvm_lib_Target_X86_X86InstrSystem.td @@ -0,0 +1,11 @@ +--- llvm/lib/Target/X86/X86InstrSystem.td.orig ++++ llvm/lib/Target/X86/X86InstrSystem.td +@@ -585,7 +585,7 @@ + //===----------------------------------------------------------------------===// + // VIA PadLock crypto instructions + let Defs = [RAX, RDI], Uses = [RDX, RDI], SchedRW = [WriteSystem] in +- def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB, REP; ++ def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB; + + def : InstAlias<"xstorerng", (XSTORE)>; + diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile index da322d06b25b..7de7bc6d4ecd 100644 --- a/devel/llvm13/Makefile +++ b/devel/llvm13/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 13.0.0 -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/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td b/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td new file mode 100644 index 000000000000..c855644e7719 --- /dev/null +++ b/devel/llvm13/files/patch-llvm_lib_Target_X86_X86InstrSystem.td @@ -0,0 +1,11 @@ +--- llvm/lib/Target/X86/X86InstrSystem.td.orig ++++ llvm/lib/Target/X86/X86InstrSystem.td +@@ -585,7 +585,7 @@ + //===----------------------------------------------------------------------===// + // VIA PadLock crypto instructions + let Defs = [RAX, RDI], Uses = [RDX, RDI], SchedRW = [WriteSystem] in +- def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB, REP; ++ def XSTORE : I<0xa7, MRM_C0, (outs), (ins), "xstore", []>, TB; + + def : InstAlias<"xstorerng", (XSTORE)>; +