Skip to content

Commit

Permalink
clean-up: fix conflicting symbol with unknown from bfd/elf-bfd.h
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthieu Longo committed Mar 4, 2025
1 parent 5d526bd commit 1efbe98
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions binutils/readelf.c
Original file line number Diff line number Diff line change
Expand Up @@ -3534,7 +3534,7 @@ static char *
decode_ARM_machine_flags (char *out, unsigned e_flags)
{
unsigned eabi;
bool unknown = false;
bool unknown_abi = false;

eabi = EF_ARM_EABI_VERSION (e_flags);
e_flags &= ~ EF_ARM_EABIMASK;
Expand All @@ -3558,7 +3558,7 @@ decode_ARM_machine_flags (char *out, unsigned e_flags)
default:
out = stpcpy (out, ", <unrecognized EABI>");
if (e_flags)
unknown = true;
unknown_abi = true;
break;

case EF_ARM_EABI_VER1:
Expand All @@ -3578,7 +3578,7 @@ decode_ARM_machine_flags (char *out, unsigned e_flags)
break;

default:
unknown = true;
unknown_abi = true;
break;
}
}
Expand Down Expand Up @@ -3609,7 +3609,7 @@ decode_ARM_machine_flags (char *out, unsigned e_flags)
break;

default:
unknown = true;
unknown_abi = true;
break;
}
}
Expand Down Expand Up @@ -3640,7 +3640,7 @@ decode_ARM_machine_flags (char *out, unsigned e_flags)
break;

default:
unknown = true;
unknown_abi = true;
break;
}
}
Expand Down Expand Up @@ -3675,7 +3675,7 @@ decode_ARM_machine_flags (char *out, unsigned e_flags)
break;

default:
unknown = true;
unknown_abi = true;
break;
}
}
Expand Down Expand Up @@ -3730,13 +3730,13 @@ decode_ARM_machine_flags (char *out, unsigned e_flags)
break;

default:
unknown = true;
unknown_abi = true;
break;
}
}
}

if (unknown)
if (unknown_abi)
out = stpcpy (out,_(", <unknown>"));
return out;
}
Expand Down

0 comments on commit 1efbe98

Please sign in to comment.