RISC-V: Resurrect GP-relative disassembly hints

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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index accb6d4ff558d74d11233dba429c6617b7d5828e..5b0211f8b262154cff4096e6c6bec514eeaa97ea 100644 (file)
--- 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-04-04  Nick Clifton  <nickc@redhat.com>
 
        PR binutils/21342

diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index e476bb150bc81fb064d9630504acf93ab6216fa1..38f12d0f5858c51f0b69dd1aa79502febff99993 100644 (file)
--- 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 70ab0a8031cbf7a044b92a3f277e42dc5b03117c..c7a0ef29850c25edbe24cea853f5db3669d61463 100644 (file)
--- 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 526bc11f1544b5db98857528350e8732bbe134ac..daa44639263c17a2202aa01dbba6115b0d4040be 100644 (file)
--- 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 07262aa86bd2191c39a25bd926298516a27b3aa0..ce6ee4080f9987b70fae2cc029e649085bd9a872 100644 (file)
--- 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-30  Pip Cet  <pipcet@gmail.com>
 
        * configure.ac: Add (empty) bfd_wasm32_arch target.

diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c
index 20b685456d40043ca708854a7a8ffcb8366608c0..d760d701d49a43eabeae1359794e508ce842c898 100644 (file)
--- a/opcodes/riscv-dis.c
+++ b/opcodes/riscv-dis.c
@@ -384,7 +384,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