aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuyuki Ishi <ishitatsuyuki@gmail.com>2024-02-21 02:55:49 +0900
committerNelson Chu <nelson@rivosinc.com>2024-02-29 15:02:49 +0800
commitdc1470f1d8779e151fb231639014597582bb7f4e (patch)
tree83e6a0268b0bb82588a7d343af7aa6c30f8e9eee
parent3243d790ee32aa8eda69226d81b1e79dbd1dcd87 (diff)
downloadgdb-dc1470f1d8779e151fb231639014597582bb7f4e.zip
gdb-dc1470f1d8779e151fb231639014597582bb7f4e.tar.gz
gdb-dc1470f1d8779e151fb231639014597582bb7f4e.tar.bz2
RISC-V: Add TLSDESC reloc definitions.
bfd/ * elfxx-riscv.c: Add 5 TLSDESC reloc descriptions. * reloc.c: Likewise. * libbfd.h: Regenerate. * bfd-in2.h: Regenerate. include/ * elf/riscv.h: Add 5 TLSDESC reloc descriptions.
-rw-r--r--bfd/bfd-in2.h4
-rw-r--r--bfd/elfxx-riscv.c75
-rw-r--r--bfd/libbfd.h4
-rw-r--r--bfd/reloc.c8
-rw-r--r--include/elf/riscv.h5
5 files changed, 95 insertions, 1 deletions
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 3791784..a335df5 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -5420,6 +5420,10 @@ enum bfd_reloc_code_real
BFD_RELOC_RISCV_TLS_DTPREL64,
BFD_RELOC_RISCV_TLS_TPREL32,
BFD_RELOC_RISCV_TLS_TPREL64,
+ 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_ALIGN,
BFD_RELOC_RISCV_RVC_BRANCH,
BFD_RELOC_RISCV_RVC_JUMP,
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index 9a121b4..a4aa71f 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -218,7 +218,20 @@ static reloc_howto_type howto_table[] =
MINUS_ONE, /* dst_mask */
false), /* pcrel_offset */
- EMPTY_HOWTO (12),
+ 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 */
+
EMPTY_HOWTO (13),
EMPTY_HOWTO (14),
EMPTY_HOWTO (15),
@@ -808,6 +821,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_dont, /* 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_dont, /* 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_dont, /* 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 */
};
static reloc_howto_type howto_table_internal[] =
@@ -935,6 +1004,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 40bbe6a..49f63a0 100644
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -2409,6 +2409,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
"BFD_RELOC_RISCV_TLS_DTPREL64",
"BFD_RELOC_RISCV_TLS_TPREL32",
"BFD_RELOC_RISCV_TLS_TPREL64",
+ "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_ALIGN",
"BFD_RELOC_RISCV_RVC_BRANCH",
"BFD_RELOC_RISCV_RVC_JUMP",
diff --git a/bfd/reloc.c b/bfd/reloc.c
index 7583b7f..a187afe 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -5003,6 +5003,14 @@ ENUMX
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
BFD_RELOC_RISCV_RVC_BRANCH
diff --git a/include/elf/riscv.h b/include/elf/riscv.h
index 2000cf2..c1e73f7 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)
/* Internal relocations used exclusively by the relaxation pass. */