[4/4] makedef: Add support for identifying the ARM64 machine type

Message ID 1507796950-7328-4-git-send-email-martin@martin.st
State Committed
Commit a37e84be69310cd7de9540c8bc194cb0a6d158ed
Headers show

Commit Message

Martin Storsjö Oct. 12, 2017, 8:29 a.m.
Since this machine type is 5 chars while the existing ones only
were 3 (which the regexp assumed), the regexp has to be extended
a little.
---
 compat/windows/makedef | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Diego Biurrun Oct. 12, 2017, 5:03 p.m. | #1
On Thu, Oct 12, 2017 at 11:29:10AM +0300, Martin Storsjö wrote:
> Since this machine type is 5 chars while the existing ones only
> were 3 (which the regexp assumed), the regexp has to be extended
> a little.
> ---
>  compat/windows/makedef | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

OK

Diego

Patch

diff --git a/compat/windows/makedef b/compat/windows/makedef
index fd7959a..0cd169c 100755
--- a/compat/windows/makedef
+++ b/compat/windows/makedef
@@ -74,12 +74,12 @@  else
            tr '\t' ' ' |
            grep '^ \+.\+machine \+(.\+)' |
            head -1 |
-           sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(...\)).*/\1/')
+           sed -e 's/^ \{1,\}.\{1,\} \{1,\}machine \{1,\}(\(.\{3,5\}\)).*/\1/')
 
     if [ "${arch}" = "x86" ]; then
         prefix="_"
     else
-        if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ]; then
+        if [ "${arch}" != "ARM" ] && [ "${arch}" != "x64" ] && [ "${arch}" != "ARM64" ]; then
             echo "Unknown machine type." >&2
             exit 1
         fi