Ajout des options -make_runtime et -use_runtime

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1920 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

3 files changed, 11 insertions, 0 deletions

diff --git a/driver/main.ml b/driver/main.ml
index b10f087a2d..66f9ff8859 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -64,12 +64,15 @@ module Options = Main_args.Make_options (struct
   let _impl = process_implementation_file
   let _intf = process_interface_file
   let _linkall = set link_everything
+  let _make_runtime () =
+    custom_runtime := true; make_runtime := true; link_everything := true
   let _noassert = set noassert
   let _o s = exec_name := s; archive_name := s; object_name := s
   let _output_obj () = output_c_object := true; custom_runtime := true
   let _pp s = preprocessor := Some s
   let _thread = set thread_safe
   let _unsafe = set fast
+  let _use_runtime s = use_runtime := s
   let _v = print_version_number
   let _verbose = set verbose
   let _nopervasives = set nopervasives
diff --git a/driver/main_args.ml b/driver/main_args.ml
index afa6d2dcc2..bca830a931 100644
--- a/driver/main_args.ml
+++ b/driver/main_args.ml
@@ -24,12 +24,14 @@ module Make_options (F :
      val _impl : string -> unit
      val _intf : string -> unit
      val _linkall : unit -> unit
+     val _make_runtime : unit -> unit
      val _noassert : unit -> unit
      val _o : string -> unit
      val _output_obj : unit -> unit
      val _pp : string -> unit
      val _thread : unit -> unit
      val _unsafe : unit -> unit
+     val _use_runtime : string -> unit
      val _v : unit -> unit
      val _verbose : unit -> unit
      val _nopervasives : unit -> unit
@@ -53,6 +55,8 @@ struct
      "-impl", Arg.String F._impl, "<file>  Compile <file> as a .ml file";
      "-intf", Arg.String F._intf, "<file>  Compile <file> as a .mli file";
      "-linkall", Arg.Unit F._linkall, " Link all modules, even unused ones";
+     "-make_runtime", Arg.Unit F._make_runtime,
+            " Build a runtime system with given C objects and libraries";
      "-noassert", Arg.Unit F._noassert, " Do not compile assertion checks";
      "-o", Arg.String F._o, "<file>  Set output file name to <file>";
      "-output-obj", Arg.Unit F._output_obj,
@@ -62,6 +66,8 @@ struct
      "-thread", Arg.Unit F._thread, " Use thread-safe standard library";
      "-unsafe", Arg.Unit F._unsafe,
                              " No bounds checking on array and string access";
+     "-use_runtime", Arg.String F._use_runtime,
+                   "<path> Generate bytecode for the given runtime system";
      "-v", Arg.Unit F._v, " Print compiler version number";
      "-verbose", Arg.Unit F._verbose, " Print calls to external commands";
 
diff --git a/driver/main_args.mli b/driver/main_args.mli
index 0337583ae5..ff7aaa81de 100644
--- a/driver/main_args.mli
+++ b/driver/main_args.mli
@@ -24,12 +24,14 @@ module Make_options (F :
       val _impl : string -> unit
       val _intf : string -> unit
       val _linkall : unit -> unit
+      val _make_runtime : unit -> unit
       val _noassert : unit -> unit
       val _o : string -> unit
       val _output_obj : unit -> unit
       val _pp : string -> unit
       val _thread : unit -> unit
       val _unsafe : unit -> unit
+      val _use_runtime : string -> unit
       val _v : unit -> unit
       val _verbose : unit -> unit
       val _nopervasives : unit -> unit