public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Rebecca Cran" <rebecca@bluestop.org>
To: devel@edk2.groups.io, Liming Gao <liming.gao@intel.com>,
	Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Rebecca Cran <rebecca@bluestop.org>
Subject: [PATCH] BaseTools: support arm64 as a platform name in addition to aarch64
Date: Wed, 10 Apr 2019 21:16:53 -0600	[thread overview]
Message-ID: <20190411031653.38092-1-rebecca@bluestop.org> (raw)

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

Signed-off-by: Rebecca Cran <rebecca@bluestop.org>
---
 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 90fb3453ad..d76b8283dd 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
-- 
2.20.1


             reply	other threads:[~2019-04-11  3:17 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-11  3:16 Rebecca Cran [this message]
2019-04-11 13:44 ` [edk2-devel] [PATCH] BaseTools: support arm64 as a platform name in addition to aarch64 Liming Gao
2019-04-11 14:23 ` Philippe Mathieu-Daudé
2019-04-11 17:52   ` Laszlo Ersek
2019-04-11 19:38     ` Rebecca Cran
2019-04-11 19:55     ` Philippe Mathieu-Daudé
2019-04-11 19:58       ` rebecca
2019-04-11 20:11         ` Philippe Mathieu-Daudé
2019-04-12  7:54           ` Laszlo Ersek
2019-05-02 21:15             ` rebecca
2019-05-03  9:17               ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190411031653.38092-1-rebecca@bluestop.org \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox