diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
index 4c2e93e6f40..93a5582bbe0 100644
--- a/BaseTools/Source/C/GenFfs/GenFfs.c
+++ b/BaseTools/Source/C/GenFfs/GenFfs.c
@@ -398,7 +398,7 @@ Routine Description:
     // Based on section type to adjust offset? Todo
     //
     if ((InputFileAlign [Index] != 0) && (((Size + HeaderSize + TeOffset) % InputFileAlign [Index]) != 0)) {
-      Offset = (Size + sizeof (EFI_COMMON_SECTION_HEADER) + HeaderSize + TeOffset + InputFileAlign [Index] - 1) & ~(InputFileAlign [Index] - 1);
+      Offset = (Size + sizeof (EFI_COMMON_SECTION_HEADER) + HeaderSize + TeOffset + InputFileAlign[Index] - 1) & ~(UINTN)(InputFileAlign[Index] - 1);
       Offset = Offset - Size - HeaderSize - TeOffset;
 
       if (FileBuffer != NULL && ((Size + Offset) < *BufferLength)) {
diff --git a/BaseTools/Source/C/GenFv/GenFvInternalLib.c b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
index 3f982c529bc..2d5529c495d 100644
--- a/BaseTools/Source/C/GenFv/GenFvInternalLib.c
+++ b/BaseTools/Source/C/GenFv/GenFvInternalLib.c
@@ -3275,7 +3275,7 @@ Routine Description:
         // Only EFI_FFS_FILE_HEADER is needed for a pad section.
         //
         OrigOffset    = CurrentOffset;
-        CurrentOffset = (CurrentOffset + FfsHeaderSize + sizeof(EFI_FFS_FILE_HEADER) + FfsAlignment - 1) & ~(FfsAlignment - 1);
+        CurrentOffset  = (CurrentOffset + FfsHeaderSize + sizeof (EFI_FFS_FILE_HEADER) + FfsAlignment - 1) & ~(UINTN)(FfsAlignment - 1);
         CurrentOffset -= FfsHeaderSize;
         if ((CurrentOffset - OrigOffset) > MaxPadFileSize) {
           MaxPadFileSize = CurrentOffset - OrigOffset;
diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
index d9d2efeca7a..edb9d450c82 100644
--- a/BaseTools/Source/C/GenSec/GenSec.c
+++ b/BaseTools/Source/C/GenSec/GenSec.c
@@ -538,7 +538,7 @@ Routine Description:
       // make sure section data meet its alignment requirement by adding one raw pad section.
       //
       if ((InputFileAlign [Index] != 0) && (((Size + HeaderSize + TeOffset) % InputFileAlign [Index]) != 0)) {
-        Offset = (Size + sizeof (EFI_COMMON_SECTION_HEADER) + HeaderSize + TeOffset + InputFileAlign [Index] - 1) & ~(InputFileAlign [Index] - 1);
+        Offset = (Size + sizeof (EFI_COMMON_SECTION_HEADER) + HeaderSize + TeOffset + InputFileAlign[Index] - 1) & ~(size_t)(InputFileAlign[Index] - 1);
         Offset = Offset - Size - HeaderSize - TeOffset;
 
         if (FileBuffer != NULL && ((Size + Offset) < *BufferLength)) {