Avoid multiple declarations in generated .c files in -output-obj

In -output-obj mode, <caml/mlvalues.h> (which contains some
primitives) is included in the generated .c file, leading to errors
when compiling with g++ (multiple declarations).

There are probably better implementations (in particular, in this one,
care must be taken when changing the list of primitives available in
mlvalues.h), but this is a small and (not too) intrusive patch.

Bug: http://caml.inria.fr/mantis/view.php?id=5254
Signed-off-by: Stephane Glondu <steph@glondu.net>
Gbp-Pq: Name 0007-Avoid-multiple-declarations-in-generated-.c-files-in.patch

diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index 20983668c4cd2fcf290a85f91912c5022b6003d5..87a58ab77c9710cf2f10e736b918b42c1abb7641 100644 (file)
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -421,6 +421,19 @@ let output_cds_file outfile =
     remove_file outfile;
     raise x
 
+(* List of primitives declared in caml/mlvalues.h, to avoid duplicate
+   declarations in generated .c files *)
+
+let mlvalues_primitives = [
+  "caml_get_public_method";
+  "caml_hash_variant";
+  "caml_string_length";
+  "caml_Double_val";
+  "caml_Store_double_val";
+  "caml_Int64_val";
+  "caml_atom_table";
+]
+
 (* Output a bytecode executable as a C file *)
 
 let link_bytecode_as_c ppf tolink outfile =
@@ -463,7 +476,7 @@ let link_bytecode_as_c ppf tolink outfile =
       (Marshal.to_string sections []);
     output_string outchan "\n};\n\n";
     (* The table of primitives *)
-    Symtable.output_primitive_table outchan;
+    Symtable.output_primitive_table outchan mlvalues_primitives;
     (* The entry point *)
     output_string outchan "\
 \nvoid caml_startup(char ** argv)\
@@ -544,7 +557,7 @@ let link ppf objfiles output_name =
         #else\n\
         typedef long value;\n\
         #endif\n";
-      Symtable.output_primitive_table poc;
+      Symtable.output_primitive_table poc [];
       output_string poc "\
         #ifdef __cplusplus\n\
         }\n\

diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml
index 63374f82045152b3ff879b270b10f9f1843b20bf..cf72528e2e20d8d0c4309f19cdb853655eac1b6a 100644 (file)
--- a/bytecomp/symtable.ml
+++ b/bytecomp/symtable.ml
@@ -113,15 +113,17 @@ let output_primitive_names outchan =
 
 open Printf
 
-let output_primitive_table outchan =
+let output_primitive_table outchan blacklist =
   let prim = all_primitives() in
   for i = 0 to Array.length prim - 1 do
-    fprintf outchan "extern value %s();\n" prim.(i)
+    let p = prim.(i) in
+    if not (List.mem p blacklist) then
+      fprintf outchan "extern value %s();\n" p
   done;
   fprintf outchan "typedef value (*primitive)();\n";
   fprintf outchan "primitive caml_builtin_cprim[] = {\n";
   for i = 0 to Array.length prim - 1 do
-    fprintf outchan "  %s,\n" prim.(i)
+    fprintf outchan "  (primitive)%s,\n" prim.(i)
   done;
   fprintf outchan "  (primitive) 0 };\n";
   fprintf outchan "const char * caml_names_of_builtin_cprim[] = {\n";

diff --git a/bytecomp/symtable.mli b/bytecomp/symtable.mli
index e3c33d23965ba4b82a8effec60f6cc9cc1dede25..597d012762a23d1615fef0c45cabbc11916ac8dd 100644 (file)
--- a/bytecomp/symtable.mli
+++ b/bytecomp/symtable.mli
@@ -23,7 +23,7 @@ val require_primitive: string -> unit
 val initial_global_table: unit -> Obj.t array
 val output_global_map: out_channel -> unit
 val output_primitive_names: out_channel -> unit
-val output_primitive_table: out_channel -> unit
+val output_primitive_table: out_channel -> string list -> unit
 val data_global_map: unit -> Obj.t
 val data_primitive_names: unit -> string