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

mescc: Update to mescc-tools-1.0.0 option names.

Browse source 
* module/mescc/mescc.scm (M1->hex2):  Update to use --little-endian.
(hex2->elf): Likewise, and --base-address.
* module/mescc/mescc.scm (hex2->elf): Likewise, and remove
--exec_enable.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2021-10-10 09:06:50 +02:00
parent dab3e3a751
commit c22c1a82d9
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
module/mescc/mescc.scm
View file

@ -199,7 +199,7 @@
(verbose? (count-opt options 'verbose)) (verbose? (count-opt options 'verbose))
(M1 (or (getenv "M1") "M1")) (M1 (or (getenv "M1") "M1"))
(command `(,M1 (command `(,M1
"--LittleEndian" "--little-endian"
,@(arch-get-architecture options) ,@(arch-get-architecture options)
"-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)
@ -226,16 +226,15 @@
(option-ref options 'nostdlib #f)) '() (option-ref options 'nostdlib #f)) '()
`("-f" ,(arch-find options "crt1.o")))) `("-f" ,(arch-find options "crt1.o"))))
(command `(,hex2 (command `(,hex2
"--LittleEndian" "--little-endian"
,@(arch-get-architecture options) ,@(arch-get-architecture options)
"--BaseAddress" ,base-address "--base-address" ,base-address
"-f" ,(kernel-find "-f" ,(kernel-find
options options
(string-append "elf" machine "-header.hex2")) (string-append "elf" machine "-header.hex2"))
,@start-files ,@start-files
,@(append-map (cut list "-f" <>) hex2-files) ,@(append-map (cut list "-f" <>) hex2-files)
"-f" ,elf-footer "-f" ,elf-footer
"--exec_enable"
"-o" ,elf-file-name))) "-o" ,elf-file-name)))
(when (and verbose? (> verbose? 1)) (when (and verbose? (> verbose? 1))
(stderr "~a\n" (string-join command))) (stderr "~a\n" (string-join command)))
@ -250,10 +249,10 @@
(verbose? (count-opt options 'verbose)) (verbose? (count-opt options 'verbose))
(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") '())
"-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)))
(when (and verbose? (> verbose? 1)) (when (and verbose? (> verbose? 1))
(format (current-error-port) "~a\n" (string-join command))) (format (current-error-port) "~a\n" (string-join command)))
(and (zero? (apply assert-system* command)) (and (zero? (apply assert-system* command))