This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 2/4] RISC-V: Resurrect GP-relative disassembly hints
- From: Palmer Dabbelt <palmer at dabbelt dot com>
- To: patches at groups dot riscv dot org
- To: binutils at sourceware dot org
- To: Tristan Gingold <gingold at adacore dot com>
- Cc: Palmer Dabbelt <palmer at dabbelt dot com>
- Date: Wed, 3 May 2017 22:06:16 -0700
- Subject: [PATCH 2/4] RISC-V: Resurrect GP-relative disassembly hints
- Authentication-results: sourceware.org; auth=none
- References: <20170504050618.22460-1-palmer@dabbelt.com>
We missed a "_gp" when changing the GP symbol. To make sure that
doesn't happen again, we now use the same definition everywhere (thanks,
Nick).
include/ChangeLog:
2017-04-03 Palmer Dabbelt <palmer@dabbelt.com>
* elf/riscv.h (RISCV_GP_SYMBOL): New define.
bfd/ChangeLog:
2017-04-03 Palmer Dabbelt <palmer@dabbelt.com>
* elfnn-riscv.c (GP_NAME): Delete.
(riscv_global_pointer_value): Change GP_NAME to RISCV_GP_SYMBOL.
(_bfd_riscv_relax_lui): Likewise.
opcodes/ChangeLog:
2017-04-03 Palmer Dabbelt <palmer@dabbelt.com>
* riscv-dis.c (riscv_disassemble_insn): Change "_gp" to
RISCV_GP_SYMBOL.
---
bfd/ChangeLog | 6 ++++++
bfd/elfnn-riscv.c | 9 +++------
include/ChangeLog | 4 ++++
include/elf/riscv.h | 3 +++
opcodes/ChangeLog | 5 +++++
opcodes/riscv-dis.c | 2 +-
6 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0ba4d25..bbca873 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-03 Palmer Dabbelt <palmer@dabbelt.com>
+
+ * elfnn-riscv.c (GP_NAME): Delete.
+ (riscv_global_pointer_value): Change GP_NAME to RISCV_GP_SYMBOL.
+ (_bfd_riscv_relax_lui): Likewise.
+
2017-01-17 Kuan-Lin Chen <kuanlinchentw@gmail.com>
* elfnn-riscv.c (riscv_elf_object_p): New function.
diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index d1e62d0..3c04507 100644
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -52,10 +52,6 @@
#define ELF_MAXPAGESIZE 0x1000
#define ELF_COMMONPAGESIZE 0x1000
-/* The global pointer's symbol name. */
-
-#define GP_NAME "__global_pointer$"
-
/* The RISC-V linker needs to keep track of the number of relocs that it
decides to copy as dynamic relocs in check_relocs for each symbol.
This is so that it can later discard them if they are found to be
@@ -1467,7 +1463,7 @@ riscv_global_pointer_value (struct bfd_link_info *info)
{
struct bfd_link_hash_entry *h;
- h = bfd_link_hash_lookup (info->hash, GP_NAME, FALSE, FALSE, TRUE);
+ h = bfd_link_hash_lookup (info->hash, RISCV_GP_SYMBOL, FALSE, FALSE, TRUE);
if (h == NULL || h->type != bfd_link_hash_defined)
return 0;
@@ -2818,7 +2814,8 @@ _bfd_riscv_relax_lui (bfd *abfd,
/* If gp and the symbol are in the same output section, then
consider only that section's alignment. */
struct bfd_link_hash_entry *h =
- bfd_link_hash_lookup (link_info->hash, GP_NAME, FALSE, FALSE, TRUE);
+ bfd_link_hash_lookup (link_info->hash, RISCV_GP_SYMBOL, FALSE, FALSE,
+ TRUE);
if (h->u.def.section->output_section == sym_sec->output_section)
max_alignment = (bfd_vma) 1 << sym_sec->output_section->alignment_power;
}
diff --git a/include/ChangeLog b/include/ChangeLog
index 5995c3b..dddecfb 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-03 Palmer Dabbelt <palmer@dabbelt.com>
+
+ * elf/riscv.h (RISCV_GP_SYMBOL): New define.
+
2017-03-27 Andrew Waterman <andrew@sifive.com>
* opcode/riscv-opc.h (CSR_PMPCFG0): New define.
diff --git a/include/elf/riscv.h b/include/elf/riscv.h
index 526bc11..daa4463 100644
--- a/include/elf/riscv.h
+++ b/include/elf/riscv.h
@@ -109,4 +109,7 @@ END_RELOC_NUMBERS (R_RISCV_max)
/* File uses the quad-float ABI. */
#define EF_RISCV_FLOAT_ABI_QUAD 0x0006
+/* The name of the global pointer symbol. */
+#define RISCV_GP_SYMBOL "__global_pointer$"
+
#endif /* _ELF_RISCV_H */
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 0517fd9..2a5410a 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-03 Palmer Dabbelt <palmer@dabbelt.com>
+
+ * riscv-dis.c (riscv_disassemble_insn): Change "_gp" to
+ RISCV_GP_SYMBOL.
+
2017-03-14 Kito Cheng <kito.cheng@gmail.com>
* riscv-opc.c (riscv_opcodes> <c.li>: Use the 'o' immediate encoding.
diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c
index 070c96e..bdc961c 100644
--- a/opcodes/riscv-dis.c
+++ b/opcodes/riscv-dis.c
@@ -383,7 +383,7 @@ riscv_disassemble_insn (bfd_vma memaddr, insn_t word, disassemble_info *info)
pd->hi_addr[i] = -1;
for (i = 0; i < info->symtab_size; i++)
- if (strcmp (bfd_asymbol_name (info->symtab[i]), "_gp") == 0)
+ if (strcmp (bfd_asymbol_name (info->symtab[i]), RISCV_GP_SYMBOL) == 0)
pd->gp = bfd_asymbol_value (info->symtab[i]);
}
else
--
2.10.2