From nobody Mon Feb 6 19:37:00 2023 X-Original-To: dev-commits-src-all@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 4P9c3110vfz3n5g1; Mon, 6 Feb 2023 19:37:01 +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 4P9c310KLRz3pxF; Mon, 6 Feb 2023 19:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675712221; 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=blj1duDTzv+36rKV9DJhMoMKnuQTeCpgK/bmOH2oF1k=; b=W8GtR8yliHSqbcfjYCC/6QN9HZ/DRTip1T1anyddjS4ITMAULOgUTEEH5RNIlHAg5kdVKj UpQD4HXmqPcJsohYZ/lhWPcyE72oRbPE9kRr1VkKwKsxPGpXJEA5VLfhGSrbsjDv3Dk3nI K8B6HwKSUb/MpD3Dr2TddaximDG1Fj1lWYg3yTICNRzv8Kx9vqjALH7jBRp3+CmlO0MD0n Q8MkUoHfEMsP6fhgFdezcUY8ooC2ME3o1+BPW91TmcB21GHc9yC1XOq5QpY4cLE+82UcQC Y+mh2TmHMcvVvomOrt6AayepD24o8U6P1BHiltXw4Kb8TDsVS+t+GRR8L8LHXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675712221; 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=blj1duDTzv+36rKV9DJhMoMKnuQTeCpgK/bmOH2oF1k=; b=BUWuHSec2LRlDv7Db0I+ScPF+InA7+3r8OeE70aGGoCOYQP8Aazf+Z8pkuCo8n6ADX5gzr vUyTDfUco5wOZIQEckUshCbZTzrzg31bwxnjMknpLWY56AggRO/BvYfYSmVBywOrk2knHx kd2DumE511SnBjrI91I9ZnHppwmCYrtl4FSRcpbZngmFd1MImy/eM6CB5A8UPYvBBoYE7I RrSXnkrg4EryeqcDmj9nk/5aeNy8huszXKcC+ErbfljpgHKkJfMulxH+uEPO/Ptzal8Z2N fN6AS5D8E92Ik/zrWmfOM4GRgm1DSSbxDIMr7vWoX+xnfmNgS3+kYbS+y/dwGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675712221; a=rsa-sha256; cv=none; b=X32WCYwipiC+CN1Ca5X5AGIKGC0J+CLH5LizfFyIwhHD4YuITUQ40DIHmM3oOVE6R1pcKs AAs7n721q4jxa2hrOg+soZ+/mJdg/HscKEPkHCYp9mTzxmGe3ad0yeVy+COW7jNJ628265 1m5Z7Hgmcem8OjtHVoL9w/RaWwzeuccI4hnjr+ob/lO4X020oKgIWjef2Hz1qM0fXAgox2 Db61ee0DJGFe5pZiLeH4bSyTEp+mWT1z3OL+PinxqP8RKokRGAFRFfhUo5r9JYDEdZ3Wx1 ODDmCWZ8a0VuPPS8rV8LCntcApB+YrO/cq2GLEYqyl6o9kaBg7VMoJLZlMvBmw== 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 4P9c306WQXzmxl; Mon, 6 Feb 2023 19:37:00 +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 316Jb0lc020513; Mon, 6 Feb 2023 19:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316Jb0YK020512; Mon, 6 Feb 2023 19:37:00 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:37:00 GMT Message-Id: <202302061937.316Jb0YK020512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 6b9f6aeac69b - stable/13 - elftoolchain: update the list of riscv relocations List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b9f6aeac69b8bffc8db7a23e37fc1a4cdab43b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6b9f6aeac69b8bffc8db7a23e37fc1a4cdab43b8 commit 6b9f6aeac69b8bffc8db7a23e37fc1a4cdab43b8 Author: Mitchell Horne AuthorDate: 2023-01-28 18:19:26 +0000 Commit: Mitchell Horne CommitDate: 2023-02-06 19:34:37 +0000 elftoolchain: update the list of riscv relocations A few have been added, a couple removed. Reviewed by: jrtc27, imp, emaste MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38175 (cherry picked from commit 537c166b767879398338370701fa60f67acec112) --- contrib/elftoolchain/common/elfdefinitions.h | 12 ++++++++---- contrib/elftoolchain/libelftc/elftc_reloc_type_str.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/contrib/elftoolchain/common/elfdefinitions.h b/contrib/elftoolchain/common/elfdefinitions.h index 1b3a190ad055..0d230fffe3d3 100644 --- a/contrib/elftoolchain/common/elfdefinitions.h +++ b/contrib/elftoolchain/common/elfdefinitions.h @@ -2143,14 +2143,18 @@ _ELF_DEFINE_RELOC(R_RISCV_SUB8, 37) \ _ELF_DEFINE_RELOC(R_RISCV_SUB16, 38) \ _ELF_DEFINE_RELOC(R_RISCV_SUB32, 39) \ _ELF_DEFINE_RELOC(R_RISCV_SUB64, 40) \ -_ELF_DEFINE_RELOC(R_RISCV_GNU_VTINHERIT, 41) \ -_ELF_DEFINE_RELOC(R_RISCV_GNU_VTENTRY, 42) \ _ELF_DEFINE_RELOC(R_RISCV_ALIGN, 43) \ _ELF_DEFINE_RELOC(R_RISCV_RVC_BRANCH, 44) \ _ELF_DEFINE_RELOC(R_RISCV_RVC_JUMP, 45) \ _ELF_DEFINE_RELOC(R_RISCV_RVC_LUI, 46) \ -_ELF_DEFINE_RELOC(R_RISCV_GPREL_I, 47) \ -_ELF_DEFINE_RELOC(R_RISCV_GPREL_S, 48) +_ELF_DEFINE_RELOC(R_RISCV_RELAX, 51) \ +_ELF_DEFINE_RELOC(R_RISCV_SUB6, 52) \ +_ELF_DEFINE_RELOC(R_RISCV_SET6, 53) \ +_ELF_DEFINE_RELOC(R_RISCV_SET8, 54) \ +_ELF_DEFINE_RELOC(R_RISCV_SET16, 55) \ +_ELF_DEFINE_RELOC(R_RISCV_SET32, 56) \ +_ELF_DEFINE_RELOC(R_RISCV_32_PCREL, 57) \ +_ELF_DEFINE_RELOC(R_RISCV_IRELATIVE, 58) #define _ELF_DEFINE_SPARC_RELOCATIONS() \ _ELF_DEFINE_RELOC(R_SPARC_NONE, 0) \ diff --git a/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c b/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c index 4fa715ae0734..bc8ff6c0d2c6 100644 --- a/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c +++ b/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c @@ -656,14 +656,18 @@ elftc_reloc_type_str(unsigned int mach, unsigned int type) case 38: return "R_RISCV_SUB16"; case 39: return "R_RISCV_SUB32"; case 40: return "R_RISCV_SUB64"; - case 41: return "R_RISCV_GNU_VTINHERIT"; - case 42: return "R_RISCV_GNU_VTENTRY"; case 43: return "R_RISCV_ALIGN"; case 44: return "R_RISCV_RVC_BRANCH"; case 45: return "R_RISCV_RVC_JUMP"; case 46: return "R_RISCV_RVC_LUI"; - case 47: return "R_RISCV_GPREL_I"; - case 48: return "R_RISCV_GPREL_S"; + case 51: return "R_RISCV_RELAX"; + case 52: return "R_RISCV_SUB6"; + case 53: return "R_RISCV_SET6"; + case 54: return "R_RISCV_SET8"; + case 55: return "R_RISCV_SET16"; + case 56: return "R_RISCV_SET32"; + case 57: return "R_RISCV_32_PCREL"; + case 58: return "R_RISCV_IRELATIVE"; } break; case EM_S390: