--- ../ocaml-3.09.2/tools/ocamlcp.ml	2005-05-09 15:39:17.000000000 +0200
+++ ./tools/ocamlcp.ml	2006-05-21 14:46:16.000000000 +0200
@@ -123,7 +123,7 @@
 if !with_intf then profargs := "-intf" :: !profargs;
 let status =
   Sys.command
-    (Printf.sprintf "ocamlc -pp \"ocamlprof -instrument %s\" %s %s"
+    (Printf.sprintf "ocamlc -pp \"ocamlprof -w a -instrument %s\" %s %s"
         (String.concat " " (List.rev !profargs))
         (if !make_archive then "" else "profiling.cmo")
         (String.concat " " (List.rev !compargs)))
--- ../ocaml-3.09.2/tools/ocamlprof.ml	2005-03-24 18:20:54.000000000 +0100
+++ ./tools/ocamlprof.ml	2006-05-21 14:20:34.000000000 +0200
@@ -461,7 +461,28 @@
        "-instrument", Arg.Set instr_mode, "  (undocumented)";
        "-intf", Arg.String process_intf_file,
                 "<file>  Process <file> as a .mli file";
-       "-m", Arg.String (fun s -> modes := s), "<flags>    (undocumented)"
+       "-m", Arg.String (fun s -> modes := s), "<flags>    (undocumented)";
+       "-w", Arg.String (Warnings.parse_options false),
+             "<flags>  Enable or disable warnings according to <flags>:\n\
+         \032    C/c enable/disable suspicious comment\n\
+         \032    D/d enable/disable deprecated features\n\
+         \032    E/e enable/disable fragile match\n\
+         \032    F/f enable/disable partially applied function\n\
+         \032    L/l enable/disable labels omitted in application\n\
+         \032    M/m enable/disable overriden methods\n\
+         \032    P/p enable/disable partial match\n\
+         \032    S/s enable/disable non-unit statement\n\
+         \032    U/u enable/disable unused match case\n\
+         \032    V/v enable/disable hidden instance variables\n\
+         \032    Y/y enable/disable suspicious unused variables\n\
+         \032    Z/z enable/disable all other unused variables\n\
+         \032    X/x enable/disable all other warnings\n\
+         \032    A/a enable/disable all warnings\n\
+         \032    default setting is \"Aelz\"";
+       "-warn-error" , Arg.String (Warnings.parse_options true),
+        "<flags>  Treat the warnings of <flags> as errors, if they are\n\
+         \     enabled.  See option -w for the list of flags.\n\
+         \     Default setting is \"a\" (warnings are not errors)"
       ] process_anon_file usage;
     exit 0
   with x ->