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, 2 deletions

diff --git a/tools/dumpobj.ml b/tools/dumpobj.ml
index be59438f31..8cb1b806c2 100644
--- a/tools/dumpobj.ml
+++ b/tools/dumpobj.ml
@@ -329,8 +329,9 @@ let dump_exe ic =
   if (let buff = String.create 12 in input ic buff 0 12; buff)
      <> exec_magic_number
   then raise Not_exec;
-  let trailer_pos = in_channel_length ic - 32 in
+  let trailer_pos = in_channel_length ic - 36 in
   seek_in ic trailer_pos;
+  let path_size = input_binary_int ic in
   let code_size = input_binary_int ic in
   let prim_size = input_binary_int ic in
   let data_size = input_binary_int ic in
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index af8b6082f1..5daa46c550 100644
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -41,12 +41,14 @@ module Options = Main_args.Make_options (struct
   let _impl s = option_with_arg "-impl" s
   let _intf s = option_with_arg "-intf" s
   let _linkall = option "-linkall"
+  let _make_runtime = option "-make_runtime"
   let _noassert = option "-noassert"
   let _o s = option_with_arg "-o" s
   let _output_obj = option "-output-obj"
   let _pp s = incompatible "-pp"
   let _thread () = incompatible "-thread"
   let _unsafe = option "-unsafe"
+  let _use_runtime s = option_with_arg "-use_runtime" s
   let _v = option "-v"
   let _verbose = option "-verbose"
   let _nopervasives = option "-nopervasives"
diff --git a/tools/ocamlsize b/tools/ocamlsize
index c8f2767a75..2981916885 100755
--- a/tools/ocamlsize
+++ b/tools/ocamlsize
@@ -2,16 +2,22 @@
 
 foreach $f (@ARGV) {
   open(FILE, $f) || die("Cannot open $f");
-  seek(FILE, -32, 2);
+  seek(FILE, -36, 2);
+  $path_size = do read_int();
   $code_size = do read_int();
   $prim_size = do read_int();
   $data_size = do read_int();
   $symbol_size = do read_int();
   $debug_size = do read_int();
   read(FILE, $magic, 12);
+  seek(FILE, -($path_size + $code_size + $prim_size + $data_size +
+               $symbol_size + $debug_size + 36), 2);
+  read(FILE, $path, $path_size);
   print $f, ":\n" if ($#ARGV > 0);
   printf ("\tcode: %d    data: %d    symbols: %d    debug: %d\n",
           $code_size, $data_size, $symbol_size, $debug_size);
+  printf ("\tmagic number: %s     runtime system: %s",
+          $magic, $path);
   close(FILE);
 }