diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
index 6aa37e49fb..66baabb3f0 100644
--- a/BaseTools/Source/C/GNUmakefile
+++ b/BaseTools/Source/C/GNUmakefile
@@ -25,6 +25,12 @@ ifndef ARCH
   ifeq ($(patsubst i%86,IA32,$(uname_m)),IA32)
     ARCH=IA32
   endif
+  ifneq (,$(findstring aarch64,$(uname_m)))
+    ARCH=AARCH64
+  endif
+  ifneq (,$(findstring arm,$(uname_m)))
+    ARCH=ARM
+  endif
   ifndef ARCH
     $(info Could not detected ARCH from uname results)
     $(error ARCH is not defined!)