From 778fbd4f4895dc1b13fa394f641b677db08b3fba Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 6 Dec 2019 21:17:13 +0100 Subject: [PATCH] mescc: Fix for compiling handwritten .S assembly. * module/mescc/mescc.scm (mescc:compile): Handle .S. (mescc:link): Likewise. --- module/mescc/mescc.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/mescc/mescc.scm b/module/mescc/mescc.scm index a49c6afa..94a7380f 100644 --- a/module/mescc/mescc.scm +++ b/module/mescc/mescc.scm @@ -73,6 +73,7 @@ (input-base (basename input-file-name)) (M1-file-name (cond ((and (option-ref options 'compile #f) (option-ref options 'output #f))) + ((string-suffix? ".S" input-file-name) input-file-name) (else (replace-suffix input-base ".s")))) (infos (map (cut file->info options <>) files)) (verbose? (count-opt options 'verbose)) @@ -150,7 +151,8 @@ (hex2-files (append hex2-files hex2-libraries)) (s-files (append s-files (map (cut find-library options ".s" <>) libraries))) (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? (or (M1->blood-elf options s-files) (exit 1)))))