[1/3] RISC-V: Fixed riscv_update_subset1 returning wrong boolean value

Message ID 20250313023136.1930-1-nelson@rivosinc.com
State New
Headers
Series [1/3] RISC-V: Fixed riscv_update_subset1 returning wrong boolean value |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Test passed

Commit Message

Nelson Chu March 13, 2025, 2:31 a.m. UTC
  The riscv_update_subset1 returning wrong boolean value if the
riscv_parse_check_conflicts isn't called, though the current return value
doesn't really useful.
---
 bfd/elfxx-riscv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Nelson Chu March 18, 2025, 4:23 a.m. UTC | #1
Committed, thanks.

Nelson

On Thu, Mar 13, 2025 at 10:31 AM Nelson Chu <nelson@rivosinc.com> wrote:

> The riscv_update_subset1 returning wrong boolean value if the
> riscv_parse_check_conflicts isn't called, though the current return value
> doesn't really useful.
> ---
>  bfd/elfxx-riscv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
> index fd2cb74df80..ffcf32be69e 100644
> --- a/bfd/elfxx-riscv.c
> +++ b/bfd/elfxx-riscv.c
> @@ -2524,13 +2524,13 @@ riscv_update_subset1 (riscv_parse_subset_t *rps,
>      }
>    while (*p++ == ',');
>
> -  bool conflict = false;
> +  bool no_conflict = true;
>    if (explicit_subset == NULL)
>      {
>        riscv_parse_add_implicit_subsets (rps);
> -      conflict = riscv_parse_check_conflicts (rps);
> +      no_conflict = riscv_parse_check_conflicts (rps);
>      }
> -  return conflict;
> +  return no_conflict;
>  }
>
>  /* Add/Remove an extension to/from the subset list.  This is used for
> --
> 2.39.3 (Apple Git-146)
>
>
  

Patch

diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c
index fd2cb74df80..ffcf32be69e 100644
--- a/bfd/elfxx-riscv.c
+++ b/bfd/elfxx-riscv.c
@@ -2524,13 +2524,13 @@  riscv_update_subset1 (riscv_parse_subset_t *rps,
     }
   while (*p++ == ',');
 
-  bool conflict = false;
+  bool no_conflict = true;
   if (explicit_subset == NULL)
     {
       riscv_parse_add_implicit_subsets (rps);
-      conflict = riscv_parse_check_conflicts (rps);
+      no_conflict = riscv_parse_check_conflicts (rps);
     }
-  return conflict;
+  return no_conflict;
 }
 
 /* Add/Remove an extension to/from the subset list.  This is used for