diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2012-03-08 19:52:03 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2012-03-08 19:52:03 +0000 |
| commit | 6c24f4f90b23e8c4536281d31461adfe5a15b739 (patch) | |
| tree | 29f6c4af8052800cc7d0eafb9650c6be8e90a2e5 /asmcomp | |
| parent | 1fb4007ece64b1d59e16d7a84639fce1dd69ed45 (diff) | |
| download | ocaml-6c24f4f90b23e8c4536281d31461adfe5a15b739.tar.gz | |
merge version 3.12 from 3.12.1 to r12205
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12210 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'asmcomp')
| -rw-r--r-- | asmcomp/arm/emit.mlp | 1 | ||||
| -rw-r--r-- | asmcomp/cmx_format.mli | 6 | ||||
| -rw-r--r-- | asmcomp/compilenv.mli | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp index 5aa83aa13b..846ee4ae3b 100644 --- a/asmcomp/arm/emit.mlp +++ b/asmcomp/arm/emit.mlp @@ -829,6 +829,7 @@ let fundecl fundecl = ` .thumb\n` else ` .arm\n`; + ` .type {emit_symbol fundecl.fun_name}, %function\n`; `{emit_symbol fundecl.fun_name}:\n`; if !Clflags.gprofile then emit_profile(); let n = frame_size() in diff --git a/asmcomp/cmx_format.mli b/asmcomp/cmx_format.mli index ffbe3b7013..69cd38234f 100644 --- a/asmcomp/cmx_format.mli +++ b/asmcomp/cmx_format.mli @@ -16,12 +16,12 @@ (* Each .o file has a matching .cmx file that provides the following infos on the compilation unit: - - list of other units imported, with CRCs of their .cmx files + - list of other units imported, with MD5s of their .cmx files - approximation of the structure implemented (includes descriptions of known functions: arity and direct entry points) - list of currying functions and application functions needed - The .cmx file contains these infos (as an externed record) plus a CRC + The .cmx file contains these infos (as an externed record) plus a MD5 of these infos *) type unit_infos = @@ -40,7 +40,7 @@ type unit_infos = infos on the library: *) type library_infos = - { lib_units: (unit_infos * Digest.t) list; (* List of unit infos w/ CRCs *) + { lib_units: (unit_infos * Digest.t) list; (* List of unit infos w/ MD5s *) lib_ccobjs: string list; (* C object files needed *) lib_ccopts: string list } (* Extra opts to C compiler *) diff --git a/asmcomp/compilenv.mli b/asmcomp/compilenv.mli index ca03724efe..3e4d83e20e 100644 --- a/asmcomp/compilenv.mli +++ b/asmcomp/compilenv.mli @@ -57,7 +57,7 @@ val new_structured_constant : Lambda.structured_constant -> bool -> string val structured_constants : unit -> (string * bool * Lambda.structured_constant) list val read_unit_info: string -> unit_infos * Digest.t - (* Read infos and CRC from a [.cmx] file. *) + (* Read infos and MD5 from a [.cmx] file. *) val write_unit_info: unit_infos -> string -> unit (* Save the given infos in the given file *) val save_unit_info: string -> unit |