diff -C 3 -r ocaml-3.12.1-orig/otherlibs/threads/pervasives.ml ocaml-3.12.1/otherlibs/threads/pervasives.ml
*** ocaml-3.12.1-orig/otherlibs/threads/pervasives.ml	2010-06-09 12:23:48.000000000 +0200
--- ocaml-3.12.1/otherlibs/threads/pervasives.ml	2012-01-09 14:39:42.240069000 +0100
***************
*** 17,22 ****
--- 17,28 ----
     been redefined to not block the whole process, but only the calling
     thread. *)

+ external int_of_int : int -> int = "%identity"
+ external int32_of_int32 : int32 -> int32 = "%identity"
+ external int64_of_int64 : int64 -> int64 = "%identity"
+ external nativeint_of_nativeint : nativeint -> nativeint = "%identity"
+ external float_of_float : float -> float = "%identity"
+
  (* type 'a option = None | Some of 'a *)

  (* Exceptions *)
diff -C 3 -r ocaml-3.12.1-orig/parsing/parser.mly ocaml-3.12.1/parsing/parser.mly
*** ocaml-3.12.1-orig/parsing/parser.mly	2011-04-29 06:56:21.000000000 +0200
--- ocaml-3.12.1/parsing/parser.mly	2012-01-05 15:38:50.612043006 +0100
***************
*** 83,100 ****
    then String.sub f 1 (String.length f - 1)
    else "-" ^ f

  let mkuminus name arg =
    match name, arg.pexp_desc with
    | "-", Pexp_constant(Const_int n) ->
!       mkexp(Pexp_constant(Const_int(-n)))
    | "-", Pexp_constant(Const_int32 n) ->
!       mkexp(Pexp_constant(Const_int32(Int32.neg n)))
    | "-", Pexp_constant(Const_int64 n) ->
!       mkexp(Pexp_constant(Const_int64(Int64.neg n)))
    | "-", Pexp_constant(Const_nativeint n) ->
!       mkexp(Pexp_constant(Const_nativeint(Nativeint.neg n)))
    | ("-" | "-."), Pexp_constant(Const_float f) ->
!       mkexp(Pexp_constant(Const_float(neg_float_string f)))
    | _ ->
        mkexp(Pexp_apply(mkoperator ("~" ^ name) 1, ["", arg]))

--- 83,122 ----
    then String.sub f 1 (String.length f - 1)
    else "-" ^ f

+ let pexp_constant cst =
+   if !Clflags.wrap_constants then
+     match cst with
+         Const_string _
+       | Const_char _ ->
+         Pexp_constant cst
+       | _ ->
+         let name =
+           match cst with
+               Const_string _
+             | Const_char _ -> assert false
+             | Const_nativeint _ -> "nativeint"
+             | Const_int64 _ -> "int64"
+             | Const_int32 _ -> "int32"
+             | Const_float _ -> "float"
+             | Const_int _ -> "int"
+         in
+         Pexp_apply(ghexp(Pexp_ident (Lident (Printf.sprintf "%s_of_%s" name name))),
+                    ["", mkexp (Pexp_constant cst)])
+   else
+     Pexp_constant cst
+
  let mkuminus name arg =
    match name, arg.pexp_desc with
    | "-", Pexp_constant(Const_int n) ->
!       mkexp(pexp_constant(Const_int(-n)))
    | "-", Pexp_constant(Const_int32 n) ->
!       mkexp(pexp_constant(Const_int32(Int32.neg n)))
    | "-", Pexp_constant(Const_int64 n) ->
!       mkexp(pexp_constant(Const_int64(Int64.neg n)))
    | "-", Pexp_constant(Const_nativeint n) ->
!       mkexp(pexp_constant(Const_nativeint(Nativeint.neg n)))
    | ("-" | "-."), Pexp_constant(Const_float f) ->
!       mkexp(pexp_constant(Const_float(neg_float_string f)))
    | _ ->
        mkexp(Pexp_apply(mkoperator ("~" ^ name) 1, ["", arg]))

***************
*** 956,962 ****
      val_longident
        { mkexp(Pexp_ident $1) }
    | constant
!       { mkexp(Pexp_constant $1) }
    | constr_longident %prec prec_constant_constructor
        { mkexp(Pexp_construct($1, None, false)) }
    | name_tag %prec prec_constant_constructor
--- 978,984 ----
      val_longident
        { mkexp(Pexp_ident $1) }
    | constant
!       { mkexp(pexp_constant $1) }
    | constr_longident %prec prec_constant_constructor
        { mkexp(Pexp_construct($1, None, false)) }
    | name_tag %prec prec_constant_constructor
diff -C 3 -r ocaml-3.12.1-orig/stdlib/pervasives.ml ocaml-3.12.1/stdlib/pervasives.ml
*** ocaml-3.12.1-orig/stdlib/pervasives.ml	2010-06-09 12:27:01.000000000 +0200
--- ocaml-3.12.1/stdlib/pervasives.ml	2012-01-09 14:38:09.290068997 +0100
***************
*** 15,20 ****
--- 15,27 ----

  (* type 'a option = None | Some of 'a *)

+ external int_of_int : int -> int = "%identity"
+ external int32_of_int32 : int32 -> int32 = "%identity"
+ external int64_of_int64 : int64 -> int64 = "%identity"
+ external nativeint_of_nativeint : nativeint -> nativeint = "%identity"
+ external float_of_float : float -> float = "%identity"
+
+
  (* Exceptions *)

  external raise : exn -> 'a = "%raise"
diff -C 3 -r ocaml-3.12.1-orig/stdlib/pervasives.mli ocaml-3.12.1/stdlib/pervasives.mli
*** ocaml-3.12.1-orig/stdlib/pervasives.mli	2011-05-17 15:31:32.000000000 +0200
--- ocaml-3.12.1/stdlib/pervasives.mli	2012-01-09 14:39:21.220068999 +0100
***************
*** 13,18 ****
--- 13,24 ----

  (* $Id: pervasives.mli 11048 2011-05-17 13:31:32Z doligez $ *)

+ external int_of_int : int -> int = "%identity"
+ external int32_of_int32 : int32 -> int32 = "%identity"
+ external int64_of_int64 : int64 -> int64 = "%identity"
+ external nativeint_of_nativeint : nativeint -> nativeint = "%identity"
+ external float_of_float : float -> float = "%identity"
+
  (** The initially opened module.

     This module provides the basic operations over the built-in types