From a27770389ecfae56de55242d9ababca763d747c4 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 16 Jun 2018 06:38:05 +0200
Subject: [PATCH] Update for mescc-tools-0.5.

* build-aux/build-mes.sh (HEX2FLAGS): Remove = from flags.
* build.sh (HEX2FLAGS): Likewise.
* module/mescc/mescc.scm (hex2->elf): Likewise.
---
 build-aux/build-mes.sh | 10 +++++-----
 build.sh               |  6 +++---
 module/mescc/mescc.scm |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build-aux/build-mes.sh b/build-aux/build-mes.sh
index a7ca9ab5..d32150ac 100755
--- a/build-aux/build-mes.sh
+++ b/build-aux/build-mes.sh
@@ -44,12 +44,12 @@ set -e
 
 M1FLAGS=${M1FLAGS-"
 --LittleEndian
---Architecture=1
+--Architecture 1
 "}
 HEX2FLAGS=${HEX2FLAGS-"
 --LittleEndian
---Architecture=1
---BaseAddress=0x1000000
+--Architecture 1
+--BaseAddress 0x1000000
 "}
 
 if [ -d "$MES_SEED" ]; then
@@ -65,7 +65,7 @@ if [ -d "$MES_SEED" ]; then
         -o lib/x86-mes/libc.o
     $M1\
         --LittleEndian\
-        --Architecture=1\
+        --Architecture 1\
         -f lib/x86-mes/x86.M1\
         -f $MES_SEED/x86-mes/mes.S\
         -o src/mes.o
@@ -76,7 +76,7 @@ if [ -d "$MES_SEED" ]; then
         -o src/mes.S.blood-elf
     $M1\
         --LittleEndian\
-        --Architecture=1\
+        --Architecture 1\
         -f src/mes.S.blood-elf\
         -o src/mes.o.blood-elf
     $HEX2\
diff --git a/build.sh b/build.sh
index 79ad02d9..bc399e7c 100755
--- a/build.sh
+++ b/build.sh
@@ -68,12 +68,12 @@ MESCCLAGS=${MESCCFLAGS-"
 "}
 M1FLAGS=${M1FLAGS-"
 --LittleEndian
---Architecture=1
+--Architecture 1
 "}
 HEX2FLAGS=${HEX2FLAGS-"
 --LittleEndian
---Architecture=1
---BaseAddress=0x1000000
+--Architecture 1
+--BaseAddress 0x1000000
 "}
 
 if [ -n "$GUILE" ]; then
diff --git a/module/mescc/mescc.scm b/module/mescc/mescc.scm
index 49ee5671..6060ae5f 100644
--- a/module/mescc/mescc.scm
+++ b/module/mescc/mescc.scm
@@ -154,7 +154,7 @@
          (M1 (or (getenv "M1") "M1"))
          (command `(,M1
                     "--LittleEndian"
-                    "--Architecture=1"
+                    "--Architecture" "1"
                     "-f" ,(arch-find options "x86.M1")
                     ,@(append-map (cut list "-f" <>) M1-files)
                     "-o" ,hex2-file-name)))
@@ -172,8 +172,8 @@
          (hex2 (or (getenv "HEX2") "hex2"))
          (command `(,hex2
                     "--LittleEndian"
-                    "--Architecture=1"
-                    "--BaseAddress=0x1000000"
+                    "--Architecture" "1"
+                    "--BaseAddress" "0x1000000"
                     "-f" ,(arch-find options "elf32-header.hex2")
                     "-f" ,(arch-find options "crt1.o")
                     ,@(append-map (cut list "-f" <>) hex2-files)