[PATCH v4 8/9] RISC-V: Add elf_link_hash_entry to relax_func args.

[Tatsuyuki Ishi]

bfd/
	* elfnn-riscv.c (riscv_pcgp_hi_reloc): Add a field for hash_entry.
	(riscv_record_pcgp_hi_reloc): Add argument and record the
	hash_entry.
	(_bfd_riscv_relax_*): Add unused hash_entry argument.
	(_bfd_riscv_relax_pc): Also record the hash_entry, for consistency
	 (but it is not used by the LO reloc handling).
	(_bfd_riscv_relax_section): Move h to outer scope and pass into
	relax helpers.
---
 bfd/elfnn-riscv.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c
index 1fbb0698ce1..acc45ebb549 100644
--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -4235,6 +4235,7 @@ struct riscv_pcgp_hi_reloc
   bfd_vma hi_addr;
   unsigned hi_sym;
   asection *sym_sec;
+  struct elf_link_hash_entry *h;
   bool undefined_weak;
   riscv_pcgp_hi_reloc *next;
 };
@@ -4295,6 +4296,7 @@ static bool
 riscv_record_pcgp_hi_reloc (riscv_pcgp_relocs *p, bfd_vma hi_sec_off,
 			    bfd_vma hi_addend, bfd_vma hi_addr,
 			    unsigned hi_sym, asection *sym_sec,
+			    struct elf_link_hash_entry *h,
 			    bool undefined_weak)
 {
   riscv_pcgp_hi_reloc *new = bfd_malloc (sizeof (*new));
@@ -4305,6 +4307,7 @@ riscv_record_pcgp_hi_reloc (riscv_pcgp_relocs *p, bfd_vma hi_sec_off,
   new->hi_addr = hi_addr;
   new->hi_sym = hi_sym;
   new->sym_sec = sym_sec;
+  new->h = h;
   new->undefined_weak = undefined_weak;
   new->next = p->hi;
   p->hi = new;
@@ -4607,6 +4610,7 @@ riscv_relax_resolve_delete_relocs (bfd *abfd,
 
 typedef bool (*relax_func_t) (bfd *, asection *, asection *,
 			      struct bfd_link_info *,
+			      struct elf_link_hash_entry *,
 			      Elf_Internal_Rela *,
 			      bfd_vma, bfd_vma, bfd_vma, bool *,
 			      riscv_pcgp_relocs *,
@@ -4617,6 +4621,7 @@ typedef bool (*relax_func_t) (bfd *, asection *, asection *,
 static bool
 _bfd_riscv_relax_call (bfd *abfd, asection *sec, asection *sym_sec,
 		       struct bfd_link_info *link_info,
+		       struct elf_link_hash_entry *_h ATTRIBUTE_UNUSED,
 		       Elf_Internal_Rela *rel,
 		       bfd_vma symval,
 		       bfd_vma max_alignment,
@@ -4723,6 +4728,7 @@ _bfd_riscv_relax_lui (bfd *abfd,
 		      asection *sec,
 		      asection *sym_sec,
 		      struct bfd_link_info *link_info,
+		      struct elf_link_hash_entry *_h ATTRIBUTE_UNUSED,
 		      Elf_Internal_Rela *rel,
 		      bfd_vma symval,
 		      bfd_vma max_alignment,
@@ -4836,6 +4842,7 @@ _bfd_riscv_relax_tls_le (bfd *abfd,
 			 asection *sec,
 			 asection *sym_sec ATTRIBUTE_UNUSED,
 			 struct bfd_link_info *link_info,
+			 struct elf_link_hash_entry *_h ATTRIBUTE_UNUSED,
 			 Elf_Internal_Rela *rel,
 			 bfd_vma symval,
 			 bfd_vma max_alignment ATTRIBUTE_UNUSED,
@@ -4878,6 +4885,7 @@ static bool
 _bfd_riscv_relax_align (bfd *abfd, asection *sec,
 			asection *sym_sec,
 			struct bfd_link_info *link_info,
+			struct elf_link_hash_entry *_h ATTRIBUTE_UNUSED,
 			Elf_Internal_Rela *rel,
 			bfd_vma symval,
 			bfd_vma max_alignment ATTRIBUTE_UNUSED,
@@ -4938,6 +4946,7 @@ _bfd_riscv_relax_pc (bfd *abfd ATTRIBUTE_UNUSED,
 		     asection *sec,
 		     asection *sym_sec,
 		     struct bfd_link_info *link_info,
+		     struct elf_link_hash_entry *_h,
 		     Elf_Internal_Rela *rel,
 		     bfd_vma symval,
 		     bfd_vma max_alignment,
@@ -5058,6 +5067,7 @@ _bfd_riscv_relax_pc (bfd *abfd ATTRIBUTE_UNUSED,
 				      symval,
 				      ELFNN_R_SYM(rel->r_info),
 				      sym_sec,
+				      _h,
 				      undefined_weak);
 	  /* Delete unnecessary AUIPC and reuse the reloc.  */
 	  *again = true;
@@ -5147,6 +5157,7 @@ _bfd_riscv_relax_section (bfd *abfd, asection *sec,
   /* Examine and consider relaxing each reloc.  */
   for (i = 0; i < sec->reloc_count; i++)
     {
+      struct elf_link_hash_entry *h = NULL;
       asection *sym_sec;
       Elf_Internal_Rela *rel = relocs + i;
       relax_func_t relax_func;
@@ -5249,7 +5260,6 @@ _bfd_riscv_relax_section (bfd *abfd, asection *sec,
       else
 	{
 	  unsigned long indx;
-	  struct elf_link_hash_entry *h;
 
 	  indx = ELFNN_R_SYM (rel->r_info) - symtab_hdr->sh_info;
 	  h = elf_sym_hashes (abfd)[indx];
@@ -5351,7 +5361,7 @@ _bfd_riscv_relax_section (bfd *abfd, asection *sec,
 
       symval += sec_addr (sym_sec);
 
-      if (!relax_func (abfd, sec, sym_sec, info, rel, symval,
+      if (!relax_func (abfd, sec, sym_sec, info, h, rel, symval,
 		       max_alignment, reserve_size, again,
 		       &pcgp_relocs, undefined_weak))
 	goto fail;
-- 
2.43.2