From 6183816f83f30e6df2e4c08159d971892ce6058a Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Tue, 2 Jun 2020 00:03:03 +0200
Subject: [PATCH] Support and pass "-marm".

* build-aux/cflags.sh,
build-aux/check.sh.in: Pass "-marm" for ARM.
* module/mescc/mescc.scm: Accept it.
---
 build-aux/cflags.sh    | 6 ++++++
 build-aux/check.sh.in  | 3 +++
 module/mescc/mescc.scm | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/build-aux/cflags.sh b/build-aux/cflags.sh
index 2ce778a7..013e7dcd 100644
--- a/build-aux/cflags.sh
+++ b/build-aux/cflags.sh
@@ -50,6 +50,12 @@ if test $mes_libc = mes; then
 fi
 LIBS=-lc
 
+if test $mes_cpu = arm; then
+    AM_CFLAGS="$AM_CFLAGS
+-marm
+"
+fi
+
 export AM_CFLAGS CFLAGS
 export AM_CPPFLAGS CPPFLAGS
 export AM_LDFLAGS LDFLAGS
diff --git a/build-aux/check.sh.in b/build-aux/check.sh.in
index eaf1674a..94a0dbf8 100644
--- a/build-aux/check.sh.in
+++ b/build-aux/check.sh.in
@@ -35,6 +35,9 @@ if $courageous; then
 fi
 
 CFLAGS=
+if test $mes_cpu = arm; then
+    CFLAGS="-marm"
+fi
 if test $mes_libc = mes; then
     CFLAGS="${CFLAGS}
 -static
diff --git a/module/mescc/mescc.scm b/module/mescc/mescc.scm
index 8f50f8eb..9e0b9db2 100644
--- a/module/mescc/mescc.scm
+++ b/module/mescc/mescc.scm
@@ -299,7 +299,8 @@
          (arch (option-ref options 'arch #f)))
     (if machine (cond ((member arch '("x86" "x86_64")) (cond ((equal? machine "32") "x86")
                                                              ((equal? machine "64") "x86_64")))
-                      ((equal? arch "arm") (cond ((equal? machine "32") "arm"))))
+                      ((equal? arch "arm") (cond ((equal? machine "32") "arm")
+                                                 ((equal? machine "arm") "arm"))))
         arch)))
 
 (define (mescc:get-host options)