diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-14 22:41:24 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-07-14 22:41:24 +0200 |
| commit | 4c146156a36d48209a6206f61f80dc5d4c48ce93 (patch) | |
| tree | dc8e3b1c7daf41cdf965c9e3e6119dcb5d6a41e5 /backend | |
| parent | d03d47c6e4ce9324d6d59ae36cb8db78b013be54 (diff) | |
| parent | f995a671ceb28c2a83e5e5574c3cdb46fd5e0f57 (diff) | |
| download | compcert-4c146156a36d48209a6206f61f80dc5d4c48ce93.tar.gz compcert-4c146156a36d48209a6206f61f80dc5d4c48ce93.zip | |
Merge branch 'master' into asmexpand
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/PrintAsm.ml | 2 | ||||
| -rw-r--r-- | backend/PrintAsmaux.ml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backend/PrintAsm.ml b/backend/PrintAsm.ml index e91b4e03..f3c80f3e 100644 --- a/backend/PrintAsm.ml +++ b/backend/PrintAsm.ml @@ -119,7 +119,7 @@ module Printer(Target:TARGET) = let get_end_addr = Target.get_end_addr let get_stmt_list_addr = Target.get_stmt_list_addr let name_of_section = Target.name_of_section - let get_fun_addr s = Hashtbl.find addr_mapping s + let get_fun_addr s = try Some (Hashtbl.find addr_mapping s) with Not_found -> None end module DebugPrinter = DwarfPrinter (DwarfTarget) (Target.DwarfAbbrevs) diff --git a/backend/PrintAsmaux.ml b/backend/PrintAsmaux.ml index 497760c1..b54188ca 100644 --- a/backend/PrintAsmaux.ml +++ b/backend/PrintAsmaux.ml @@ -294,7 +294,7 @@ let print_inline_asm print_preg oc txt sg args res = (** Print CompCert version and command-line as asm comment *) let print_version_and_options oc comment = - fprintf oc "%s File generated by CompCert %s\n" comment Configuration.version; + fprintf oc "%s File generated by CompCert %s\n" comment Version.version; fprintf oc "%s Command line:" comment; for i = 1 to Array.length Sys.argv - 1 do fprintf oc " %s" Sys.argv.(i) |