From aa128eaa925c68c390999d3d9b0c79fa93945dc4 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Mon, 2 May 2022 07:46:01 +0200 Subject: [PATCH] build: Depend on mescc-tools 1.4.0. * configure (main): Check for hex2, M1 1.4.0, and blood-elf 2.0.0. * module/mescc/mescc.scm (M1->blood-elf): Use --little-endian with blood-elf call. * kaem.run, scaffold/argv.kaem, scaffold/global-array.kaem, scaffold/hello.kaem, scaffold/local-array.kaem, scaffold/local-static-array.kaem, scaffold/main.kaem, scaffold/read.kaem, simple.make: Likewise. --- configure | 6 +++--- kaem.run | 2 +- module/mescc/mescc.scm | 1 + scaffold/argv.kaem | 2 +- scaffold/global-array.kaem | 2 +- scaffold/hello.kaem | 2 +- scaffold/local-array.kaem | 2 +- scaffold/local-static-array.kaem | 2 +- scaffold/main.kaem | 2 +- scaffold/read.kaem | 2 +- simple.make | 3 +-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 72b3bebd..55204cbc 100755 --- a/configure +++ b/configure @@ -454,9 +454,9 @@ Some influential environment variables: (deps (fold (lambda (program results) (cons (check-program-version program) results)) '() - (list (make-dep "hex2" #:version '(1 0 0)) - (make-dep "M1" #:version '(1 0 0)) - (make-dep "blood-elf" #:version '(1 0 0)) + (list (make-dep "hex2" #:version '(1 4 0)) + (make-dep "M1" #:version '(1 4 0)) + (make-dep "blood-elf" #:version '(2 0 0)) (make-dep "kaem" #:version '(1 0 0) #:optional? #t) (make-dep "M2-Planet" #:version '(1 8 0) #:optional? #t) (make-dep "diff" #:optional? #t) diff --git a/kaem.run b/kaem.run index 8e40a531..3c78e39a 100644 --- a/kaem.run +++ b/kaem.run @@ -118,7 +118,7 @@ M2-Planet \ -f src/vector.c \ -o m2/mes.M1 -blood-elf -f m2/mes.M1 -o m2/mes.blood-elf-M1 +blood-elf --little-endian -f m2/mes.M1 -o m2/mes.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/module/mescc/mescc.scm b/module/mescc/mescc.scm index ef7e22d7..ce79a3c0 100644 --- a/module/mescc/mescc.scm +++ b/module/mescc/mescc.scm @@ -251,6 +251,7 @@ (blood-elf (or (getenv "BLOOD_ELF") "blood-elf")) (command `(,blood-elf ,@(if (equal? (arch-get-machine options) "64") '("--64") '()) + "--little-endian" "-f" ,(arch-find options (arch-get-m1-macros options)) ,@(append-map (cut list "-f" <>) M1-files) "-o" ,M1-blood-elf-footer))) diff --git a/scaffold/argv.kaem b/scaffold/argv.kaem index 7da43379..6f29b008 100644 --- a/scaffold/argv.kaem +++ b/scaffold/argv.kaem @@ -38,7 +38,7 @@ M2-Planet \ -f scaffold/argv.c \ -o scaffold/argv.M1 -blood-elf -f scaffold/argv.M1 -o scaffold/argv.blood-elf-M1 +blood-elf --little-endian -f scaffold/argv.M1 -o scaffold/argv.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/scaffold/global-array.kaem b/scaffold/global-array.kaem index 40f0c5b4..121488df 100644 --- a/scaffold/global-array.kaem +++ b/scaffold/global-array.kaem @@ -37,7 +37,7 @@ M2-Planet \ -f scaffold/global-array.c \ -o scaffold/global-array.M1 -blood-elf -f scaffold/global-array.M1 -o scaffold/global-array.blood-elf-M1 +blood-elf --little-endian -f scaffold/global-array.M1 -o scaffold/global-array.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/scaffold/hello.kaem b/scaffold/hello.kaem index 0482f95b..a0eae1ff 100644 --- a/scaffold/hello.kaem +++ b/scaffold/hello.kaem @@ -37,7 +37,7 @@ M2-Planet \ -f scaffold/hello.c \ -o scaffold/hello.M1 -blood-elf -f scaffold/hello.M1 -o scaffold/hello.blood-elf-M1 +blood-elf --little-endian -f scaffold/hello.M1 -o scaffold/hello.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/scaffold/local-array.kaem b/scaffold/local-array.kaem index 862435e3..164877ba 100644 --- a/scaffold/local-array.kaem +++ b/scaffold/local-array.kaem @@ -37,7 +37,7 @@ M2-Planet \ -f scaffold/local-array.c \ -o scaffold/local-array.M1 -blood-elf -f scaffold/local-array.M1 -o scaffold/local-array.blood-elf-M1 +blood-elf --little-endian -f scaffold/local-array.M1 -o scaffold/local-array.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/scaffold/local-static-array.kaem b/scaffold/local-static-array.kaem index b5e40b5f..0878f41f 100644 --- a/scaffold/local-static-array.kaem +++ b/scaffold/local-static-array.kaem @@ -37,7 +37,7 @@ M2-Planet \ -f scaffold/local-static-array.c \ -o scaffold/local-static-array.M1 -blood-elf -f scaffold/local-static-array.M1 -o scaffold/local-static-array.blood-elf-M1 +blood-elf --little-endian -f scaffold/local-static-array.M1 -o scaffold/local-static-array.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/scaffold/main.kaem b/scaffold/main.kaem index b91ada9a..6fc079f0 100644 --- a/scaffold/main.kaem +++ b/scaffold/main.kaem @@ -31,7 +31,7 @@ M2-Planet \ -f scaffold/main.c \ -o scaffold/main.M1 -blood-elf -f scaffold/main.M1 -o scaffold/main.blood-elf-M1 +blood-elf --little-endian -f scaffold/main.M1 -o scaffold/main.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/scaffold/read.kaem b/scaffold/read.kaem index ffd976cb..b29cf1f8 100644 --- a/scaffold/read.kaem +++ b/scaffold/read.kaem @@ -49,7 +49,7 @@ M2-Planet \ -f scaffold/read.c \ -o scaffold/read.M1 -blood-elf -f scaffold/read.M1 -o scaffold/read.blood-elf-M1 +blood-elf --little-endian -f scaffold/read.M1 -o scaffold/read.blood-elf-M1 M1 \ --architecture ${stage0_cpu} \ diff --git a/simple.make b/simple.make index 6626e7d7..e6f87b5e 100644 --- a/simple.make +++ b/simple.make @@ -202,8 +202,7 @@ m2/mes-m2.M1: simple.make $(M2_PLANET_SOURCES) $(MES_SOURCES) $(M2_PLANET_INCLUD $(M2_PLANET) $(M2_PLANET_FLAGS) $(M2_PLANET_SOURCES:%=-f %) $(MES_SOURCES:%.c=-f %.c) -o $@ || rm -f $@ m2/mes-m2.blood-elf.M1: m2/mes-m2.M1 -# blood-elf --32 -f $< -o $@ - blood-elf -f $< -o $@ + blood-elf --little-endian -f $< -o $@ m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1 M1 \