Use R_RISCV_DELETE to relax AUIPC->GP

bfd/elfnn-riscv.c

@@ -2785,27 +2785,14 @@ riscv_find_pcgp_hi_reloc(riscv_pcgp_relocs *p, bfd_vma hi_sec_off)
 }
 
 static bfd_boolean
-riscv_delete_pcgp_hi_reloc(riscv_pcgp_relocs *p, bfd_vma hi_sec_off, size_t bytes)
+riscv_delete_pcgp_hi_reloc(riscv_pcgp_relocs *p, bfd_vma hi_sec_off)
 {
   bfd_boolean out = FALSE;
 
   for (riscv_pcgp_hi_reloc *c = p->hi; c != NULL; c = c->next)
-    {
       if (c->hi_sec_off == hi_sec_off)
 	out = TRUE;
 
-      if (c->hi_sec_off > hi_sec_off)
-        c->hi_sec_off -= bytes;
-    }
-
-  for (riscv_pcgp_lo_reloc *c = p->lo; c != NULL; c = c->next)
-    {
-      BFD_ASSERT (c->hi_sec_off != hi_sec_off);
-
-      if (c->hi_sec_off > hi_sec_off)
-        c->hi_sec_off -= bytes;
-    }
-
   return out;
 }
 
@@ -3116,6 +3103,8 @@ _bfd_riscv_relax_align (bfd *abfd, asection *sec,
 				   rel->r_addend - nop_bytes);
 }
 
+/* Relax PC-relative references to GP-relative references.  */
+
 static bfd_boolean
 _bfd_riscv_relax_pc  (bfd *abfd,
 		      asection *sec,
@@ -3214,11 +3203,9 @@ _bfd_riscv_relax_pc  (bfd *abfd,
 				      ELFNN_R_SYM(rel->r_info),
 				      sym_sec);
 	  /* We can delete the unnecessary AUIPC and reloc.  */
-	  rel->r_info = ELFNN_R_INFO (0, R_RISCV_NONE);
-	  *again = TRUE;
-	  if (!riscv_relax_delete_bytes (abfd, sec, rel->r_offset, 4))
-	    return FALSE;
-	  return riscv_delete_pcgp_hi_reloc (pcgp_relocs, rel->r_offset, 4);
+	  rel->r_info = ELFNN_R_INFO (0, R_RISCV_DELETE);
+	  rel->r_addend = 4;
+	  return riscv_delete_pcgp_hi_reloc (pcgp_relocs, rel->r_offset);
 
 	default:
 	  abort ();