BaseTools: support arm64 as a platform name in addition to aarch64

Some systems such as FreeBSD identify the platform as 'arm64'
and not 'aarch64' as Linux does.

Signed-off-by: Rebecca Cran <rebecca@bluestop.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
[lersek@redhat.com: fix up DKIM damage in the "From:" address]

diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
index 1d048c4cc63e9f8f4efe677374a9983b39f8787f..37bcce519c7ec53533577190f52d29f1e805b9b4 100644 (file)
--- a/BaseTools/Source/C/GNUmakefile
+++ b/BaseTools/Source/C/GNUmakefile
@@ -21,8 +21,9 @@ ifndef HOST_ARCH
   endif\r
   ifneq (,$(findstring aarch64,$(uname_m)))\r
     HOST_ARCH=AARCH64\r
-  endif\r
-  ifneq (,$(findstring arm,$(uname_m)))\r
+  else ifneq (,$(findstring arm64,$(uname_m)))\r
+    HOST_ARCH=AARCH64\r
+  else ifneq (,$(findstring arm,$(uname_m)))\r
     HOST_ARCH=ARM\r
   endif\r
   ifndef HOST_ARCH\r

diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile
index eac295b4ddb82ad64210cc9ad2e54112d7232e1a..52cbffcb4423e316c21bde8d2c5fe09512a83df3 100644 (file)
--- a/BaseTools/Source/C/Makefiles/header.makefile
+++ b/BaseTools/Source/C/Makefiles/header.makefile
@@ -23,8 +23,9 @@ ifndef HOST_ARCH
   endif\r
   ifneq (,$(findstring aarch64,$(uname_m)))\r
     HOST_ARCH=AARCH64\r
-  endif\r
-  ifneq (,$(findstring arm,$(uname_m)))\r
+  else ifneq (,$(findstring arm64,$(uname_m)))\r
+    HOST_ARCH=AARCH64\r
+  else ifneq (,$(findstring arm,$(uname_m)))\r
     HOST_ARCH=ARM\r
   endif\r
   ifndef HOST_ARCH\r