From nobody Wed Dec 22 10:06:02 2021 X-Original-To: dev-commits-src-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 BF2AB1905FAF; Wed, 22 Dec 2021 10:06:10 +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 4JJpqv4NQ7z4YX5; Wed, 22 Dec 2021 10:06:03 +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 A37271B266; Wed, 22 Dec 2021 10:06:02 +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 1BMA62CV092156; Wed, 22 Dec 2021 10:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BMA62SL092155; Wed, 22 Dec 2021 10:06:02 GMT (envelope-from git) Date: Wed, 22 Dec 2021 10:06:02 GMT Message-Id: <202112221006.1BMA62SL092155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a0108291bcc0 - stable/12 - Merge commit 95e18b2d9d5f from llvm git (by Kang Zhang): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a0108291bcc067384d5f70749ba6869e3390cda3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640167565; 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=TVwwEFWtNUFI77WmDEL0Yyd6hy5VvmZmSAKw8mAeVFo=; b=u719nrILtKPOReg7PF1Wynft6L/X8WjjrAg1njEh6UnUrU5NYYKqChc8l0eMjQlA1Jt2bl Mip0YMssJVZMS2PTqjRJfL1HS+UUfenEYlpOBkURXLg/+xyzoskrYlslExOP5aavmKIAfY I72R2im0B4hv1OIzdNxeQMRwRpPaZ+KOcQUAsGc3uoMqyDpHch5t/CFP4IQs6j4k/9LC/r cMW4TqjRk3BdJII/IDELW5KFAHlpzhS+trfkDYOCr3/eXsHUerbnBXncCljoxvllguVrsy VqgKtooWacDrblQ6f4Rzua9zXmossyQLW+cNWoqeDAwkVreJneZAT9dXoIQJ+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640167565; a=rsa-sha256; cv=none; b=tb+sAPaHh4JzApMj0+wmbQ6ySOIF2Cydq+KaCs1GYb+ZIlCn3cDvu6hp7AuJwCawdS+464 fPyMtyjNVGABZO2QvmsbhP62wWksCG6pO80VB4gmYG1EEhQWcG7ETxJ+adqRCYjg/znOHP HwrQwcPnHYfPj21rlvWix5dQeezk1004cI8U+xoIsjyj01FCbhz949xM3oLrdLDjXIczJ8 EykD29Xajm8otdirWX/HshiXgeFWxOTFDU5qVt/uBCEWFpX0J/Xw8UdJJi+kFhiWWXhs/y dHCye7A2J0REtNOMURElMWeRvdtCk4JwLp/xf/aWWJyqo0sGkLvWwpi/AG2CCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a0108291bcc067384d5f70749ba6869e3390cda3 commit a0108291bcc067384d5f70749ba6869e3390cda3 Author: Dimitry Andric AuthorDate: 2020-08-21 10:06:01 +0000 Commit: Dimitry Andric CommitDate: 2021-12-22 09:58:32 +0000 Merge commit 95e18b2d9d5f from llvm git (by Kang Zhang): [PowerPC] Fix a typo for InstAlias of mfsprg D77531 has a type for mfsprg, it should be mtsprg. This patch is to fix this typo. This should fix booting powerpc64 kernels, after LLVM 11 was imported. PR: 248763 (cherry picked from commit 2a99bea5784f4b347a70967fe4b8faf1c7280f79) --- contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstr64Bit.td | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstr64Bit.td b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstr64Bit.td index 6956c40a70be..de42d354a048 100644 --- a/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstr64Bit.td +++ b/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCInstr64Bit.td @@ -1026,8 +1026,8 @@ def : InstAlias<"mfamr $Rx", (MFSPR8 g8rc:$Rx, 29)>; foreach SPRG = 0-3 in { def : InstAlias<"mfsprg $RT, "#SPRG, (MFSPR8 g8rc:$RT, !add(SPRG, 272))>; def : InstAlias<"mfsprg"#SPRG#" $RT", (MFSPR8 g8rc:$RT, !add(SPRG, 272))>; - def : InstAlias<"mfsprg "#SPRG#", $RT", (MTSPR8 !add(SPRG, 272), g8rc:$RT)>; - def : InstAlias<"mfsprg"#SPRG#" $RT", (MTSPR8 !add(SPRG, 272), g8rc:$RT)>; + def : InstAlias<"mtsprg "#SPRG#", $RT", (MTSPR8 !add(SPRG, 272), g8rc:$RT)>; + def : InstAlias<"mtsprg"#SPRG#" $RT", (MTSPR8 !add(SPRG, 272), g8rc:$RT)>; } def : InstAlias<"mfasr $RT", (MFSPR8 g8rc:$RT, 280)>;