diff mbox series

[v1,03/14] clean-up: fix conflicting symbol with unknown from bfd/elf-bfd.h

Message ID 20250227104811.178094-4-matthieu.longo@arm.com
State New
Headers
Series Several clean-ups and refactorings before a long patch series on AArch64 build attributes |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 fail Patch failed to apply

Commit Message

Matthieu Longo Feb. 27, 2025, 10:47 a.m. UTC 
  ---
 binutils/readelf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/binutils/readelf.c b/binutils/readelf.c
index fbe99d690e2..6d3ec65a8a1 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -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;
@@ -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:
@@ -3578,7 +3578,7 @@  decode_ARM_machine_flags (char *out, unsigned e_flags)
 	      break;
 
 	    default:
-	      unknown = true;
+	      unknown_abi = true;
 	      break;
 	    }
 	}
@@ -3609,7 +3609,7 @@  decode_ARM_machine_flags (char *out, unsigned e_flags)
 	      break;
 
 	    default:
-	      unknown = true;
+	      unknown_abi = true;
 	      break;
 	    }
 	}
@@ -3640,7 +3640,7 @@  decode_ARM_machine_flags (char *out, unsigned e_flags)
 	      break;
 
 	    default:
-	      unknown = true;
+	      unknown_abi = true;
 	      break;
 	    }
 	}
@@ -3675,7 +3675,7 @@  decode_ARM_machine_flags (char *out, unsigned e_flags)
 	      break;
 
 	    default:
-	      unknown = true;
+	      unknown_abi = true;
 	      break;
 	    }
 	}
@@ -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;
 }