aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-09-20 20:39:43 +0200
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-09-20 20:39:43 +0200
commit4e0258fcb21aa0d23c04d4b58dbd4d34672234c1 (patch)
tree2d7a414542595775da03719ffe6cfbee817e0d29
parent3e32784577f1a33d0a4cd19d92ccc971996a73ec (diff)
downloadcompcert-kvx-4e0258fcb21aa0d23c04d4b58dbd4d34672234c1.tar.gz
compcert-kvx-4e0258fcb21aa0d23c04d4b58dbd4d34672234c1.zip
to v3.6
-rw-r--r--driver/Compopts.v6
-rw-r--r--extraction/extraction.v2
2 files changed, 6 insertions, 2 deletions
diff --git a/driver/Compopts.v b/driver/Compopts.v
index 26d888ae..6e3b0d62 100644
--- a/driver/Compopts.v
+++ b/driver/Compopts.v
@@ -64,4 +64,8 @@ Parameter thumb: unit -> bool.
Parameter debug: unit -> bool.
(** Flag -fall-loads-nontrap. Turn user loads into non trapping. *)
-Parameter all_loads_nontrap: unit -> bool. \ No newline at end of file
+Parameter all_loads_nontrap: unit -> bool.
+
+(* TODO is there a more appropriate place? *)
+Require Import Coqlib.
+Definition time {A B: Type} (name: string) (f: A -> B) : A -> B := f.
diff --git a/extraction/extraction.v b/extraction/extraction.v
index 994d41a4..828d0dac 100644
--- a/extraction/extraction.v
+++ b/extraction/extraction.v
@@ -140,7 +140,7 @@ Extract Constant Compiler.print_LTL => "PrintLTL.print_if".
Extract Constant Compiler.print_Mach => "PrintMach.print_if".
Extract Constant Compiler.print => "fun (f: 'a -> unit) (x: 'a) -> f x; x".
Extract Constant Compiler.time => "Timing.time_coq".
-Extract Constant Asmgen.time => "Timing.time_coq".
+Extract Constant Compopts.time => "Timing.time_coq".
(*Extraction Inline Compiler.apply_total Compiler.apply_partial.*)