aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchell Horne <mhorne@FreeBSD.org>2023-01-28 18:19:26 +0000
committerMitchell Horne <mhorne@FreeBSD.org>2023-01-31 18:32:40 +0000
commit537c166b767879398338370701fa60f67acec112 (patch)
treee5ec241dd149854cc5c3ce450aeabf5d8902a6ac
parent7738bb89a3cc70dc83ed4e80ee5160c18a7721f3 (diff)
downloadsrc-537c166b767879398338370701fa60f67acec112.tar.gz
src-537c166b767879398338370701fa60f67acec112.zip
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
-rw-r--r--contrib/elftoolchain/common/elfdefinitions.h12
-rw-r--r--contrib/elftoolchain/libelftc/elftc_reloc_type_str.c12
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: