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.

diff --git a/build-aux/build-mes.sh b/build-aux/build-mes.sh
index a7ca9ab57dabf09b63ab57dcc312081e85bf9939..d32150acbec57c76d8348bc86d2b1626c5fb09fe 100755 (executable)
--- 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 79ad02d9ccff9ddbfbb8b11a861aeeb86c57afa6..bc399e7c0bcb22acef7a68c5a382c6c44a0ccfb1 100755 (executable)
--- 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 49ee5671efb7fe3dca0fe0bd1baa3b10a1ce71c4..6060ae5f1c3a37cdc4b4a69556e498aa1d259c87 100644 (file)
--- 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)