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

mescc: Fix for compiling handwritten .S assembly.

Browse source 
* module/mescc/mescc.scm (mescc:compile): Handle .S.
(mescc:link): Likewise.
This commit is contained in:
Jan Nieuwenhuizen 2019-12-06 21:17:13 +01:00
parent b4b20d6ac4
commit 778fbd4f48
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
module/mescc/mescc.scm
View file

@ -73,6 +73,7 @@
(input-base (basename input-file-name)) (input-base (basename input-file-name))
(M1-file-name (cond ((and (option-ref options 'compile #f) (M1-file-name (cond ((and (option-ref options 'compile #f)
(option-ref options 'output #f))) (option-ref options 'output #f)))
((string-suffix? ".S" input-file-name) input-file-name)
(else (replace-suffix input-base ".s")))) (else (replace-suffix input-base ".s"))))
(infos (map (cut file->info options <>) files)) (infos (map (cut file->info options <>) files))
(verbose? (count-opt options 'verbose)) (verbose? (count-opt options 'verbose))
@ -150,7 +151,8 @@
(hex2-files (append hex2-files hex2-libraries)) (hex2-files (append hex2-files hex2-libraries))
(s-files (append s-files (map (cut find-library options ".s" <>) libraries))) (s-files (append s-files (map (cut find-library options ".s" <>) libraries)))
(debug-info? (option-ref options 'debug-info #f)) (debug-info? (option-ref options 'debug-info #f))
(s-files (cons (replace-suffix input-file-name ".s") s-files)) (s-files (if (string-suffix? ".S" input-file-name) s-files
(cons (replace-suffix input-file-name ".s") s-files)))
(elf-footer (and debug-info? (elf-footer (and debug-info?
(or (M1->blood-elf options s-files) (or (M1->blood-elf options s-files)
(exit 1))))) (exit 1)))))