Separate machdep-config.h for each architecture

Author: sim642

src/dune

@@ -16,23 +16,31 @@
  (target machdep-config.h)
  (action (run ./machdepConfigure.exe)))
 
+(rule
+ (target machdep32-config.h)
+ (action (run ./machdepConfigure.exe -m 32)))
+
+(rule
+ (target machdep64-config.h)
+ (action (run ./machdepConfigure.exe -m 64)))
+
 (rule
  (deps machdep-config.h machdep-ml.c)
  (target machdep-ml.exe)
- (action (run %{read-lines:../bin/real-gcc} -D_GNUCC machdep-ml.c -o %{target})))
+ (action (run %{read-lines:../bin/real-gcc} -D_GNUCC -include machdep-config.h machdep-ml.c -o %{target})))
 
 (executable
  (name machdepArchConfigure)
  (modules machdepArchConfigure)
  (libraries dune-configurator))
 
 (rule
- (deps machdep-config.h machdep-ml.c)
+ (deps machdep32-config.h machdep-ml.c)
  (target machdep32)
  (action (with-stdout-to %{target} (run ./machdepArchConfigure.exe --real-gcc %{read-lines:../bin/real-gcc} -m 32))))
 
 (rule
- (deps machdep-config.h machdep-ml.c)
+ (deps machdep64-config.h machdep-ml.c)
  (target machdep64)
  (action (with-stdout-to %{target} (run ./machdepArchConfigure.exe --real-gcc %{read-lines:../bin/real-gcc} -m 64))))
 
@@ -44,13 +52,13 @@
 
 ; for Cilly.pm
 (rule
- (deps machdep-config.h machdep-ml.c)
+ (deps machdep32-config.h machdep-ml.c)
  (target gcc32model)
  (action (with-stdout-to %{target} (run ./modelConfigure.exe --real-gcc %{read-lines:../bin/real-gcc} -m 32))))
 
 ; for Cilly.pm
 (rule
- (deps machdep-config.h machdep-ml.c)
+ (deps machdep64-config.h machdep-ml.c)
  (target gcc64model)
  (action (with-stdout-to %{target} (run ./modelConfigure.exe --real-gcc %{read-lines:../bin/real-gcc} -m 64))))
 

src/machdep-ml.c

@@ -35,7 +35,8 @@
 
  */
 
-#include "machdep-config.h"
+// Correct config header is now included from command line using -include.
+// #include "machdep-config.h"
 
 #include <stdio.h>
 #include <string.h>

src/machdepArchConfigure.ml

@@ -10,7 +10,7 @@ let () =
   in
   C.main ~name:"model" ~args (fun c ->
       let exe = "./machdep" ^ !m ^ "-ml.exe" in
-      let {C.Process.exit_code; stdout; stderr} = C.Process.run c !real_gcc ["-D_GNUCC"; "-m" ^ !m; "machdep-ml.c"; "-o"; exe] in
+      let {C.Process.exit_code; stdout; stderr} = C.Process.run c !real_gcc ["-D_GNUCC"; "-include"; "machdep" ^ !m ^ "-config.h"; "-m" ^ !m; "machdep-ml.c"; "-o"; exe] in
       if exit_code = 0 then (
         let {C.Process.stdout; stderr; exit_code} = C.Process.run c exe [] in
         assert (exit_code = 0);

src/machdepConfigure.ml

@@ -1,13 +1,15 @@
 module C = Configurator.V1
 
+let c_flags = ref []
+
 let has_header_code f =
   Format.sprintf {|
 #include <%s>
 int main() { return 0; } // Just so that dune-configurator linking works
   |} f
 
 let has_header c f =
-  C.c_test c (has_header_code f)
+  C.c_test c ~c_flags:!c_flags (has_header_code f)
 
 let builtin_va_list_code = {|
 int
@@ -59,7 +61,7 @@ int main() { return 0; } // Just so that dune-configurator linking works
 exception FoundType of string
 
 let cil_check_integer_type_type c t1 t2 =
-  if C.c_test c (cil_check_integer_type_type_code t1 t2) then
+  if C.c_test c ~c_flags:!c_flags (cil_check_integer_type_type_code t1 t2) then
     raise (FoundType t2)
 
 let cil_check_integer_type_signs c t1 t2 =
@@ -78,13 +80,21 @@ let cil_check_integer_type c t1 =
     t2
 
 let () =
-  C.main ~name:"machdep" (fun c ->
-      let have_builtin_va_list = C.c_test c builtin_va_list_code in
-      let thread_is_keyword = not @@ C.c_test c thread_is_keyword_code in
-      let underscore_name = C.c_test c underscore_name_code in
-      let have_float16 = C.c_test c have_float16_code in
-
-      C.C_define.gen_header_file c ~fname:"machdep-config.h" [
+  let fname = ref "machdep-config.h" in
+  let args = Arg.[
+      ("-m", String (fun s ->
+          c_flags := ("-m" ^ s) :: !c_flags;
+          fname := "machdep" ^ s ^ "-config.h";
+        ), "");
+    ]
+  in
+  C.main ~name:"machdep" ~args (fun c ->
+      let have_builtin_va_list = C.c_test c ~c_flags:!c_flags builtin_va_list_code in
+      let thread_is_keyword = not @@ C.c_test c ~c_flags:!c_flags thread_is_keyword_code in
+      let underscore_name = C.c_test c ~c_flags:!c_flags underscore_name_code in
+      let have_float16 = C.c_test c ~c_flags:!c_flags have_float16_code in
+
+      C.C_define.gen_header_file c ~fname:!fname [
         ("HAVE_STDLIB_H", Switch (has_header c "stdlib.h"));
         ("HAVE_WCHAR_H", Switch (has_header c "wchar.h"));
         ("HAVE_STDBOOL_H", Switch (has_header c "stdbool.h"));

src/modelConfigure.ml

@@ -10,7 +10,7 @@ let () =
   in
   C.main ~name:"model" ~args (fun c ->
       let exe = "./machdep-ml" ^ !m ^ ".exe" in
-      let {C.Process.exit_code; stdout; stderr} = C.Process.run c !real_gcc ["-D_GNUCC"; "-m" ^ !m; "machdep-ml.c"; "-o"; exe] in
+      let {C.Process.exit_code; stdout; stderr} = C.Process.run c !real_gcc ["-D_GNUCC"; "-include"; "machdep" ^ !m ^ "-config.h"; "-m" ^ !m; "machdep-ml.c"; "-o"; exe] in
       if exit_code = 0 then (
         let {C.Process.stdout; stderr; exit_code} = C.Process.run c exe ["--env"] in
         assert (exit_code = 0);