From fbb0ec7ea4c0d1e9e397fe898fb7d69de0779084 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 10 Apr 2019 21:16:53 -0600 Subject: 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 Reviewed-by: Liming Gao Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Laszlo Ersek [lersek@redhat.com: fix up DKIM damage in the "From:" address] --- BaseTools/Source/C/GNUmakefile | 5 +++-- BaseTools/Source/C/Makefiles/header.makefile | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile index 1d048c4cc6..37bcce519c 100644 --- a/BaseTools/Source/C/GNUmakefile +++ b/BaseTools/Source/C/GNUmakefile @@ -21,8 +21,9 @@ ifndef HOST_ARCH endif ifneq (,$(findstring aarch64,$(uname_m))) HOST_ARCH=AARCH64 - endif - ifneq (,$(findstring arm,$(uname_m))) + else ifneq (,$(findstring arm64,$(uname_m))) + HOST_ARCH=AARCH64 + else ifneq (,$(findstring arm,$(uname_m))) HOST_ARCH=ARM endif ifndef HOST_ARCH diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile index eac295b4dd..52cbffcb44 100644 --- a/BaseTools/Source/C/Makefiles/header.makefile +++ b/BaseTools/Source/C/Makefiles/header.makefile @@ -23,8 +23,9 @@ ifndef HOST_ARCH endif ifneq (,$(findstring aarch64,$(uname_m))) HOST_ARCH=AARCH64 - endif - ifneq (,$(findstring arm,$(uname_m))) + else ifneq (,$(findstring arm64,$(uname_m))) + HOST_ARCH=AARCH64 + else ifneq (,$(findstring arm,$(uname_m))) HOST_ARCH=ARM endif ifndef HOST_ARCH -- cgit v1.2.3