From 6f1a2438a1c9598eab26e0cf43375a83fd547d35 Mon Sep 17 00:00:00 2001 From: Bernhard Schommer Date: Wed, 30 Sep 2015 15:05:11 +0200 Subject: Removed newline in version string and add buildnr and tag if existing to Producer as well as target system. --- backend/PrintAsmaux.ml | 2 +- debug/DwarfPrinter.ml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/PrintAsmaux.ml b/backend/PrintAsmaux.ml index c0ab3134..079aa6fd 100644 --- a/backend/PrintAsmaux.ml +++ b/backend/PrintAsmaux.ml @@ -329,7 +329,7 @@ let print_inline_asm print_preg oc txt sg args res = let print_version_and_options oc comment = let version_string = if Version.buildnr <> "" && Version.tag <> "" then - sprintf "%s, Build: %s, Tag: %s\n" Version.version Version.buildnr Version.tag + sprintf "%s, Build: %s, Tag: %s" Version.version Version.buildnr Version.tag else Version.version in fprintf oc "%s File generated by CompCert %s\n" comment version_string; diff --git a/debug/DwarfPrinter.ml b/debug/DwarfPrinter.ml index a95c71a1..0a540714 100644 --- a/debug/DwarfPrinter.ml +++ b/debug/DwarfPrinter.ml @@ -388,7 +388,12 @@ module DwarfPrinter(Target: DWARF_TARGET): print_string oc bt.base_type_name let print_compilation_unit oc tag = - let prod_name = sprintf "AbsInt Angewandte Informatik GmbH:CompCert Version %s:%s" Version.version Configuration.arch in + let version_string = + if Version.buildnr <> "" && Version.tag <> "" then + sprintf "%s, Build: %s, Tag: %s" Version.version Version.buildnr Version.tag + else + Version.version in + let prod_name = sprintf "AbsInt Angewandte Informatik GmbH:CompCert Version %s:%s-%s" version_string Configuration.arch Configuration.system in print_string oc (Sys.getcwd ()); print_addr oc tag.compile_unit_low_pc; print_addr oc tag.compile_unit_high_pc; -- cgit