Commit: f52fb009085e63da25eeacd39990ac6243ffed76 - binutils_gdb (git)

Commit MetaInfo

• Revisão: f52fb009085e63da25eeacd39990ac6243ffed76 (tree)
• Hora: 2022-10-27 17:45:43
• Autor: Nelson Chu <nelson@rivo...>
• Commiter: Nelson Chu

Mensagem de Log

RISC-V: Fix build failures for -Werror=sign-compare.

elfnn-riscv.c: In function ‘riscv_relax_resolve_delete_relocs’:
elfnn-riscv.c:4256:30: error: operand of ‘?:’ changes signedness from ‘int’ to ‘unsigned int’ due to unsignedness of other operand [-Werror=sign-compare]

So make the operands unsigned could resolve problem.

bfd/

• • elfnn-riscv.c (riscv_relax_resolve_delete_relocs): Fixed build
    failures for -Werror=sign-compare.
    

Mudança Sumário

• modified: bfd/elfnn-riscv.c

Diff

--- a/bfd/elfnn-riscv.c
+++ b/bfd/elfnn-riscv.c
@@ -4239,7 +4239,10 @@ riscv_relax_resolve_delete_relocs (bfd *abfd,
 	  rel_next = relocs + i;
 	  if (ELFNN_R_TYPE ((rel_next)->r_info) == R_RISCV_DELETE
 	      && (rel_next)->r_offset > rel->r_offset)
-	    break;
+	    {
+	      BFD_ASSERT (rel_next - rel > 0);
+	      break;
+	    }
 	  else
 	    rel_next = NULL;
 	}
@@ -4253,7 +4256,8 @@ riscv_relax_resolve_delete_relocs (bfd *abfd,
       rel->r_info = ELFNN_R_INFO (0, R_RISCV_NONE);
 
       /* Skip ahead to the next delete reloc.  */
-      i = rel_next != NULL ? rel_next - relocs - 1 : sec->reloc_count;
+      i = rel_next != NULL ? (unsigned int) (rel_next - relocs - 1)
+			   : sec->reloc_count;
     }
 
   return true;