Handle -march properly

Signed-off-by: Kakadu <Kakadu@pm.me>

runtime32/Makefile

@@ -1,4 +1,4 @@
-RUNTIME=runtime32.a
+RUNTIME=runtime.a
 
 .DEFAULT  := $(RUNTIME)
 

runtime32/dune

@@ -1,5 +1,5 @@
 (rule
- (target runtime32.a)
+ (target runtime.a)
  (mode
   (promote (until-clean)))
  (deps Makefile gc_runtime.s runtime.c runtime.h)

src/Driver.ml

@@ -22,8 +22,8 @@ let[@ocaml.warning "-32"] main =
               try
                 let r = read_int () in
                 Printf.printf "> ";
-                read (acc @ [ r ])
+                read (r :: acc)
-              with End_of_file -> acc
+              with End_of_file -> List.rev acc
             in
             let input = read [] in
             let output =

src/Options.ml

@@ -80,7 +80,7 @@ class options args =
                     raise
                       (Commandline_error "Path expected after '-I' specifier")
                 | Some path -> self#add_include_path path)
-            | "-march=amd64" -> march := `AMD64
+            | "-march=x86_64" | "-march=amd64" -> march := `AMD64
             | "-march=x86" -> march := `X86_32
             | "-s" -> self#set_mode `SM
             | "-b" -> self#set_mode `BC

src/X86_32.ml

@@ -841,8 +841,7 @@ let build cmd prog =
      let objs = find_objects (fst @@ fst prog) cmd#get_include_paths in
      let buf  = Buffer.create 255 in
      List.iter (fun o -> Buffer.add_string buf o; Buffer.add_string buf " ") objs;
-     let gcc_cmdline = Printf.sprintf "gcc %s -m32 %s %s.s %s %s/runtime32.a" cmd#get_debug cmd#get_output_option cmd#basename (Buffer.contents buf) inc in
+     let gcc_cmdline = Printf.sprintf "gcc %s -m32 %s %s.s %s %s/runtime.a" cmd#get_debug cmd#get_output_option cmd#basename (Buffer.contents buf) inc in
-     Printf.printf " > %s\n%!" gcc_cmdline;
      Sys.command gcc_cmdline
   | `Compile ->
      Sys.command (Printf.sprintf "gcc %s -m32 -c %s.s" cmd#get_debug cmd#basename)

src/X86_64.ml

@@ -1464,7 +1464,13 @@ let build cmd prog =
   cmd#dump_file "s" (genasm cmd prog);
   cmd#dump_file "i" (Interface.gen prog);
   let compiler =
-    match cmd#target_os with Darwin -> "clang" | Linux -> "gcc"
+    match (cmd#target_os, cmd#march) with
+    | Darwin, `AMD64 -> "clang"
+    | Darwin, `X86_32 ->
+        Printf.eprintf "X86_32 on darwin is not supported\n";
+        exit 1
+    | Linux, `AMD64 -> "gcc"
+    | Linux, `X86_32 -> "gcc -m32"
   in
   let compiler_flags, linker_flags =
     match cmd#target_os with
@@ -1489,7 +1495,9 @@ let build cmd prog =
       in
       Sys.command gcc_cmdline
   | `Compile ->
-      Sys.command
+      let cmd =
-        (Printf.sprintf "%s %s %s -c -g %s.s" compiler compiler_flags
+        Printf.sprintf "%s %s %s -c -g %s.s" compiler compiler_flags debug_flags
-           debug_flags cmd#basename)
+          cmd#basename
+      in
+      Sys.command cmd
   | _ -> invalid_arg "must not happen"

stdlib/.gitignore

@@ -3,3 +3,7 @@
 /*.log
 *.i
 *.s
+*.exe
+*.x32.exe 
+*.x64.exe
+

stdlib/Makefile

@@ -2,7 +2,9 @@
 
 SHELL := /bin/bash
 SRCDIR ?= .
+$(info SRCDIR = $(SRCDIR))
 FILES ?= $(wildcard $(SRCDIR)/*.lama)
+$(info FILES = $(FILES))
 OFILES = $(FILES:$(SRCDIR)/%=%)
 OFILES := $(OFILES:.lama=.o)
 $(info OFILES = $(OFILES))
@@ -11,7 +13,7 @@ LAMAC ?= ../src/lamac
 BDIR ?= .
 
 all: $(addprefix $(BDIR)/,$(ALL))
-$(info ALL = $(ALL))
+$(info ALL = $(ALL), SRCDIR = $(SRCDIR))
 $(BDIR)/Fun.o: $(BDIR)/Ref.o
 
 $(BDIR)/Data.o: $(BDIR)/Ref.o $(BDIR)/Collection.o

stdlib/x32/dune

@@ -3,6 +3,19 @@
   ../Makefile
   ../../runtime/Std.i
   ../List.lama
+  ../Array.lama
+  ../Buffer.lama
+  ../Collection.lama
+  ../Data.lama
+  ../Fun.lama
+  ../Lazy.lama
+  ../List.lama
+  ../Matcher.lama
+  ../Ostap.lama
+  ../Random.lama
+  ../Ref.lama
+  ../STM.lama
+  ../Timer.lama
   %{project_root}/src/Driver.exe)
  (targets
   List.i
@@ -48,5 +61,3 @@
       LAMAC
       "../../src/Driver.exe -march=x86 -I ../runtime32"
       (run make -j2 -f ../Makefile all)))))))
-
-;)

stdlib/x64/dune

@@ -3,6 +3,19 @@
   ../Makefile
   ../../runtime/Std.i
   ../List.lama
+  ../Array.lama
+  ../Buffer.lama
+  ../Collection.lama
+  ../Data.lama
+  ../Fun.lama
+  ../Lazy.lama
+  ../List.lama
+  ../Matcher.lama
+  ../Ostap.lama
+  ../Random.lama
+  ../Ref.lama
+  ../STM.lama
+  ../Timer.lama
   %{project_root}/src/Driver.exe)
  (targets
   List.i