diff options
| author | Rebecca Cran <rebecca@bluestop.org> | 2019-04-10 21:16:53 -0600 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2019-05-03 11:00:34 +0200 |
| commit | fbb0ec7ea4c0d1e9e397fe898fb7d69de0779084 (patch) | |
| tree | 78f07dbad8218a20f674209083b5577a8dd5e1e2 /BaseTools/Source/C | |
| parent | d027412258875cee485977fad39b1801beb50074 (diff) | |
| download | edk2-fbb0ec7ea4c0d1e9e397fe898fb7d69de0779084.tar.gz edk2-fbb0ec7ea4c0d1e9e397fe898fb7d69de0779084.tar.bz2 edk2-fbb0ec7ea4c0d1e9e397fe898fb7d69de0779084.zip | |
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]
Diffstat (limited to 'BaseTools/Source/C')
| -rw-r--r-- | BaseTools/Source/C/GNUmakefile | 5 | ||||
| -rw-r--r-- | 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
|