artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Depend on mescc-tools 1.4.0.

Browse source 
* 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.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2022-05-02 07:46:01 +02:00
parent d0e5f812f3
commit aa128eaa92
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
11 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure vendored
View file

@ -454,9 +454,9 @@ Some influential environment variables:
(deps (fold (lambda (program results) (deps (fold (lambda (program results)
(cons (check-program-version program) results)) (cons (check-program-version program) results))
'() '()
(list (make-dep "hex2" #:version '(1 0 0)) (list (make-dep "hex2" #:version '(1 4 0))
(make-dep "M1" #:version '(1 0 0)) (make-dep "M1" #:version '(1 4 0))
(make-dep "blood-elf" #:version '(1 0 0)) (make-dep "blood-elf" #:version '(2 0 0))
(make-dep "kaem" #:version '(1 0 0) #:optional? #t) (make-dep "kaem" #:version '(1 0 0) #:optional? #t)
(make-dep "M2-Planet" #:version '(1 8 0) #:optional? #t) (make-dep "M2-Planet" #:version '(1 8 0) #:optional? #t)
(make-dep "diff" #:optional? #t) (make-dep "diff" #:optional? #t)

2
kaem.run
View file

@ -118,7 +118,7 @@ M2-Planet \
-f src/vector.c \ -f src/vector.c \
-o m2/mes.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

1
module/mescc/mescc.scm
View file

@ -251,6 +251,7 @@
(blood-elf (or (getenv "BLOOD_ELF") "blood-elf")) (blood-elf (or (getenv "BLOOD_ELF") "blood-elf"))
(command `(,blood-elf (command `(,blood-elf
,@(if (equal? (arch-get-machine options) "64") '("--64") '()) ,@(if (equal? (arch-get-machine options) "64") '("--64") '())
"--little-endian"
"-f" ,(arch-find options (arch-get-m1-macros options)) "-f" ,(arch-find options (arch-get-m1-macros options))
,@(append-map (cut list "-f" <>) M1-files) ,@(append-map (cut list "-f" <>) M1-files)
"-o" ,M1-blood-elf-footer))) "-o" ,M1-blood-elf-footer)))

2
scaffold/argv.kaem
View file

@ -38,7 +38,7 @@ M2-Planet \
-f scaffold/argv.c \ -f scaffold/argv.c \
-o scaffold/argv.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

2
scaffold/global-array.kaem
View file

@ -37,7 +37,7 @@ M2-Planet \
-f scaffold/global-array.c \ -f scaffold/global-array.c \
-o scaffold/global-array.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

2
scaffold/hello.kaem
View file

@ -37,7 +37,7 @@ M2-Planet \
-f scaffold/hello.c \ -f scaffold/hello.c \
-o scaffold/hello.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

2
scaffold/local-array.kaem
View file

@ -37,7 +37,7 @@ M2-Planet \
-f scaffold/local-array.c \ -f scaffold/local-array.c \
-o scaffold/local-array.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

2
scaffold/local-static-array.kaem
View file

@ -37,7 +37,7 @@ M2-Planet \
-f scaffold/local-static-array.c \ -f scaffold/local-static-array.c \
-o scaffold/local-static-array.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

2
scaffold/main.kaem
View file

@ -31,7 +31,7 @@ M2-Planet \
-f scaffold/main.c \ -f scaffold/main.c \
-o scaffold/main.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

2
scaffold/read.kaem
View file

@ -49,7 +49,7 @@ M2-Planet \
-f scaffold/read.c \ -f scaffold/read.c \
-o scaffold/read.M1 -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 \ M1 \
--architecture ${stage0_cpu} \ --architecture ${stage0_cpu} \

3
simple.make
View file

@ -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_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 m2/mes-m2.blood-elf.M1: m2/mes-m2.M1
# blood-elf --32 -f $< -o $@ blood-elf --little-endian -f $< -o $@
blood-elf -f $< -o $@
m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1 m2/mes-m2.hex2: m2/mes-m2.blood-elf.M1
M1 \ M1 \