diff --git a/BaseTools/Source/C/GenFw/Elf32Convert.c b/BaseTools/Source/C/GenFw/Elf32Convert.c
index d115291b06..8fca7fba2a 100644
--- a/BaseTools/Source/C/GenFw/Elf32Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf32Convert.c
@@ -314,7 +314,8 @@ GetSymName (
   UINT8* StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;
 
   bool foundEnd = false;
-  for (UINT32 i = Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {
+  UINT32 i;
+  for (i = Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {
     foundEnd = StrtabContents[i] == 0;
   }
   assert(foundEnd);
diff --git a/BaseTools/Source/C/GenFw/Elf64Convert.c b/BaseTools/Source/C/GenFw/Elf64Convert.c
index 3b5f630103..024a2a0d53 100644
--- a/BaseTools/Source/C/GenFw/Elf64Convert.c
+++ b/BaseTools/Source/C/GenFw/Elf64Convert.c
@@ -306,7 +306,8 @@ GetSymName (
   UINT8* StrtabContents = (UINT8*)mEhdr + StrtabShdr->sh_offset;
 
   bool foundEnd = false;
-  for (UINT32 i = Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {
+  UINT32 i;
+  for (i= Sym->st_name; (i < StrtabShdr->sh_size) && !foundEnd; i++) {
     foundEnd = StrtabContents[i] == 0;
   }
   assert(foundEnd);