[PATCH 1/4] RISC-V: Add TLSDESC reloc definitions.
Tatsuyuki Ishi
ishitatsuyuki@gmail.com
Thu Aug 17 18:08:34 GMT 2023
---
bfd/bfd-in2.h | 4 +++
bfd/elfxx-riscv.c | 75 ++++++++++++++++++++++++++++++++++++++++++++-
bfd/libbfd.h | 4 +++
bfd/reloc.c | 8 +++++
include/elf/riscv.h | 5 +++
5 files changed, 95 insertions(+), 1 deletion(-)
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index e2deb107494..110207789c3 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5404,6 +5404,10 @@ number for the SBIC, SBIS, SBI and CBI instructions */
BFD_RELOC_RISCV_GOT_HI20,
BFD_RELOC_RISCV_TLS_GOT_HI20,
BFD_RELOC_RISCV_TLS_GD_HI20,
+ BFD_RELOC_RISCV_TLSDESC_HI20,
+ BFD_RELOC_RISCV_TLSDESC_LOAD_LO12,
+ BFD_RELOC_RISCV_TLSDESC_ADD_LO12,
+ BFD_RELOC_RISCV_TLSDESC_CALL,
BFD_RELOC_RISCV_JMP,
BFD_RELOC_RISCV_TLS_DTPMOD32,
BFD_RELOC_RISCV_TLS_DTPREL32,
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index e9852ef8fa1..43931a2be5d 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -218,8 +218,21 @@ static reloc_howto_type howto_table[] =
MINUS_ONE, /* dst_mask */
false), /* pcrel_offset */
+ HOWTO (R_RISCV_TLSDESC, /* type */
+ 0, /* rightshift */
+ 0, /* size is handled by dynamic linker */
+ 0, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_dont, /* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ "R_RISCV_TLSDESC", /* name */
+ false, /* partial_inplace */
+ 0, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
+
/* Reserved for future relocs that the dynamic linker must understand. */
- EMPTY_HOWTO (12),
EMPTY_HOWTO (13),
EMPTY_HOWTO (14),
EMPTY_HOWTO (15),
@@ -879,6 +892,62 @@ static reloc_howto_type howto_table[] =
0, /* src_mask */
0, /* dst_mask */
false), /* pcrel_offset */
+
+ HOWTO (R_RISCV_TLSDESC_HI20, /* type */
+ 0, /* rightshift */
+ 4, /* size */
+ 32, /* bitsize */
+ true, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed, /* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ "R_RISCV_TLSDESC_HI20", /* name */
+ true, /* partial_inplace */
+ 0, /* src_mask */
+ ENCODE_UTYPE_IMM (-1U), /* dst_mask */
+ false), /* pcrel_offset */
+
+ HOWTO (R_RISCV_TLSDESC_LOAD_LO12, /* type */
+ 0, /* rightshift */
+ 4, /* size */
+ 32, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed, /* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ "R_RISCV_TLSDESC_LOAD_LO12", /* name */
+ false, /* partial_inplace */
+ 0, /* src_mask */
+ ENCODE_ITYPE_IMM (-1U), /* dst_mask */
+ false), /* pcrel_offset */
+
+ HOWTO (R_RISCV_TLSDESC_ADD_LO12, /* type */
+ 0, /* rightshift */
+ 4, /* size */
+ 32, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed, /* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ "R_RISCV_TLSDESC_ADD_LO12", /* name */
+ false, /* partial_inplace */
+ 0, /* src_mask */
+ ENCODE_ITYPE_IMM (-1U), /* dst_mask */
+ false), /* pcrel_offset */
+
+ HOWTO (R_RISCV_TLSDESC_CALL, /* type */
+ 0, /* rightshift */
+ 0, /* size */
+ 0, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_dont, /* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ "R_RISCV_TLSDESC_CALL", /* name */
+ false, /* partial_inplace */
+ 0, /* src_mask */
+ ENCODE_ITYPE_IMM (-1U), /* dst_mask */
+ false) /* pcrel_offset */
};
/* A mapping from BFD reloc types to RISC-V ELF reloc types. */
@@ -925,6 +994,10 @@ static const struct elf_reloc_map riscv_reloc_map[] =
{ BFD_RELOC_RISCV_TPREL_LO12_I, R_RISCV_TPREL_LO12_I },
{ BFD_RELOC_RISCV_TLS_GOT_HI20, R_RISCV_TLS_GOT_HI20 },
{ BFD_RELOC_RISCV_TLS_GD_HI20, R_RISCV_TLS_GD_HI20 },
+ { BFD_RELOC_RISCV_TLSDESC_HI20, R_RISCV_TLSDESC_HI20 },
+ { BFD_RELOC_RISCV_TLSDESC_LOAD_LO12, R_RISCV_TLSDESC_LOAD_LO12 },
+ { BFD_RELOC_RISCV_TLSDESC_ADD_LO12, R_RISCV_TLSDESC_ADD_LO12 },
+ { BFD_RELOC_RISCV_TLSDESC_CALL, R_RISCV_TLSDESC_CALL },
{ BFD_RELOC_RISCV_ALIGN, R_RISCV_ALIGN },
{ BFD_RELOC_RISCV_RVC_BRANCH, R_RISCV_RVC_BRANCH },
{ BFD_RELOC_RISCV_RVC_JUMP, R_RISCV_RVC_JUMP },
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index a84febd8257..e04ab7d8d36 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2401,6 +2401,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
"BFD_RELOC_RISCV_GOT_HI20",
"BFD_RELOC_RISCV_TLS_GOT_HI20",
"BFD_RELOC_RISCV_TLS_GD_HI20",
+ "BFD_RELOC_RISCV_TLSDESC_HI20",
+ "BFD_RELOC_RISCV_TLSDESC_LOAD_LO12",
+ "BFD_RELOC_RISCV_TLSDESC_ADD_LO12",
+ "BFD_RELOC_RISCV_TLSDESC_CALL",
"BFD_RELOC_RISCV_JMP",
"BFD_RELOC_RISCV_TLS_DTPMOD32",
"BFD_RELOC_RISCV_TLS_DTPREL32",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 07d35e45c8b..38e1bdfc754 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -5016,6 +5016,14 @@ ENUMX
BFD_RELOC_RISCV_TLS_TPREL32
ENUMX
BFD_RELOC_RISCV_TLS_TPREL64
+ENUMX
+ BFD_RELOC_RISCV_TLSDESC_HI20
+ENUMX
+ BFD_RELOC_RISCV_TLSDESC_LOAD_LO12
+ENUMX
+ BFD_RELOC_RISCV_TLSDESC_ADD_LO12
+ENUMX
+ BFD_RELOC_RISCV_TLSDESC_CALL
ENUMX
BFD_RELOC_RISCV_ALIGN
ENUMX
diff --git a/include/elf/riscv.h b/include/elf/riscv.h
index 0aa8b3359c4..f32215f5d95 100644
--- a/include/elf/riscv.h
+++ b/include/elf/riscv.h
@@ -44,6 +44,7 @@ START_RELOC_NUMBERS (elf_riscv_reloc_type)
RELOC_NUMBER (R_RISCV_TLS_DTPREL64, 9)
RELOC_NUMBER (R_RISCV_TLS_TPREL32, 10)
RELOC_NUMBER (R_RISCV_TLS_TPREL64, 11)
+ RELOC_NUMBER (R_RISCV_TLSDESC, 12)
/* Relocation types not used by the dynamic linker. */
RELOC_NUMBER (R_RISCV_BRANCH, 16)
@@ -90,6 +91,10 @@ START_RELOC_NUMBERS (elf_riscv_reloc_type)
/* Reserved 59 for R_RISCV_PLT32. */
RELOC_NUMBER (R_RISCV_SET_ULEB128, 60)
RELOC_NUMBER (R_RISCV_SUB_ULEB128, 61)
+ RELOC_NUMBER (R_RISCV_TLSDESC_HI20, 62)
+ RELOC_NUMBER (R_RISCV_TLSDESC_LOAD_LO12, 63)
+ RELOC_NUMBER (R_RISCV_TLSDESC_ADD_LO12, 64)
+ RELOC_NUMBER (R_RISCV_TLSDESC_CALL, 65)
END_RELOC_NUMBERS (R_RISCV_max)
/* Processor specific flags for the ELF header e_flags field. */
--
2.41.0
More information about the Binutils
mailing list