Re: [edk2-devel] [PATCH] BaseTools: support arm64 as a platform name in addition to aarch64

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 4/11/19 7:52 PM, Laszlo Ersek wrote:
> On 04/11/19 16:23, Philippe Mathieu-Daudé wrote:
>> On 4/11/19 5:16 AM, Rebecca Cran via Groups.Io wrote:
>>> Some systems such as FreeBSD identify the platform as 'arm64'
>>> and not 'aarch64' as Linux does.
>>
>> Per https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220297
>> this seems to be a FreeBSD bug.
> 
> You are correct, but that issue was filed on 2017-06-26. I don't think
> we should hold our breaths, as long as the workaround is simple. And, it
> does look simple. (We've worked around worse.)
> 
> I do suggest an addition to the patch, however: Rebecca, please add the
> link discovered by Phil near the "arm64" matches, in a comment.
> Something like:
> 
> # work around <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220297>

Good idea.

> Thanks,
> Laszlo
> 
>>
>>> 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)))

Here you change 2 different if() blocks into a single if/elif/elif.
Although not mentioned in the patch description, it is cleaner than
before your patch.

With the work around link added:
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Thanks,

Phil.

>>> +    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
>>>
>>
>> 
>>
>